Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging

[qemu.git] / qdev-monitor.c

diff --git a/qdev-monitor.c b/qdev-monitor.c
index 1d3b68d40a790c70947cc0f401299553228dff02..6673e3cb6187e9c7062863a91eaff871d993f00b 100644 (file)
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -145,7 +145,7 @@ static void qdev_print_devinfos(bool show_no_user)
 
 static int set_property(const char *name, const char *value, void *opaque)
 {
 
 static int set_property(const char *name, const char *value, void *opaque)
 {

-    DeviceState *dev = opaque;
+    Object *obj = opaque;

     Error *err = NULL;
 
     if (strcmp(name, "driver") == 0)
     Error *err = NULL;
 
     if (strcmp(name, "driver") == 0)


@@ -153,7 +153,7 @@ static int set_property(const char *name, const char *value, void *opaque)
     if (strcmp(name, "bus") == 0)
         return 0;
 
     if (strcmp(name, "bus") == 0)
         return 0;
 

-    qdev_prop_parse(dev, name, value, &err);
+    object_property_parse(obj, value, name, &err);

     if (err != NULL) {
         qerror_report_err(err);
         error_free(err);
     if (err != NULL) {
         qerror_report_err(err);
         error_free(err);


@@ -548,16 +548,18 @@ DeviceState *qdev_device_add(QemuOpts *opts)
                                   OBJECT(dev), NULL);
         g_free(name);
     }
                                   OBJECT(dev), NULL);
         g_free(name);
     }

+
+    dev->opts = opts;

     object_property_set_bool(OBJECT(dev), true, "realized", &err);
     if (err != NULL) {
         qerror_report_err(err);
         error_free(err);
     object_property_set_bool(OBJECT(dev), true, "realized", &err);
     if (err != NULL) {
         qerror_report_err(err);
         error_free(err);

+        dev->opts = NULL;

         object_unparent(OBJECT(dev));
         object_unref(OBJECT(dev));
         qerror_report(QERR_DEVICE_INIT_FAILED, driver);
         return NULL;
     }
         object_unparent(OBJECT(dev));
         object_unref(OBJECT(dev));
         qerror_report(QERR_DEVICE_INIT_FAILED, driver);
         return NULL;
     }

-    dev->opts = opts;

     return dev;
 }
 
     return dev;
 }
 


@@ -577,7 +579,7 @@ static void qdev_print_props(Monitor *mon, DeviceState *dev, Property *props,
         if (object_property_get_type(OBJECT(dev), legacy_name, NULL)) {
             value = object_property_get_str(OBJECT(dev), legacy_name, &err);
         } else {
         if (object_property_get_type(OBJECT(dev), legacy_name, NULL)) {
             value = object_property_get_str(OBJECT(dev), legacy_name, &err);
         } else {

-            value = object_property_print(OBJECT(dev), props->name, &err);
+            value = object_property_print(OBJECT(dev), props->name, true, &err);

         }
         g_free(legacy_name);
 
         }
         g_free(legacy_name);
 


@@ -656,7 +658,7 @@ int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data)
     DeviceState *dev;
 
     opts = qemu_opts_from_qdict(qemu_find_opts("device"), qdict, &local_err);
     DeviceState *dev;
 
     opts = qemu_opts_from_qdict(qemu_find_opts("device"), qdict, &local_err);

-    if (error_is_set(&local_err)) {
+    if (local_err) {

         qerror_report_err(local_err);
         error_free(local_err);
         return -1;
         qerror_report_err(local_err);
         error_free(local_err);
         return -1;