[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/11] net: change vnet-hdr TAP prototypes
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 02/11] net: change vnet-hdr TAP prototypes |
Date: |
Tue, 25 Feb 2014 14:33:40 +0100 |
From: Vincenzo Maffione <address@hidden>
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 <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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 a994f20..a3490a9 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 91e9e84..edf26c4 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 39c1cda..c805f3c 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)
--
1.8.5.3
- [Qemu-devel] [PULL 00/11] Net patches, Stefan Hajnoczi, 2014/02/25
- [Qemu-devel] [PULL 01/11] opencores_eth: flush queue whenever can_receive can go from false to true, Stefan Hajnoczi, 2014/02/25
- [Qemu-devel] [PULL 02/11] net: change vnet-hdr TAP prototypes,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 03/11] net: extend NetClientInfo for offloading, Stefan Hajnoczi, 2014/02/25
- [Qemu-devel] [PULL 04/11] net: TAP uses NetClientInfo offloading callbacks, Stefan Hajnoczi, 2014/02/25
- [Qemu-devel] [PULL 05/11] net: virtio-net and vmxnet3 use offloading API, Stefan Hajnoczi, 2014/02/25
- [Qemu-devel] [PULL 06/11] net: make tap offloading callbacks static, Stefan Hajnoczi, 2014/02/25
- [Qemu-devel] [PULL 07/11] net: add offloading support to netmap backend, Stefan Hajnoczi, 2014/02/25
- [Qemu-devel] [PULL 08/11] net: Disable netmap backend when not supported, Stefan Hajnoczi, 2014/02/25
- [Qemu-devel] [PULL 09/11] net: remove implicit peer from offload API, Stefan Hajnoczi, 2014/02/25
- [Qemu-devel] [PULL 10/11] vhost_net: use offload API instead of bypassing it, Stefan Hajnoczi, 2014/02/25
- [Qemu-devel] [PULL 11/11] virtio-net: use qemu_get_queue() where possible, Stefan Hajnoczi, 2014/02/25
- Re: [Qemu-devel] [PULL 00/11] Net patches, Peter Maydell, 2014/02/26