[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/16] net: maintain a list of vlan-less clients
From: |
Mark McLoughlin |
Subject: |
[Qemu-devel] [PATCH 12/16] net: maintain a list of vlan-less clients |
Date: |
Thu, 8 Oct 2009 19:58:28 +0100 |
Allows them to be cleaned up at shutdown.
This is pretty lame, but will eventually go away as we make vlans
the special case.
Signed-off-by: Mark McLoughlin <address@hidden>
---
net.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/net.c b/net.c
index 9af217e..d6fe84b 100644
--- a/net.c
+++ b/net.c
@@ -115,6 +115,7 @@
#include "slirp/libslirp.h"
static QTAILQ_HEAD(, VLANState) vlans;
+static QTAILQ_HEAD(, VLANClientState) non_vlan_clients;
/***********************************************************/
/* network device redirectors */
@@ -327,6 +328,8 @@ VLANClientState *qemu_new_vlan_client(VLANState *vlan,
if (vlan) {
vc->vlan = vlan;
QTAILQ_INSERT_TAIL(&vc->vlan->clients, vc, next);
+ } else {
+ QTAILQ_INSERT_TAIL(&non_vlan_clients, vc, next);
}
return vc;
@@ -336,6 +339,8 @@ void qemu_del_vlan_client(VLANClientState *vc)
{
if (vc->vlan) {
QTAILQ_REMOVE(&vc->vlan->clients, vc, next);
+ } else {
+ QTAILQ_REMOVE(&non_vlan_clients, vc, next);
}
if (vc->cleanup) {
@@ -3227,14 +3232,17 @@ done:
void net_cleanup(void)
{
VLANState *vlan;
+ VLANClientState *vc, *next_vc;
QTAILQ_FOREACH(vlan, &vlans, next) {
- VLANClientState *vc, *next_vc;
-
QTAILQ_FOREACH_SAFE(vc, &vlan->clients, next, next_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)
@@ -3274,6 +3282,7 @@ int net_init_clients(void)
}
QTAILQ_INIT(&vlans);
+ QTAILQ_INIT(&non_vlan_clients);
if (qemu_opts_foreach(&qemu_netdev_opts, net_init_netdev, NULL, 1) == -1)
return -1;
--
1.6.2.5
- [Qemu-devel] [PATCH 07/16] net: use qtailq for vlan and client lists, (continued)
- [Qemu-devel] [PATCH 07/16] net: use qtailq for vlan and client lists, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 01/16] slirp: fix !CONFIG_SLIRP compilation, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 03/16] net: pass monitor handle to client init functions, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 15/16] net: refactor packet queueing code, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 06/16] net: remove id field from NICInfo, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 05/16] net: handle id= parameter for -net, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 08/16] net: allow clients not associated with a vlan, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 13/16] net: add -net nic,netdev= option, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 14/16] net: allow NICs to be connected to netdevs, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 11/16] net: handle -netdevice options, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 12/16] net: maintain a list of vlan-less clients,
Mark McLoughlin <=
- [Qemu-devel] [PATCH 02/16] hotplug: safely iterate bus's sibling list while removing a device, Mark McLoughlin, 2009/10/08
- [Qemu-devel] [PATCH 16/16] net: add queue for peer-to-peer packet forwarding, Mark McLoughlin, 2009/10/08
- Re: [Qemu-devel] [PATCH 00/16] Add a -netdev option, Stefan Weil, 2009/10/08
- Re: [Qemu-devel] [PATCH 00/16] Add a -netdev option, Mark McLoughlin, 2009/10/09