diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-17 17:11:08 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-17 17:11:08 +0000 |
| commit | b946a1533209f61a93e34898aebb5b43154b99c3 (patch) | |
| tree | 36b0017910ca42cc5a41671b8edc7faa5da0a452 /hw/usb-net.c | |
| parent | 32a8f6ae93f175518f86f99249177c35d1a85114 (diff) | |
Introduce VLANClientState::cleanup() (Mark McLoughlin)
We're currently leaking memory and file descriptors on device
hot-unplug.
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7150 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/usb-net.c')
| -rw-r--r-- | hw/usb-net.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/hw/usb-net.c b/hw/usb-net.c index 863c25fd9c..9e6442506f 100644 --- a/hw/usb-net.c +++ b/hw/usb-net.c @@ -1415,14 +1415,20 @@ static int usbnet_can_receive(void *opaque) return !s->in_len; } +static void usbnet_cleanup(VLANClientState *vc) +{ + USBNetState *s = vc->opaque; + + rndis_clear_responsequeue(s); + qemu_free(s); +} + static void usb_net_handle_destroy(USBDevice *dev) { USBNetState *s = (USBNetState *) dev; /* TODO: remove the nd_table[] entry */ qemu_del_vlan_client(s->vc); - rndis_clear_responsequeue(s); - qemu_free(s); } USBDevice *usb_net_init(NICInfo *nd) @@ -1452,7 +1458,9 @@ USBDevice *usb_net_init(NICInfo *nd) pstrcpy(s->dev.devname, sizeof(s->dev.devname), "QEMU USB Network Interface"); s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, - usbnet_receive, usbnet_can_receive, s); + usbnet_receive, + usbnet_can_receive, + usbnet_cleanup, s); qemu_format_nic_info_str(s->vc, s->mac); |