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>

diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
index b608eb443fa65a8896b373f29f96389dcf71b841..390d467e894f7c23a3ac9fa5054ec646e45bdcdc 100644 (file)
--- 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 f239902291caa8bff477b74baffa3e6c99fcbb2e..483f2e619d038912dd89b438d691c223fd1057f3 100644 (file)
--- 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.  */