ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: maintain a list of vlan-less clients 

Allows them to be cleaned up at shutdown.

This is pretty lame, but will eventually go away as we make vlans
the special case.

Patchworks-ID: 35518
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Mark McLoughlin 2009-10-08 19:58:28 +01:00 committed by Anthony Liguori
parent f6b134ac30
commit 577c4af937
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net.c
View File

@ -115,6 +115,7 @@
#include "slirp/libslirp.h" #include "slirp/libslirp.h"
static QTAILQ_HEAD(, VLANState) vlans; static QTAILQ_HEAD(, VLANState) vlans;
static QTAILQ_HEAD(, VLANClientState) non_vlan_clients;
/***********************************************************/ /***********************************************************/
/* network device redirectors */ /* network device redirectors */
@ -327,6 +328,8 @@ VLANClientState *qemu_new_vlan_client(VLANState *vlan,
if (vlan) { if (vlan) {
vc->vlan = vlan; vc->vlan = vlan;
QTAILQ_INSERT_TAIL(&vc->vlan->clients, vc, next); QTAILQ_INSERT_TAIL(&vc->vlan->clients, vc, next);
} else {
QTAILQ_INSERT_TAIL(&non_vlan_clients, vc, next);
} }
return vc; return vc;
@ -336,6 +339,8 @@ void qemu_del_vlan_client(VLANClientState *vc)
{ {
if (vc->vlan) { if (vc->vlan) {
QTAILQ_REMOVE(&vc->vlan->clients, vc, next); QTAILQ_REMOVE(&vc->vlan->clients, vc, next);
} else {
QTAILQ_REMOVE(&non_vlan_clients, vc, next);
} }
if (vc->cleanup) { if (vc->cleanup) {
@ -3227,14 +3232,17 @@ done:
void net_cleanup(void) void net_cleanup(void)
{ {
VLANState *vlan; VLANState *vlan;
QTAILQ_FOREACH(vlan, &vlans, next) {
VLANClientState *vc, *next_vc; VLANClientState *vc, *next_vc;
QTAILQ_FOREACH(vlan, &vlans, next) {
QTAILQ_FOREACH_SAFE(vc, &vlan->clients, next, next_vc) { QTAILQ_FOREACH_SAFE(vc, &vlan->clients, next, next_vc) {
qemu_del_vlan_client(vc); qemu_del_vlan_client(vc);
} }
} }
QTAILQ_FOREACH_SAFE(vc, &non_vlan_clients, next, next_vc) {
qemu_del_vlan_client(vc);
}
} }
static void net_check_clients(void) static void net_check_clients(void)
@ -3274,6 +3282,7 @@ int net_init_clients(void)
} }
QTAILQ_INIT(&vlans); QTAILQ_INIT(&vlans);
QTAILQ_INIT(&non_vlan_clients);
if (qemu_opts_foreach(&qemu_netdev_opts, net_init_netdev, NULL, 1) == -1) if (qemu_opts_foreach(&qemu_netdev_opts, net_init_netdev, NULL, 1) == -1)
return -1; return -1;