[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 05/12] qdev: add reference count to a device for
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 05/12] qdev: add reference count to a device for the BusChild |
Date: |
Mon, 21 Jan 2013 13:30:15 +0100 |
Each device has a reference through the BusChild. This reference
was not accounted for, add it now.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/qdev.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/hw/qdev.c b/hw/qdev.c
index b473bd7..f88a8a4 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)),
--
1.8.1
- [Qemu-devel] [PATCH v2 00/12] qdev: correct reference counting, Paolo Bonzini, 2013/01/21
- [Qemu-devel] [PATCH v2 01/12] qdev: export and use qbus_init, Paolo Bonzini, 2013/01/21
- [Qemu-devel] [PATCH v2 02/12] qdev: use object_new, not g_malloc to create buses, Paolo Bonzini, 2013/01/21
- [Qemu-devel] [PATCH v2 03/12] qom: preserve object while unparenting it, Paolo Bonzini, 2013/01/21
- [Qemu-devel] [PATCH v2 05/12] qdev: add reference count to a device for the BusChild,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 06/12] qdev: move deletion of children from finalize to unparent, Paolo Bonzini, 2013/01/21
- [Qemu-devel] [PATCH v2 07/12] qdev: move unrealization of devices from finalize to unparent, Paolo Bonzini, 2013/01/21
- [Qemu-devel] [PATCH v2 11/12] cpu: do not use object_delete, Paolo Bonzini, 2013/01/21
- [Qemu-devel] [PATCH v2 09/12] qdev: inline object_delete into qbus_free/qdev_free, Paolo Bonzini, 2013/01/21
- [Qemu-devel] [PATCH v2 04/12] qom: document reference counting of link properties, Paolo Bonzini, 2013/01/21
- [Qemu-devel] [PATCH v2 08/12] qdev: add reference for the bus while it is referred to by the DeviceState, Paolo Bonzini, 2013/01/21
- [Qemu-devel] [PATCH v2 10/12] qdev: drop extra references at creation time, Paolo Bonzini, 2013/01/21
- [Qemu-devel] [PATCH v2 12/12] qom: remove object_delete, Paolo Bonzini, 2013/01/21
- Re: [Qemu-devel] [PATCH v2 00/12] qdev: correct reference counting, Anthony Liguori, 2013/01/21
- Re: [Qemu-devel] [PATCH v2 00/12] qdev: correct reference counting, Paolo Bonzini, 2013/01/25