qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com, afaerber@suse.de
Subject: [Qemu-devel] [PATCH 04/11] qdev: add reference count to a device for the BusChild
Date: Wed,  5 Dec 2012 21:44:35 +0100	[thread overview]
Message-ID: <1354740282-20679-5-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1354740282-20679-1-git-send-email-pbonzini@redhat.com>

Each device has a reference through the BusChild.  This reference
was not accounted for, add it now.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 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

  parent reply	other threads:[~2012-12-05 20:44 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-05 20:44 [Qemu-devel] [PATCH 00/11] qdev: correct reference counting Paolo Bonzini
2012-12-05 20:44 ` [Qemu-devel] [PATCH 01/11] qdev: export and use qbus_init Paolo Bonzini
2012-12-18 21:18   ` Andreas Färber
2012-12-05 20:44 ` [Qemu-devel] [PATCH 02/11] qdev: use object_new, not g_malloc to create buses Paolo Bonzini
2012-12-05 20:44 ` [Qemu-devel] [PATCH 03/11] qom: preserve object while unparenting it Paolo Bonzini
2012-12-18 20:43   ` Andreas Färber
2012-12-05 20:44 ` Paolo Bonzini [this message]
2013-01-07 20:26   ` [Qemu-devel] [PATCH 04/11] qdev: add reference count to a device for the BusChild Anthony Liguori
2013-01-09 13:23     ` Paolo Bonzini
2012-12-05 20:44 ` [Qemu-devel] [PATCH 05/11] qdev: move deletion of children from finalize to unparent Paolo Bonzini
2012-12-05 20:44 ` [Qemu-devel] [PATCH 06/11] qdev: move unrealization of devices " Paolo Bonzini
2012-12-05 20:44 ` [Qemu-devel] [PATCH 07/11] qdev: add reference for the bus while it is referred to by the DeviceState Paolo Bonzini
2013-01-07 20:29   ` Anthony Liguori
2013-01-09 13:25     ` Paolo Bonzini
2012-12-05 20:44 ` [Qemu-devel] [PATCH 08/11] qdev: inline object_delete into qbus_free/qdev_free Paolo Bonzini
2012-12-05 20:44 ` [Qemu-devel] [PATCH 09/11] qdev: drop extra references at creation time Paolo Bonzini
2012-12-05 20:44 ` [Qemu-devel] [PATCH 10/11] cpu: do not use object_delete Paolo Bonzini
2012-12-18 21:07   ` Andreas Färber
2012-12-18 21:19     ` Paolo Bonzini
2012-12-05 20:44 ` [Qemu-devel] [PATCH 11/11] qom: remove object_delete Paolo Bonzini
2012-12-17 13:07 ` [Qemu-devel] [PATCH 00/11] qdev: correct reference counting Paolo Bonzini
2013-01-07 20:31 ` Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1354740282-20679-5-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=afaerber@suse.de \
    --cc=aliguori@us.ibm.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).