summaryrefslogtreecommitdiff
path: root/hw/mipsnet.c
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-07-01 16:46:38 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-07-09 16:58:07 -0500
commitae50b2747f77944faa79eb914272b54eb30b63b3 (patch)
tree836a0fb70b51d1ca20f11afcae2a91f5c5ca637d /hw/mipsnet.c
parentd026fb6dab9483869897d9d762311db8895ecca5 (diff)
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 <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/mipsnet.c')
-rw-r--r--hw/mipsnet.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/mipsnet.c b/hw/mipsnet.c
index 803522949b..e98c57699b 100644
--- a/hw/mipsnet.c
+++ b/hw/mipsnet.c
@@ -263,9 +263,9 @@ 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_can_receive, mipsnet_receive, NULL,
- mipsnet_cleanup, s);
+ s->vc = nd->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
+ mipsnet_can_receive, mipsnet_receive,
+ NULL, mipsnet_cleanup, s);
} else {
s->vc = NULL;
}