From patchwork Fri Apr 28 09:47:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 756292 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wDpsV06NMz9s7x for ; Fri, 28 Apr 2017 19:48:12 +1000 (AEST) Received: from localhost ([::1]:36090 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d42VU-0004fo-Hw for incoming@patchwork.ozlabs.org; Fri, 28 Apr 2017 05:48:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d42Uw-0004ez-Qj for qemu-devel@nongnu.org; Fri, 28 Apr 2017 05:47:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d42Us-0001Sx-9r for qemu-devel@nongnu.org; Fri, 28 Apr 2017 05:47:34 -0400 Received: from [59.151.112.132] (port=49865 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d42Ur-0001QD-TZ for qemu-devel@nongnu.org; Fri, 28 Apr 2017 05:47:30 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="18277654" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 28 Apr 2017 17:47:19 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 7320F47CE223; Fri, 28 Apr 2017 17:47:19 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 28 Apr 2017 17:47:19 +0800 From: Zhang Chen To: qemu devel , Jason Wang Date: Fri, 28 Apr 2017 17:47:12 +0800 Message-ID: <1493372840-24551-3-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493372840-24551-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1493372840-24551-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: 7320F47CE223.AC49E X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH V3 02/10] net/tap.c: Add tap_get_vnet_hdr_len and tap_get_using_vnet_hdr function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhanghailiang , Li Zhijian , weifuqiang , "eddie . dong" , Zhang Chen , bian naimeng Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Make tap backend support get_vnet_hdr_len. Signed-off-by: Zhang Chen --- net/tap-win32.c | 12 ++++++++++++ net/tap.c | 20 ++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/net/tap-win32.c b/net/tap-win32.c index 662f9b6..337e8ea 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -729,6 +729,11 @@ static void tap_using_vnet_hdr(NetClientState *nc, bool using_vnet_hdr) { } +static void tap_get_using_vnet_hdr(NetClientState *nc) +{ + return false; +} + static void tap_set_offload(NetClientState *nc, int csum, int tso4, int tso6, int ecn, int ufo) { @@ -744,6 +749,11 @@ static bool tap_has_vnet_hdr_len(NetClientState *nc, int len) return false; } +static int tap_get_vnet_hdr_len(NetClientState *nc) +{ + return 0; +} + static void tap_set_vnet_hdr_len(NetClientState *nc, int len) { abort(); @@ -757,7 +767,9 @@ static NetClientInfo net_tap_win32_info = { .has_ufo = tap_has_ufo, .has_vnet_hdr = tap_has_vnet_hdr, .has_vnet_hdr_len = tap_has_vnet_hdr_len, + .get_vnet_hdr_len = tap_get_vnet_hdr_len, .using_vnet_hdr = tap_using_vnet_hdr, + .get_using_vnet_hdr = tap_get_using_vnet_hdr, .set_offload = tap_set_offload, .set_vnet_hdr_len = tap_set_vnet_hdr_len, }; diff --git a/net/tap.c b/net/tap.c index 979e622..214c83d 100644 --- a/net/tap.c +++ b/net/tap.c @@ -246,6 +246,15 @@ static bool tap_has_vnet_hdr_len(NetClientState *nc, int len) return !!tap_probe_vnet_hdr_len(s->fd, len); } +static int tap_get_vnet_hdr_len(NetClientState *nc) +{ + TAPState *s = DO_UPCAST(TAPState, nc, nc); + + assert(nc->info->type == NET_CLIENT_DRIVER_TAP); + + return s->host_vnet_hdr_len; +} + static void tap_set_vnet_hdr_len(NetClientState *nc, int len) { TAPState *s = DO_UPCAST(TAPState, nc, nc); @@ -268,6 +277,15 @@ static void tap_using_vnet_hdr(NetClientState *nc, bool using_vnet_hdr) s->using_vnet_hdr = using_vnet_hdr; } +static bool tap_get_using_vnet_hdr(NetClientState *nc) +{ + TAPState *s = DO_UPCAST(TAPState, nc, nc); + + assert(nc->info->type == NET_CLIENT_DRIVER_TAP); + + return s->using_vnet_hdr; +} + static int tap_set_vnet_le(NetClientState *nc, bool is_le) { TAPState *s = DO_UPCAST(TAPState, nc, nc); @@ -354,7 +372,9 @@ static NetClientInfo net_tap_info = { .has_ufo = tap_has_ufo, .has_vnet_hdr = tap_has_vnet_hdr, .has_vnet_hdr_len = tap_has_vnet_hdr_len, + .get_vnet_hdr_len = tap_get_vnet_hdr_len, .using_vnet_hdr = tap_using_vnet_hdr, + .get_using_vnet_hdr = tap_get_using_vnet_hdr, .set_offload = tap_set_offload, .set_vnet_hdr_len = tap_set_vnet_hdr_len, .set_vnet_le = tap_set_vnet_le,