From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48606) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WII9I-00073W-EW for qemu-devel@nongnu.org; Tue, 25 Feb 2014 08:34:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WII9C-0003Pt-3U for qemu-devel@nongnu.org; Tue, 25 Feb 2014 08:34:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17302) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WII9B-0003PO-RV for qemu-devel@nongnu.org; Tue, 25 Feb 2014 08:34:10 -0500 From: Stefan Hajnoczi Date: Tue, 25 Feb 2014 14:33:44 +0100 Message-Id: <1393335229-607-7-git-send-email-stefanha@redhat.com> In-Reply-To: <1393335229-607-1-git-send-email-stefanha@redhat.com> References: <1393335229-607-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 06/11] net: make tap offloading callbacks static List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori From: Vincenzo Maffione Since TAP offloadings are manipulated through a new API, it's not necessary to export them in include/net/tap.h anymore. Signed-off-by: Vincenzo Maffione Signed-off-by: Stefan Hajnoczi --- include/net/tap.h | 6 ------ net/tap-win32.c | 12 ++++++------ net/tap.c | 12 ++++++------ 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/include/net/tap.h b/include/net/tap.h index a3490a9..6daeb42 100644 --- a/include/net/tap.h +++ b/include/net/tap.h @@ -29,12 +29,6 @@ #include "qemu-common.h" #include "qapi-types.h" -bool tap_has_ufo(NetClientState *nc); -bool tap_has_vnet_hdr(NetClientState *nc); -bool tap_has_vnet_hdr_len(NetClientState *nc, int len); -void tap_using_vnet_hdr(NetClientState *nc, bool using_vnet_hdr); -void tap_set_offload(NetClientState *nc, int csum, int tso4, int tso6, int ecn, int ufo); -void tap_set_vnet_hdr_len(NetClientState *nc, int len); int tap_enable(NetClientState *nc); int tap_disable(NetClientState *nc); diff --git a/net/tap-win32.c b/net/tap-win32.c index 924ca55..8aee611 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -669,12 +669,12 @@ static void tap_win32_send(void *opaque) } } -bool tap_has_ufo(NetClientState *nc) +static bool tap_has_ufo(NetClientState *nc) { return false; } -bool tap_has_vnet_hdr(NetClientState *nc) +static bool tap_has_vnet_hdr(NetClientState *nc) { return false; } @@ -688,11 +688,11 @@ void tap_fd_set_vnet_hdr_len(int fd, int len) { } -void tap_using_vnet_hdr(NetClientState *nc, bool using_vnet_hdr) +static void tap_using_vnet_hdr(NetClientState *nc, bool using_vnet_hdr) { } -void tap_set_offload(NetClientState *nc, int csum, int tso4, +static void tap_set_offload(NetClientState *nc, int csum, int tso4, int tso6, int ecn, int ufo) { } @@ -702,12 +702,12 @@ struct vhost_net *tap_get_vhost_net(NetClientState *nc) return NULL; } -bool tap_has_vnet_hdr_len(NetClientState *nc, int len) +static bool tap_has_vnet_hdr_len(NetClientState *nc, int len) { return false; } -void tap_set_vnet_hdr_len(NetClientState *nc, int len) +static void tap_set_vnet_hdr_len(NetClientState *nc, int len) { abort(); } diff --git a/net/tap.c b/net/tap.c index d34ec88..2d5099b 100644 --- a/net/tap.c +++ b/net/tap.c @@ -210,7 +210,7 @@ static void tap_send(void *opaque) } while (size > 0 && qemu_can_send_packet(&s->nc)); } -bool tap_has_ufo(NetClientState *nc) +static bool tap_has_ufo(NetClientState *nc) { TAPState *s = DO_UPCAST(TAPState, nc, nc); @@ -219,7 +219,7 @@ bool tap_has_ufo(NetClientState *nc) return s->has_ufo; } -bool tap_has_vnet_hdr(NetClientState *nc) +static bool tap_has_vnet_hdr(NetClientState *nc) { TAPState *s = DO_UPCAST(TAPState, nc, nc); @@ -228,7 +228,7 @@ bool tap_has_vnet_hdr(NetClientState *nc) return !!s->host_vnet_hdr_len; } -bool tap_has_vnet_hdr_len(NetClientState *nc, int len) +static bool tap_has_vnet_hdr_len(NetClientState *nc, int len) { TAPState *s = DO_UPCAST(TAPState, nc, nc); @@ -237,7 +237,7 @@ bool tap_has_vnet_hdr_len(NetClientState *nc, int len) return !!tap_probe_vnet_hdr_len(s->fd, len); } -void tap_set_vnet_hdr_len(NetClientState *nc, int len) +static void tap_set_vnet_hdr_len(NetClientState *nc, int len) { TAPState *s = DO_UPCAST(TAPState, nc, nc); @@ -249,7 +249,7 @@ void tap_set_vnet_hdr_len(NetClientState *nc, int len) s->host_vnet_hdr_len = len; } -void tap_using_vnet_hdr(NetClientState *nc, bool using_vnet_hdr) +static void tap_using_vnet_hdr(NetClientState *nc, bool using_vnet_hdr) { TAPState *s = DO_UPCAST(TAPState, nc, nc); @@ -259,7 +259,7 @@ void tap_using_vnet_hdr(NetClientState *nc, bool using_vnet_hdr) s->using_vnet_hdr = using_vnet_hdr; } -void tap_set_offload(NetClientState *nc, int csum, int tso4, +static void tap_set_offload(NetClientState *nc, int csum, int tso4, int tso6, int ecn, int ufo) { TAPState *s = DO_UPCAST(TAPState, nc, nc); -- 1.8.5.3