[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/22] qdev: Clean up global properties
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 13/22] qdev: Clean up global properties |
Date: |
Mon, 18 Jun 2012 15:59:05 +0200 |
From: Paolo Bonzini <address@hidden>
Now that global properties do not depend on buses anymore, set
them directly in the device instance_init function.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/qdev-monitor.c | 1 -
hw/qdev.c | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
index b608eb4..390d467 100644
--- a/hw/qdev-monitor.c
+++ b/hw/qdev-monitor.c
@@ -440,7 +440,6 @@ DeviceState *qdev_device_add(QemuOpts *opts)
/* create device, set properties */
qdev = DEVICE(object_new(driver));
qdev_set_parent_bus(qdev, bus);
- qdev_prop_set_globals(qdev);
id = qemu_opts_id(opts);
if (id) {
diff --git a/hw/qdev.c b/hw/qdev.c
index f239902..483f2e6 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -111,7 +111,6 @@ DeviceState *qdev_try_create(BusState *bus, const char
*type)
}
qdev_set_parent_bus(dev, bus);
- qdev_prop_set_globals(dev);
return dev;
}
@@ -618,6 +617,7 @@ static void device_initfn(Object *obj)
qdev_prop_set_defaults(dev, DEVICE_CLASS(class)->props);
class = object_class_get_parent(class);
} while (class != object_class_by_name(TYPE_DEVICE));
+ qdev_prop_set_globals(dev);
}
/* Unlink device from bus and free the structure. */
--
1.7.7
- [Qemu-devel] [PATCH 18/22] qdev: Connect busses with their parent devices, (continued)
- [Qemu-devel] [PATCH 18/22] qdev: Connect busses with their parent devices, Andreas Färber, 2012/06/18
- [Qemu-devel] [PATCH 04/22] qom: Add class_base_init, Andreas Färber, 2012/06/18
- [Qemu-devel] [PATCH 08/22] m48t59: Rename "type" property to "model", Andreas Färber, 2012/06/18
- [Qemu-devel] [PATCH 22/22] qom: Push error reporting to object_property_find(), Andreas Färber, 2012/06/18
- [Qemu-devel] [PATCH 10/22] qdev: Push "type" property up to Object, Andreas Färber, 2012/06/18
- [Qemu-devel] [PATCH 06/22] qom: Drop type_register_static_alias() macro, Andreas Färber, 2012/06/18
- [Qemu-devel] [PATCH 02/22] qom: Introduce object_property_is_{child, link}(), Andreas Färber, 2012/06/18
- [Qemu-devel] [PATCH 11/22] qdev: Move bus properties to a separate global, Andreas Färber, 2012/06/18
- [Qemu-devel] [PATCH 12/22] qdev: Move bus properties to abstract superclasses, Andreas Färber, 2012/06/18
- [Qemu-devel] [PATCH 19/22] qbus: Make child devices links, Andreas Färber, 2012/06/18
- [Qemu-devel] [PATCH 13/22] qdev: Clean up global properties,
Andreas Färber <=
- [Qemu-devel] [PATCH 14/22] qdev: Remove qdev_prop_set_defaults, Andreas Färber, 2012/06/18
- [Qemu-devel] [PATCH 21/22] qdev: Remove qdev_prop_exists(), Andreas Färber, 2012/06/18
- [Qemu-devel] [PATCH 17/22] qdev: Convert busses to QEMU Object Model, Andreas Färber, 2012/06/18
- [Qemu-devel] [PATCH 15/22] qdev: Use wrapper for qdev_get_path, Andreas Färber, 2012/06/18
- Re: [Qemu-devel] [PULL] qom-next queue, second batch: QBus, API additions and cleanups, Anthony Liguori, 2012/06/20