From ae50b2747f77944faa79eb914272b54eb30b63b3 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 1 Jul 2009 16:46:38 +0100 Subject: Don't leak VLANClientState on PCI hot remove destroy_nic() requires that NICInfo::private by a PCIDevice pointer, but then goes on to require that the same pointer matches VLANClientState::opaque. That is no longer the case for virtio-net since qdev and wasn't previously the case for rtl8139, ne2k_pci or eepro100. Make the situation a lot more clear by maintaining a VLANClientState pointer in NICInfo. Signed-off-by: Mark McLoughlin Signed-off-by: Anthony Liguori --- hw/device-hotplug.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'hw/device-hotplug.c') diff --git a/hw/device-hotplug.c b/hw/device-hotplug.c index 3bdc048c68..e178083419 100644 --- a/hw/device-hotplug.c +++ b/hw/device-hotplug.c @@ -55,12 +55,7 @@ void destroy_nic(dev_match_fn *match_fn, void *arg) nic = &nd_table[i]; if (nic->used) { if (nic->private && match_fn(nic->private, arg)) { - if (nic->vlan) { - VLANClientState *vc; - vc = qemu_find_vlan_client(nic->vlan, nic->private); - if (vc) - qemu_del_vlan_client(vc); - } + qemu_del_vlan_client(nic->vc); net_client_uninit(nic); } } -- cgit 1.4.1