mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-22 15:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: Rename VLANClientState to NetClientState

Browse Source 
The vlan feature is no longer part of net core.  Rename VLANClientState
to NetClientState because net clients are not explicitly associated with
a vlan at all, instead they have a peer net client to which they are
connected.

This patch is a mechanical search-and-replace except for a few
whitespace fixups where changing VLANClientState to NetClientState
misaligned whitespace.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Stefan Hajnoczi
2012-07-24 16:35:13 +01:00
parent 94878994dc
commit 4e68f7a081
50 changed files with 282 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
net/tap-win32.c
View File

@ -630,11 +630,11 @@ static int tap_win32_open(tap_win32_overlapped_t **phandle,
/********************************************/
typedef struct TAPState {
VLANClientState nc;
NetClientState nc;
tap_win32_overlapped_t *handle;
} TAPState;
static void tap_cleanup(VLANClientState *nc)
static void tap_cleanup(NetClientState *nc)
{
TAPState *s = DO_UPCAST(TAPState, nc, nc);
@ -645,7 +645,7 @@ static void tap_cleanup(VLANClientState *nc)
*/
}
static ssize_t tap_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
static ssize_t tap_receive(NetClientState *nc, const uint8_t *buf, size_t size)
{
TAPState *s = DO_UPCAST(TAPState, nc, nc);
@ -673,10 +673,10 @@ static NetClientInfo net_tap_win32_info = {
.cleanup = tap_cleanup,
};
static int tap_win32_init(VLANClientState *peer, const char *model,
static int tap_win32_init(NetClientState *peer, const char *model,
const char *name, const char *ifname)
{
VLANClientState *nc;
NetClientState *nc;
TAPState *s;
tap_win32_overlapped_t *handle;
@ -700,7 +700,7 @@ static int tap_win32_init(VLANClientState *peer, const char *model,
}
int net_init_tap(const NetClientOptions *opts, const char *name,
VLANClientState *peer)
NetClientState *peer)
{
const NetdevTapOptions *tap;
@ -719,12 +719,12 @@ int net_init_tap(const NetClientOptions *opts, const char *name,
return 0;
}
int tap_has_ufo(VLANClientState *vc)
int tap_has_ufo(NetClientState *vc)
{
return 0;
}
int tap_has_vnet_hdr(VLANClientState *vc)
int tap_has_vnet_hdr(NetClientState *vc)
{
return 0;
}
@ -738,16 +738,16 @@ void tap_fd_set_vnet_hdr_len(int fd, int len)
{
}
void tap_using_vnet_hdr(VLANClientState *vc, int using_vnet_hdr)
void tap_using_vnet_hdr(NetClientState *vc, int using_vnet_hdr)
{
}
void tap_set_offload(VLANClientState *vc, int csum, int tso4,
void tap_set_offload(NetClientState *vc, int csum, int tso4,
int tso6, int ecn, int ufo)
{
}
struct vhost_net *tap_get_vhost_net(VLANClientState *nc)
struct vhost_net *tap_get_vhost_net(NetClientState *nc)
{
return NULL;
}