OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qdev: release parent properties on dc->init failure

Browse Source 
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>
This commit is contained in:
Jason Baron 2012-05-02 22:42:10 -04:00 committed by Michael S. Tsirkin
parent 44701ab71a
commit 266ca11a04
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/qdev.c
View File

@ -150,6 +150,7 @@ int qdev_init(DeviceState *dev)
rc = dc->init(dev); rc = dc->init(dev);
if (rc < 0) { if (rc < 0) {
object_unparent(OBJECT(dev));
qdev_free(dev); qdev_free(dev);
return rc; return rc;
} }