[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/21] qdev: clean up global properties
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 13/21] qdev: clean up global properties |
Date: |
Wed, 2 May 2012 13:31:05 +0200 |
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>
---
hw/qdev-monitor.c | 1 -
hw/qdev.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
index d9c6adc..6f2d83e 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 98efc8b..7288b8e 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;
}
@@ -615,6 +614,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.9.3
- Re: [Qemu-devel] [PATCH 07/21] qdev: fix -device foo,?, (continued)
- [Qemu-devel] [PATCH 10/21] qdev: do not propagate properties to subclasses, Paolo Bonzini, 2012/05/02
- [Qemu-devel] [PATCH 09/21] qdev: move bus properties to a separate global, Paolo Bonzini, 2012/05/02
- [Qemu-devel] [PATCH 13/21] qdev: clean up global properties,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 15/21] qdev: fix adding of ptr properties, Paolo Bonzini, 2012/05/02
- [Qemu-devel] [PATCH 14/21] qdev: remove qdev_prop_set_defaults, Paolo Bonzini, 2012/05/02
- [Qemu-devel] [PATCH 17/21] qdev: move sysbus initialization to sysbus.c, Paolo Bonzini, 2012/05/02
- [Qemu-devel] [PATCH 19/21] qdev: connect busses with their parent devices, Paolo Bonzini, 2012/05/02