[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 07/12] qdev: move unrealization of devices from f
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 07/12] qdev: move unrealization of devices from finalize to unparent |
Date: |
Fri, 25 Jan 2013 12:46:55 +0100 |
Similarly, a bus holds a reference back to the device, and this will
prevent the device from going away as soon as this reference is counted
properly. To avoid this, move the unrealization of devices to the
unparent callback. This includes recursively unparenting all the buses
and (after the previous patch) the devices on those buses, which ensures
that the web of references completely disappears for all devices that
reside (in the qdev tree) below the one being unplugged.
After this patch, the qdev tree and the bus<->child relationship is
defined as "A is above B, iff unplugging A will automatically unplug B".
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/qdev.c | 35 +++++++++++++++++------------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/hw/qdev.c b/hw/qdev.c
index 364386d..b3c1e65 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -738,23 +738,8 @@ static void device_initfn(Object *obj)
static void device_finalize(Object *obj)
{
DeviceState *dev = DEVICE(obj);
- BusState *bus;
- DeviceClass *dc = DEVICE_GET_CLASS(dev);
-
- if (dev->realized) {
- while (dev->num_child_bus) {
- bus = QLIST_FIRST(&dev->child_bus);
- qbus_free(bus);
- }
- if (qdev_get_vmsd(dev)) {
- vmstate_unregister(dev, qdev_get_vmsd(dev), dev);
- }
- if (dc->exit) {
- dc->exit(dev);
- }
- if (dev->opts) {
- qemu_opts_del(dev->opts);
- }
+ if (dev->opts) {
+ qemu_opts_del(dev->opts);
}
}
@@ -771,8 +756,22 @@ static void device_class_base_init(ObjectClass *class,
void *data)
static void device_unparent(Object *obj)
{
DeviceState *dev = DEVICE(obj);
+ DeviceClass *dc = DEVICE_GET_CLASS(dev);
+ BusState *bus;
- if (dev->parent_bus != NULL) {
+ while (dev->num_child_bus) {
+ bus = QLIST_FIRST(&dev->child_bus);
+ qbus_free(bus);
+ }
+ if (dev->realized) {
+ if (qdev_get_vmsd(dev)) {
+ vmstate_unregister(dev, qdev_get_vmsd(dev), dev);
+ }
+ if (dc->exit) {
+ dc->exit(dev);
+ }
+ }
+ if (dev->parent_bus) {
bus_remove_child(dev->parent_bus, dev);
}
}
--
1.8.1
- Re: [Qemu-devel] [PATCH v3 03/12] qom: preserve object while unparenting it, (continued)
- [Qemu-devel] [PATCH v3 02/12] pci: use qbus_create in pci_bus_new, Paolo Bonzini, 2013/01/25
- [Qemu-devel] [PATCH v3 04/12] qom: document reference counting of link properties, Paolo Bonzini, 2013/01/25
- [Qemu-devel] [PATCH v3 05/12] qdev: add reference count to a device for the BusChild, Paolo Bonzini, 2013/01/25
- [Qemu-devel] [PATCH v3 09/12] qdev: inline object_delete into qbus_free/qdev_free, Paolo Bonzini, 2013/01/25
- [Qemu-devel] [PATCH v3 06/12] qdev: move deletion of children from finalize to unparent, Paolo Bonzini, 2013/01/25
- [Qemu-devel] [PATCH v3 07/12] qdev: move unrealization of devices from finalize to unparent,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v3 10/12] qdev: drop extra references at creation time, Paolo Bonzini, 2013/01/25
- [Qemu-devel] [PATCH v3 12/12] qom: remove object_delete, Paolo Bonzini, 2013/01/25