From e96dfd110ee1ad70e7ddbfae01ca95c66f70dac0 Mon Sep 17 00:00:00 2001 From: Vincenzo Maffione Date: Thu, 6 Feb 2014 17:02:15 +0100 Subject: [PATCH] net: change vnet-hdr TAP prototypes The tap_has_vnet_hdr() and tap_has_vnet_hdr_len() functions used to return int, even though they only return true/false values. This patch changes the prototypes to return bool. Signed-off-by: Vincenzo Maffione Signed-off-by: Stefan Hajnoczi --- include/net/tap.h | 4 ++-- net/tap-win32.c | 8 ++++---- net/tap.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/net/tap.h b/include/net/tap.h index a994f20447..a3490a96ab 100644 --- a/include/net/tap.h +++ b/include/net/tap.h @@ -30,8 +30,8 @@ #include "qapi-types.h" bool tap_has_ufo(NetClientState *nc); -int tap_has_vnet_hdr(NetClientState *nc); -int tap_has_vnet_hdr_len(NetClientState *nc, int len); +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); diff --git a/net/tap-win32.c b/net/tap-win32.c index 91e9e844a0..edf26c4720 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -727,9 +727,9 @@ bool tap_has_ufo(NetClientState *nc) return false; } -int tap_has_vnet_hdr(NetClientState *nc) +bool tap_has_vnet_hdr(NetClientState *nc) { - return 0; + return false; } int tap_probe_vnet_hdr_len(int fd, int len) @@ -755,9 +755,9 @@ struct vhost_net *tap_get_vhost_net(NetClientState *nc) return NULL; } -int tap_has_vnet_hdr_len(NetClientState *nc, int len) +bool tap_has_vnet_hdr_len(NetClientState *nc, int len) { - return 0; + return false; } void tap_set_vnet_hdr_len(NetClientState *nc, int len) diff --git a/net/tap.c b/net/tap.c index 39c1cda3e4..c805f3cdc9 100644 --- a/net/tap.c +++ b/net/tap.c @@ -219,7 +219,7 @@ bool tap_has_ufo(NetClientState *nc) return s->has_ufo; } -int tap_has_vnet_hdr(NetClientState *nc) +bool tap_has_vnet_hdr(NetClientState *nc) { TAPState *s = DO_UPCAST(TAPState, nc, nc); @@ -228,13 +228,13 @@ int tap_has_vnet_hdr(NetClientState *nc) return !!s->host_vnet_hdr_len; } -int tap_has_vnet_hdr_len(NetClientState *nc, int len) +bool tap_has_vnet_hdr_len(NetClientState *nc, int len) { TAPState *s = DO_UPCAST(TAPState, nc, nc); assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP); - return tap_probe_vnet_hdr_len(s->fd, len); + return !!tap_probe_vnet_hdr_len(s->fd, len); } void tap_set_vnet_hdr_len(NetClientState *nc, int len) -- 2.11.4.GIT