motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 16:23:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

12
net/vde.c
View file

@ -33,7 +33,7 @@
#include "qemu-option.h"
typedef struct VDEState {
VLANClientState nc;
NetClientState nc;
VDECONN *vde;
} VDEState;
@ -49,7 +49,7 @@ static void vde_to_qemu(void *opaque)
}
}
static ssize_t vde_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
static ssize_t vde_receive(NetClientState *nc, const uint8_t *buf, size_t size)
{
VDEState *s = DO_UPCAST(VDEState, nc, nc);
ssize_t ret;
@ -61,7 +61,7 @@ static ssize_t vde_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
return ret;
}
static void vde_cleanup(VLANClientState *nc)
static void vde_cleanup(NetClientState *nc)
{
VDEState *s = DO_UPCAST(VDEState, nc, nc);
qemu_set_fd_handler(vde_datafd(s->vde), NULL, NULL, NULL);
@ -75,11 +75,11 @@ static NetClientInfo net_vde_info = {
.cleanup = vde_cleanup,
};
static int net_vde_init(VLANClientState *peer, const char *model,
static int net_vde_init(NetClientState *peer, const char *model,
const char *name, const char *sock,
int port, const char *group, int mode)
{
VLANClientState *nc;
NetClientState *nc;
VDEState *s;
VDECONN *vde;
char *init_group = (char *)group;
@ -111,7 +111,7 @@ static int net_vde_init(VLANClientState *peer, const char *model,
}
int net_init_vde(const NetClientOptions *opts, const char *name,
VLANClientState *peer)
NetClientState *peer)
{
const NetdevVdeOptions *vde;