From: Markus Armbruster <armbru@redhat.com>
Date: Thu, 12 Mar 2015 12:58:02 +0000 (+0100)
Subject: qdev-monitor: Propagate errors through set_property()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4caa489d1337c1a72d2e36185e4586ad246b98e1;p=qemu.git

qdev-monitor: Propagate errors through set_property()

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/qdev-monitor.c b/qdev-monitor.c
index 12d8f6b969..c7b00e046a 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -156,8 +156,7 @@ static int set_property(void *opaque, const char *name, const char *value,
 
     object_property_parse(obj, value, name, &err);
     if (err != NULL) {
-        qerror_report_err(err);
-        error_free(err);
+        error_propagate(errp, err);
         return -1;
     }
     return 0;
@@ -592,7 +591,8 @@ DeviceState *qdev_device_add(QemuOpts *opts)
     }
 
     /* set properties */
-    if (qemu_opt_foreach(opts, set_property, dev, NULL)) {
+    if (qemu_opt_foreach(opts, set_property, dev, &err)) {
+        qerror_report_err(err);
         object_unparent(OBJECT(dev));
         object_unref(OBJECT(dev));
         return NULL;