[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 10/13] qdev: inline object_delete into qbus_free/
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v4 10/13] qdev: inline object_delete into qbus_free/qdev_free |
Date: |
Fri, 25 Jan 2013 14:12:36 +0100 |
We want object_delete to disappear, and we will do this one class at a
time. Inline it for the qdev case, which we will tackle first.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/qdev.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/qdev.c b/hw/qdev.c
index 1dabcad..09f5969 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -267,7 +267,8 @@ void qdev_init_nofail(DeviceState *dev)
/* Unlink device from bus and free the structure. */
void qdev_free(DeviceState *dev)
{
- object_delete(OBJECT(dev));
+ object_unparent(OBJECT(dev));
+ object_unref(OBJECT(dev));
}
void qdev_machine_creation_done(void)
@@ -472,7 +473,8 @@ BusState *qbus_create(const char *typename, DeviceState
*parent, const char *nam
void qbus_free(BusState *bus)
{
- object_delete(OBJECT(bus));
+ object_unparent(OBJECT(bus));
+ object_unref(OBJECT(bus));
}
static char *bus_get_fw_dev_path(BusState *bus, DeviceState *dev)
--
1.8.1
- [Qemu-devel] [PATCH v4 03/13] pci: use qbus_create in pci_bus_new, (continued)
- [Qemu-devel] [PATCH v4 03/13] pci: use qbus_create in pci_bus_new, Paolo Bonzini, 2013/01/25
- [Qemu-devel] [PATCH v4 01/13] qdev: remove duplication between qbus_create and qbus_create_inplace, Paolo Bonzini, 2013/01/25
- [Qemu-devel] [PATCH v4 04/13] qom: preserve object while unparenting it, Paolo Bonzini, 2013/01/25
- [Qemu-devel] [PATCH v4 02/13] qdev: change first argument of qbus_create_inplace to void *, Paolo Bonzini, 2013/01/25
- [Qemu-devel] [PATCH v4 05/13] qom: document reference counting of link properties, Paolo Bonzini, 2013/01/25
- [Qemu-devel] [PATCH v4 08/13] qdev: move unrealization of devices from finalize to unparent, Paolo Bonzini, 2013/01/25
- [Qemu-devel] [PATCH v4 09/13] qdev: add reference for the bus while it is referred to by the DeviceState, Paolo Bonzini, 2013/01/25
- [Qemu-devel] [PATCH v4 11/13] qdev: drop extra references at creation time, Paolo Bonzini, 2013/01/25
- [Qemu-devel] [PATCH v4 12/13] cpu: do not use object_delete, Paolo Bonzini, 2013/01/25
- [Qemu-devel] [PATCH v4 10/13] qdev: inline object_delete into qbus_free/qdev_free,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v4 07/13] qdev: move deletion of children from finalize to unparent, Paolo Bonzini, 2013/01/25
- [Qemu-devel] [PATCH v4 13/13] qom: remove object_delete, Paolo Bonzini, 2013/01/25