motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -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/dump.c
View file

@ -30,7 +30,7 @@
#include "hub.h"
typedef struct DumpState {
VLANClientState nc;
NetClientState nc;
int64_t start_ts;
int fd;
int pcap_caplen;
@ -57,7 +57,7 @@ struct pcap_sf_pkthdr {
uint32_t len;
};
static ssize_t dump_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
static ssize_t dump_receive(NetClientState *nc, const uint8_t *buf, size_t size)
{
DumpState *s = DO_UPCAST(DumpState, nc, nc);
struct pcap_sf_pkthdr hdr;
@ -86,7 +86,7 @@ static ssize_t dump_receive(VLANClientState *nc, const uint8_t *buf, size_t size
return size;
}
static void dump_cleanup(VLANClientState *nc)
static void dump_cleanup(NetClientState *nc)
{
DumpState *s = DO_UPCAST(DumpState, nc, nc);
@ -100,11 +100,11 @@ static NetClientInfo net_dump_info = {
.cleanup = dump_cleanup,
};
static int net_dump_init(VLANClientState *peer, const char *device,
static int net_dump_init(NetClientState *peer, const char *device,
const char *name, const char *filename, int len)
{
struct pcap_file_hdr hdr;
VLANClientState *nc;
NetClientState *nc;
DumpState *s;
struct tm tm;
int fd;
@ -146,7 +146,7 @@ static int net_dump_init(VLANClientState *peer, const char *device,
}
int net_init_dump(const NetClientOptions *opts, const char *name,
VLANClientState *peer)
NetClientState *peer)
{
int len;
const char *file;