From ed8f8da7a67999cd8b89e449b8b101f14fa16272 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 1 Jul 2009 16:46:38 +0100 Subject: [PATCH] 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 +------ hw/etraxfs_eth.c | 6 +++--- hw/mcf_fec.c | 6 +++--- hw/mipsnet.c | 7 ++++--- hw/ne2000.c | 6 +++--- hw/usb-net.c | 8 ++++---- net.h | 1 + 7 files changed, 19 insertions(+), 22 deletions(-) diff --git a/hw/device-hotplug.c b/hw/device-hotplug.c index 3bdc048c685..e1780834198 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); } } diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c index bfc19262f53..67568c35c8f 100644 --- a/hw/etraxfs_eth.c +++ b/hw/etraxfs_eth.c @@ -594,9 +594,9 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env, eth->ethregs = cpu_register_io_memory(0, eth_read, eth_write, eth); cpu_register_physical_memory (base, 0x5c, eth->ethregs); - eth->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, - eth_receive, eth_can_receive, - eth_cleanup, eth); + eth->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, + eth_receive, eth_can_receive, + eth_cleanup, eth); eth->vc->opaque = eth; eth->vc->link_status_changed = eth_set_link; diff --git a/hw/mcf_fec.c b/hw/mcf_fec.c index 1ca847b22b3..53949561532 100644 --- a/hw/mcf_fec.c +++ b/hw/mcf_fec.c @@ -463,9 +463,9 @@ void mcf_fec_init(NICInfo *nd, target_phys_addr_t base, qemu_irq *irq) mcf_fec_writefn, s); cpu_register_physical_memory(base, 0x400, s->mmio_index); - s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, - mcf_fec_receive, mcf_fec_can_receive, - mcf_fec_cleanup, s); + s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, + mcf_fec_receive, mcf_fec_can_receive, + mcf_fec_cleanup, s); memcpy(s->macaddr, nd->macaddr, 6); qemu_format_nic_info_str(s->vc, s->macaddr); } diff --git a/hw/mipsnet.c b/hw/mipsnet.c index e8429842199..eba60e5546a 100644 --- a/hw/mipsnet.c +++ b/hw/mipsnet.c @@ -261,9 +261,10 @@ void mipsnet_init (int base, qemu_irq irq, NICInfo *nd) s->io_base = base; s->irq = irq; if (nd && nd->vlan) { - s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, - mipsnet_receive, mipsnet_can_receive, - mipsnet_cleanup, s); + s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, + mipsnet_receive, + mipsnet_can_receive, + mipsnet_cleanup, s); } else { s->vc = NULL; } diff --git a/hw/ne2000.c b/hw/ne2000.c index 975951755dd..6f24fb71dcb 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -756,9 +756,9 @@ void isa_ne2000_init(int base, qemu_irq irq, NICInfo *nd) ne2000_reset(s); - s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, - ne2000_receive, ne2000_can_receive, - isa_ne2000_cleanup, s); + s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, + ne2000_receive, ne2000_can_receive, + isa_ne2000_cleanup, s); qemu_format_nic_info_str(s->vc, s->macaddr); diff --git a/hw/usb-net.c b/hw/usb-net.c index 9e6442506f6..60bddd1af59 100644 --- a/hw/usb-net.c +++ b/hw/usb-net.c @@ -1457,10 +1457,10 @@ 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, - usbnet_cleanup, s); + s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, + usbnet_receive, + usbnet_can_receive, + usbnet_cleanup, s); qemu_format_nic_info_str(s->vc, s->mac); diff --git a/net.h b/net.h index a8bef3e65cd..59588c5ea70 100644 --- a/net.h +++ b/net.h @@ -68,6 +68,7 @@ struct NICInfo { const char *model; const char *name; VLANState *vlan; + VLANClientState *vc; void *private; int used; }; -- 2.39.5