aboutsummaryrefslogtreecommitdiff
path: root/hw/qdev.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/qdev.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/qdev.c')
-rw-r--r--hw/qdev.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/qdev.c b/hw/qdev.c
index 4c550094e2..83e98bf3ed 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -250,8 +250,9 @@ VLANClientState *qdev_get_vlan_client(DeviceState *dev,
{
NICInfo *nd = dev->nd;
assert(nd);
- return qemu_new_vlan_client(nd->vlan, nd->model, nd->name, can_receive,
- receive, receive_iov, cleanup, opaque);
+ nd->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, can_receive,
+ receive, receive_iov, cleanup, opaque);
+ return nd->vc;
}