From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark McLoughlin Subject: [PATCH 1/1] net: fix vnet_hdr bustage with slirp Date: Fri, 7 Aug 2009 09:47:31 +0100 Message-ID: <1249634851-24005-1-git-send-email-markmc@redhat.com> Cc: kvm@vger.kernel.org, Mark McLoughlin To: avi@redhat.com Return-path: Received: from mail28.svc.cra.dublin.eircom.net ([159.134.118.224]:42746 "HELO mail28.svc.cra.dublin.eircom.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1757231AbZHGIys (ORCPT ); Fri, 7 Aug 2009 04:54:48 -0400 Sender: kvm-owner@vger.kernel.org List-ID: 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 --- 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