Commit da5a44e8 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Anthony Liguori
Browse files

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: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 26efaca3

hw/acpi_piix4.c

+0 −1
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots) 
            if (pc->no_hotplug) {

                slot_free = false;

            } else {

                object_unparent(OBJECT(dev));

                qdev_free(qdev);

            }

        }

hw/qdev.c

+0 −2
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ int qdev_init(DeviceState *dev) 


    rc = dc->init(dev);

    if (rc < 0) {

        object_unparent(OBJECT(dev));

        qdev_free(dev);

        return rc;

    }
@@ -243,7 +242,6 @@ void qbus_reset_all_fn(void *opaque) 
int qdev_simple_unplug_cb(DeviceState *dev)

{

    /* just zap it */

    object_unparent(OBJECT(dev));

    qdev_free(dev);

    return 0;

}

hw/shpc.c

+0 −1
Original line number Diff line number Diff line
@@ -253,7 +253,6 @@ static void shpc_free_devices_in_slot(SHPCDevice *shpc, int slot) 
         ++devfn) {

        PCIDevice *affected_dev = shpc->sec_bus->devices[devfn];

        if (affected_dev) {

            object_unparent(OBJECT(affected_dev));

            qdev_free(&affected_dev->qdev);

        }

    }

hw/xen_platform.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

    }

}

qom/object.c

+2 −3
Original line number Diff line number Diff line
@@ -373,8 +373,6 @@ static void object_deinit(Object *obj, TypeImpl *type) 
    if (type_has_parent(type)) {

        object_deinit(obj, type_get_parent(type));

    }



    object_unparent(obj);

}



void object_finalize(void *data)
@@ -411,8 +409,9 @@ Object *object_new(const char *typename) 


void object_delete(Object *obj)

{

    object_unparent(obj);

    g_assert(obj->ref == 1);

    object_unref(obj);

    g_assert(obj->ref == 0);

    g_free(obj);

}