diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-04-03 10:05:07 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-18 15:14:37 +0200 |
| commit | 4b3582b06b6105ac182a051e4f3647da2c99fd66 (patch) | |
| tree | 3b20ee936fdbe34116652e8dadad95eab985e640 | |
| parent | bce544740a87cac1636f01c8a28502fec1694b3d (diff) | |
| download | qemu-4b3582b06b6105ac182a051e4f3647da2c99fd66.tar.gz qemu-4b3582b06b6105ac182a051e4f3647da2c99fd66.tar.bz2 qemu-4b3582b06b6105ac182a051e4f3647da2c99fd66.zip | |
qdev: Clean up global properties
Now that global properties do not depend on buses anymore, set
them directly in the device instance_init function.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | hw/qdev-monitor.c | 1 | ||||
| -rw-r--r-- | hw/qdev.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index b608eb443f..390d467e89 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) { @@ -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. */ |