[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH stable-1.1 20/26] qdev: release parent properties on

From: Michael Roth
Subject: [Qemu-devel] [PATCH stable-1.1 20/26] qdev: release parent properties on dc->init failure
Date: Fri, 22 Jun 2012 19:33:24 -0500

From: Jason Baron <address@hidden>

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 
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 */
    return 0;

Signed-off-by: Jason Baron <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
 hw/qdev.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/hw/qdev.c b/hw/qdev.c
index 6a8f6bd..af419b9 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -150,6 +150,7 @@ int qdev_init(DeviceState *dev)
     rc = dc->init(dev);
     if (rc < 0) {
+        object_unparent(OBJECT(dev));
         return rc;

reply via email to

[Prev in Thread] Current Thread [Next in Thread]