Remove the NIC from vlan on usb destroy.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4885 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/hw/usb-net.c b/hw/usb-net.c
index 0f62f8834045a3c170201bd03d62185d19caada5..56210b52ecc8ca99f8788d7064b5e32cd06bf5f3 100644 (file)
--- a/hw/usb-net.c
+++ b/hw/usb-net.c
@@ -1418,7 +1418,8 @@ static void usb_net_handle_destroy(USBDevice *dev)
 {
     USBNetState *s = (USBNetState *) dev;
 
-    /* FIXME: delete the VLAN client and the nic */
+    /* TODO: remove the nd_table[] entry */
+    qemu_del_vlan_client(s->vc);
     rndis_clear_responsequeue(s);
     qemu_free(s);
 }

diff --git a/net.h b/net.h
index 2dfff8defa4c64e568933900afd84eb5ade0705c..d00910f28795ccfd347a66da6cc299e1f0f1925b 100644 (file)
--- a/net.h
+++ b/net.h
@@ -28,6 +28,7 @@ VLANClientState *qemu_new_vlan_client(VLANState *vlan,
                                       IOReadHandler *fd_read,
                                       IOCanRWHandler *fd_can_read,
                                       void *opaque);
+void qemu_del_vlan_client(VLANClientState *vc);
 int qemu_can_send_packet(VLANClientState *vc);
 void qemu_send_packet(VLANClientState *vc, const uint8_t *buf, int size);
 void qemu_handler_true(void *opaque);

diff --git a/vl.c b/vl.c
index 043e484f1178994d3675065de9517e0b56b8207d..613fa849d2fd4418c361822ec0daf48d7166f029 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -3870,6 +3870,19 @@ VLANClientState *qemu_new_vlan_client(VLANState *vlan,
     return vc;
 }
 
+void qemu_del_vlan_client(VLANClientState *vc)
+{
+    VLANClientState **pvc = &vc->vlan->first_client;
+
+    while (*pvc != NULL)
+        if (*pvc == vc) {
+            *pvc = vc->next;
+            free(vc);
+            break;
+        } else
+            pvc = &(*pvc)->next;
+}
+
 int qemu_can_send_packet(VLANClientState *vc1)
 {
     VLANState *vlan = vc1->vlan;