Patchwork qdev: Drop misleading qbus_free() function

login
register
mail settings
Submitter Stefan Hajnoczi
Date Dec. 18, 2013, 4:15 p.m.
Message ID <1387383351-24121-1-git-send-email-stefanha@redhat.com>
Download mbox | patch
Permalink /patch/302971/
State New
Headers show

Comments

Stefan Hajnoczi - Dec. 18, 2013, 4:15 p.m.
Same reasoning as commit 02a5c4c97422b40034f31265e0f139f7846172a8
("qdev: Drop misleading qdev_free() function").  The qbus_free()
function removes the child from the namespace and decrements the
reference count.  It does not, however, guarantee to free the child
since the refcount may still be held.

Just call object_unparent() directly.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/core/qdev.c         | 7 +------
 hw/pci/pci_bridge.c    | 2 +-
 include/hw/qdev-core.h | 2 --
 3 files changed, 2 insertions(+), 9 deletions(-)
Andreas Färber - Dec. 18, 2013, 4:33 p.m.
Am 18.12.2013 17:15, schrieb Stefan Hajnoczi:
> Same reasoning as commit 02a5c4c97422b40034f31265e0f139f7846172a8
> ("qdev: Drop misleading qdev_free() function").  The qbus_free()
> function removes the child from the namespace and decrements the
> reference count.  It does not, however, guarantee to free the child
> since the refcount may still be held.
> 
> Just call object_unparent() directly.
> 
> Suggested-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Thanks, nice and trivial, applied to qom-next:
https://github.com/afaerber/qemu-cpu/commits/qom-next

Andreas

Patch

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index e374a93..bbd780a 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -481,11 +481,6 @@  BusState *qbus_create(const char *typename, DeviceState *parent, const char *nam
     return bus;
 }
 
-void qbus_free(BusState *bus)
-{
-    object_unparent(OBJECT(bus));
-}
-
 static char *bus_get_fw_dev_path(BusState *bus, DeviceState *dev)
 {
     BusClass *bc = BUS_GET_CLASS(bus);
@@ -794,7 +789,7 @@  static void device_unparent(Object *obj)
 
     while (dev->num_child_bus) {
         bus = QLIST_FIRST(&dev->child_bus);
-        qbus_free(bus);
+        object_unparent(OBJECT(bus));
     }
     if (dev->realized) {
         object_property_set_bool(obj, false, "realized", NULL);
diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
index f72872e..355c3e1 100644
--- a/hw/pci/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
@@ -391,7 +391,7 @@  void pci_bridge_exitfn(PCIDevice *pci_dev)
     pci_bridge_region_cleanup(s, s->windows);
     memory_region_destroy(&s->address_space_mem);
     memory_region_destroy(&s->address_space_io);
-    /* qbus_free() is called automatically during device deletion */
+    /* object_unparent() is called automatically during device deletion */
 }
 
 /*
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index f2043a6..2f6e1d1 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -272,8 +272,6 @@  void qdev_reset_all(DeviceState *dev);
 void qbus_reset_all(BusState *bus);
 void qbus_reset_all_fn(void *opaque);
 
-void qbus_free(BusState *bus);
-
 /* This should go away once we get rid of the NULL bus hack */
 BusState *sysbus_get_default(void);