From patchwork Fri Jan 25 13:12:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [v4,06/13] qdev: add reference count to a device for the BusChild Date: Fri, 25 Jan 2013 03:12:32 -0000 From: Paolo Bonzini X-Patchwork-Id: 215767 Message-Id: <1359119559-19075-7-git-send-email-pbonzini@redhat.com> To: qemu-devel@nongnu.org Cc: afaerber@suse.de Each device has a reference through the BusChild. This reference was not accounted for, add it now. Reviewed-by: Andreas Färber Signed-off-by: Paolo Bonzini --- hw/qdev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/qdev.c b/hw/qdev.c index b80b082..9a8b8c1 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -64,7 +64,10 @@ static void bus_remove_child(BusState *bus, DeviceState *child) snprintf(name, sizeof(name), "child[%d]", kid->index); QTAILQ_REMOVE(&bus->children, kid, sibling); + + /* This gives back ownership of kid->child back to us. */ object_property_del(OBJECT(bus), name, NULL); + object_unref(OBJECT(kid->child)); g_free(kid); return; } @@ -82,9 +85,11 @@ static void bus_add_child(BusState *bus, DeviceState *child) kid->index = bus->max_index++; kid->child = child; + object_ref(OBJECT(kid->child)); QTAILQ_INSERT_HEAD(&bus->children, kid, sibling); + /* This transfers ownership of kid->child to the property. */ snprintf(name, sizeof(name), "child[%d]", kid->index); object_property_add_link(OBJECT(bus), name, object_get_typename(OBJECT(child)),