[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/23] qdev: implement cleanup logic in finalize
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [PATCH 19/23] qdev: implement cleanup logic in finalize |
Date: |
Mon, 30 Jan 2012 15:08:57 -0600 |
Signed-off-by: Anthony Liguori <address@hidden>
---
hw/qdev.c | 57 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/hw/qdev.c b/hw/qdev.c
index 91dbbc7..f04f0fa 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -246,31 +246,6 @@ void qdev_init_nofail(DeviceState *dev)
/* Unlink device from bus and free the structure. */
void qdev_free(DeviceState *dev)
{
- BusState *bus;
- Property *prop;
- DeviceClass *dc = DEVICE_GET_CLASS(dev);
-
- if (dev->state == DEV_STATE_INITIALIZED) {
- 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);
- }
- }
- QTAILQ_REMOVE(&dev->parent_bus->children, dev, sibling);
- for (prop = qdev_get_props(dev); prop && prop->name; prop++) {
- if (prop->info->free) {
- prop->info->free(dev, prop);
- }
- }
object_delete(OBJECT(dev));
}
@@ -633,6 +608,37 @@ static void device_initfn(Object *obj)
object_property_add_str(OBJECT(dev), "type", qdev_get_type, NULL, NULL);
}
+/* Unlink device from bus and free the structure. */
+static void device_finalize(Object *obj)
+{
+ DeviceState *dev = DEVICE(obj);
+ BusState *bus;
+ Property *prop;
+ DeviceClass *dc = DEVICE_GET_CLASS(dev);
+
+ if (dev->state == DEV_STATE_INITIALIZED) {
+ 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);
+ }
+ }
+ QTAILQ_REMOVE(&dev->parent_bus->children, dev, sibling);
+ for (prop = qdev_get_props(dev); prop && prop->name; prop++) {
+ if (prop->info->free) {
+ prop->info->free(dev, prop);
+ }
+ }
+}
+
void device_reset(DeviceState *dev)
{
DeviceClass *klass = DEVICE_GET_CLASS(dev);
@@ -647,6 +653,7 @@ static TypeInfo device_type_info = {
.parent = TYPE_OBJECT,
.instance_size = sizeof(DeviceState),
.instance_init = device_initfn,
+ .instance_finalize = device_finalize,
.abstract = true,
.class_size = sizeof(DeviceClass),
};
--
1.7.4.1
- Re: [Qemu-devel] [PATCH 11/23] qom: allow object_class_foreach to take additional parameters to refine search, (continued)
- [Qemu-devel] [PATCH 20/23] info qdm: do not require a parent_bus to be set, Anthony Liguori, 2012/01/30
- [Qemu-devel] [PATCH 19/23] qdev: implement cleanup logic in finalize,
Anthony Liguori <=
- [Qemu-devel] [PATCH 16/23] qdev: nuke qdev_init_chardev(), Anthony Liguori, 2012/01/30
- [Qemu-devel] [PATCH 10/23] qdev: remove baked in notion of aliases, Anthony Liguori, 2012/01/30
- [Qemu-devel] [PATCH 09/23] qdev: kill of DeviceInfo, Anthony Liguori, 2012/01/30
- [Qemu-devel] [PATCH 13/23] qdev: split out common init to instance_init, Anthony Liguori, 2012/01/30
- [Qemu-devel] [PATCH 23/23] not-for-upstream: fix device_del, Anthony Liguori, 2012/01/30
- [Qemu-devel] [PATCH 17/23] qom: move properties from qdev to object, Anthony Liguori, 2012/01/30
- [Qemu-devel] [PATCH 14/23] qdev: refactor away qdev_create_from_info, Anthony Liguori, 2012/01/30