From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgLpy-0008P9-9c for qemu-devel@nongnu.org; Wed, 05 Dec 2012 15:44:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TgLpw-0001C7-Qs for qemu-devel@nongnu.org; Wed, 05 Dec 2012 15:44:58 -0500 Received: from mail-ee0-f45.google.com ([74.125.83.45]:34805) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgLpw-0001A6-LA for qemu-devel@nongnu.org; Wed, 05 Dec 2012 15:44:56 -0500 Received: by mail-ee0-f45.google.com with SMTP id d49so3380479eek.4 for ; Wed, 05 Dec 2012 12:44:56 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 5 Dec 2012 21:44:35 +0100 Message-Id: <1354740282-20679-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1354740282-20679-1-git-send-email-pbonzini@redhat.com> References: <1354740282-20679-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 04/11] qdev: add reference count to a device for the BusChild List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, afaerber@suse.de Each device has a reference through the BusChild. This reference was not accounted for, add it now. 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 e758131..87dfcb5 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -65,7 +65,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; } @@ -83,9 +86,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.0.1