From 716c1cdb56342e4bb66bc3163e0bb149961bc9d5 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Fri, 7 Aug 2009 09:47:31 +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 Signed-off-by: Avi Kivity (cherry picked from commit 8494e711d600ccac0d6ffaae54d41b0ce5fd28ba) --- net.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net.c b/net.c index c7702f8579..2428f631d0 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; -- 2.11.4.GIT