haraldwolff
/
qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Rename non_vlan_clients to net_clients 

There is no longer a distinction between vlan clients and non-vlan
clients in the net core.  The net core only knows about point-to-point
clients which are connected to a peer.  It's time to rename the global
list of net clients since it no longer refers to vlans at all.

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>
stable-1.2
Stefan Hajnoczi 2012-07-24 16:35:12 +01:00
parent a005d0732f
commit 94878994dc
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net.c
View File

@ -47,7 +47,7 @@
# define CONFIG_NET_BRIDGE # define CONFIG_NET_BRIDGE
#endif #endif
static QTAILQ_HEAD(, VLANClientState) non_vlan_clients; static QTAILQ_HEAD(, VLANClientState) net_clients;
int default_net = 1; int default_net = 1;
@ -168,7 +168,7 @@ static char *assign_name(VLANClientState *vc1, const char *model)
char buf[256]; char buf[256];
int id = 0; int id = 0;
QTAILQ_FOREACH(vc, &non_vlan_clients, next) { QTAILQ_FOREACH(vc, &net_clients, next) {
if (vc == vc1) { if (vc == vc1) {
continue; continue;
} }
@ -219,7 +219,7 @@ VLANClientState *qemu_new_net_client(NetClientInfo *info,
vc->peer = peer; vc->peer = peer;
peer->peer = vc; peer->peer = vc;
} }
QTAILQ_INSERT_TAIL(&non_vlan_clients, vc, next); QTAILQ_INSERT_TAIL(&net_clients, vc, next);
vc->send_queue = qemu_new_net_queue(qemu_deliver_packet, vc->send_queue = qemu_new_net_queue(qemu_deliver_packet,
qemu_deliver_packet_iov, qemu_deliver_packet_iov,
@ -251,7 +251,7 @@ NICState *qemu_new_nic(NetClientInfo *info,
static void qemu_cleanup_vlan_client(VLANClientState *vc) static void qemu_cleanup_vlan_client(VLANClientState *vc)
{ {
QTAILQ_REMOVE(&non_vlan_clients, vc, next); QTAILQ_REMOVE(&net_clients, vc, next);
if (vc->info->cleanup) { if (vc->info->cleanup) {
vc->info->cleanup(vc); vc->info->cleanup(vc);
@ -305,7 +305,7 @@ void qemu_foreach_nic(qemu_nic_foreach func, void *opaque)
{ {
VLANClientState *nc; VLANClientState *nc;
QTAILQ_FOREACH(nc, &non_vlan_clients, next) { QTAILQ_FOREACH(nc, &net_clients, next) {
if (nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC) { if (nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC) {
func(DO_UPCAST(NICState, nc, nc), opaque); func(DO_UPCAST(NICState, nc, nc), opaque);
} }
@ -470,7 +470,7 @@ VLANClientState *qemu_find_netdev(const char *id)
{ {
VLANClientState *vc; VLANClientState *vc;
QTAILQ_FOREACH(vc, &non_vlan_clients, next) { QTAILQ_FOREACH(vc, &net_clients, next) {
if (vc->info->type == NET_CLIENT_OPTIONS_KIND_NIC) if (vc->info->type == NET_CLIENT_OPTIONS_KIND_NIC)
continue; continue;
if (!strcmp(vc->name, id)) { if (!strcmp(vc->name, id)) {
@ -867,7 +867,7 @@ void do_info_network(Monitor *mon)
NetClientOptionsKind type; NetClientOptionsKind type;
monitor_printf(mon, "Devices not on any VLAN:\n"); monitor_printf(mon, "Devices not on any VLAN:\n");
QTAILQ_FOREACH(vc, &non_vlan_clients, next) { QTAILQ_FOREACH(vc, &net_clients, next) {
peer = vc->peer; peer = vc->peer;
type = vc->info->type; type = vc->info->type;
if (!peer || type == NET_CLIENT_OPTIONS_KIND_NIC) { if (!peer || type == NET_CLIENT_OPTIONS_KIND_NIC) {
@ -886,7 +886,7 @@ void qmp_set_link(const char *name, bool up, Error **errp)
{ {
VLANClientState *vc = NULL; VLANClientState *vc = NULL;
QTAILQ_FOREACH(vc, &non_vlan_clients, next) { QTAILQ_FOREACH(vc, &net_clients, next) {
if (!strcmp(vc->name, name)) { if (!strcmp(vc->name, name)) {
goto done; goto done;
} }
@ -920,7 +920,7 @@ void net_cleanup(void)
{ {
VLANClientState *vc, *next_vc; VLANClientState *vc, *next_vc;
QTAILQ_FOREACH_SAFE(vc, &non_vlan_clients, next, next_vc) { QTAILQ_FOREACH_SAFE(vc, &net_clients, next, next_vc) {
qemu_del_vlan_client(vc); qemu_del_vlan_client(vc);
} }
} }
@ -944,7 +944,7 @@ void net_check_clients(void)
net_hub_check_clients(); net_hub_check_clients();
QTAILQ_FOREACH(vc, &non_vlan_clients, next) { QTAILQ_FOREACH(vc, &net_clients, next) {
if (!vc->peer) { if (!vc->peer) {
fprintf(stderr, "Warning: %s %s has no peer\n", fprintf(stderr, "Warning: %s %s has no peer\n",
vc->info->type == NET_CLIENT_OPTIONS_KIND_NIC ? "nic" : "netdev", vc->info->type == NET_CLIENT_OPTIONS_KIND_NIC ? "nic" : "netdev",
@ -1008,7 +1008,7 @@ int net_init_clients(void)
#endif #endif
} }
QTAILQ_INIT(&non_vlan_clients); QTAILQ_INIT(&net_clients);
if (qemu_opts_foreach(qemu_find_opts("netdev"), net_init_netdev, NULL, 1) == -1) if (qemu_opts_foreach(qemu_find_opts("netdev"), net_init_netdev, NULL, 1) == -1)
return -1; return -1;