Browse Source

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 <v.maffione@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
pull/6/merge
Vincenzo Maffione 12 years ago
committed by Stefan Hajnoczi
parent
commit
e96dfd110e
  1. 4
      include/net/tap.h
  2. 8
      net/tap-win32.c
  3. 6
      net/tap.c

4
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);

8
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)

6
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)

Loading…
Cancel
Save