]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commit
qdev: release parent properties on dc->init failure
authorJason Baron <jbaron@redhat.com>
Thu, 3 May 2012 02:42:10 +0000 (22:42 -0400)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Mon, 25 Jun 2012 13:55:12 +0000 (08:55 -0500)
commitf63e60327b8e239ae97fa71060940ca20a8bf38e
treea5a79e00244880e48683a5af6297a11ccc292fa5
parent0ec39075710ae15acc2a5825cd21e0c229fa04af
qdev: release parent properties on dc->init failure

While looking into hot-plugging bridges, I can create a qemu segfault via:

$ device_add pci-bridge

Bridge chassis not specified. Each bridge is required to be assigned a unique chassis id > 0.
**
ERROR:qom/object.c:389:object_delete: assertion failed: (obj->ref == 0)

I'm proposing to fix this by adding a call to 'object_unparent()', before the
call to qdev_free(). I see there is already a precedent for this usage pattern as
seen in qdev_simple_unplug_cb():

/* can be used as ->unplug() callback for the simple cases */
int qdev_simple_unplug_cb(DeviceState *dev)
{
    /* just zap it */
    object_unparent(OBJECT(dev));
    qdev_free(dev);
    return 0;
}

Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 266ca11a0433643a3cc3146a9837d9f2b0bfbe3b)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
hw/qdev.c