48 lines
1.2 KiB
Diff
48 lines
1.2 KiB
Diff
From 97064ad88123744056d141e96247348dd2d9621c Mon Sep 17 00:00:00 2001
|
|
From: Mark McLoughlin <markmc@redhat.com>
|
|
Date: Fri, 7 Aug 2009 09:39:51 +0100
|
|
Subject: [PATCH] net: fix vnet_hdr bustage with slirp
|
|
|
|
slirp has started using VLANClientState::opaque and this has caused the
|
|
kvm specific tap_has_vnet_hdr() hack to break because we blindly use
|
|
this opaque pointer even if it is not a tap client.
|
|
|
|
Add yet another hack to check that we're actually getting called with a
|
|
tap client.
|
|
|
|
[Needed on stable-0.11 too]
|
|
|
|
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
|
|
Fedora-patch: qemu-fix-vnet-hdr-slirp-bustage.patch
|
|
---
|
|
net.c | 6 ++++++
|
|
1 files changed, 6 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/net.c b/net.c
|
|
index c7702f8..2428f63 100644
|
|
--- a/net.c
|
|
+++ b/net.c
|
|
@@ -1521,6 +1521,9 @@ int tap_has_vnet_hdr(void *opaque)
|
|
VLANClientState *vc = opaque;
|
|
TAPState *s = vc->opaque;
|
|
|
|
+ if (vc->receive != tap_receive)
|
|
+ return 0;
|
|
+
|
|
return s ? s->has_vnet_hdr : 0;
|
|
}
|
|
|
|
@@ -1529,6 +1532,9 @@ void tap_using_vnet_hdr(void *opaque, int using_vnet_hdr)
|
|
VLANClientState *vc = opaque;
|
|
TAPState *s = vc->opaque;
|
|
|
|
+ if (vc->receive != tap_receive)
|
|
+ return;
|
|
+
|
|
if (!s || !s->has_vnet_hdr)
|
|
return;
|
|
|
|
--
|
|
1.6.2.5
|
|
|