summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-01-25 14:12:32 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2013-02-01 15:53:10 -0600
commit9d127820ebbdc76592e3922cbbe803533455f9a2 (patch)
treeca86daf8c4ea33e7b37ebc64be584e652e210fb0 /hw
parent6c232d2ffb7cf60e9fdf5dc17c5d5f7fe6d1ca64 (diff)
downloadqemu-9d127820ebbdc76592e3922cbbe803533455f9a2.tar.gz
qdev: add reference count to a device for the BusChild
Each device has a reference through the BusChild. This reference was not accounted for, add it now. Reviewed-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/qdev.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/qdev.c b/hw/qdev.c
index b80b082a00..9a8b8c1621 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)),