diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-08-22 23:09:46 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-23 20:19:59 -0500 |
| commit | da5a44e8b0b727681fc33e8d94832d1cae48a788 (patch) | |
| tree | 05d07ea897538eed23cc86e097d43863f577bfeb /hw/xen_platform.c | |
| parent | 26efaca377e004b79ff50a6e936d029a0c095b8b (diff) | |
qom: object_delete should unparent the object first
object_deinit is only called when the reference count goes to zero,
and yet tries to do an object_unparent. Now, object_unparent
either does nothing or it will decrease the reference count.
Because we know the reference count is zero, the object_unparent
call in object_deinit is useless.
Instead, we need to disconnect the object from its parent just
before we remove the last reference apart from the parent's. This
happens in object_delete. Once we do this, all calls to
object_unparent peppered through QEMU can go away.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/xen_platform.c')
| -rw-r--r-- | hw/xen_platform.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/hw/xen_platform.c b/hw/xen_platform.c index c1fe984f07..0d6c2ff8c3 100644 --- a/hw/xen_platform.c +++ b/hw/xen_platform.c @@ -87,9 +87,6 @@ static void unplug_nic(PCIBus *b, PCIDevice *d, void *o) { if (pci_get_word(d->config + PCI_CLASS_DEVICE) == PCI_CLASS_NETWORK_ETHERNET) { - /* Until qdev_free includes a call to object_unparent, we call it here - */ - object_unparent(&d->qdev.parent_obj); qdev_free(&d->qdev); } } |