projects
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d282842
)
qdev-monitor: Propagate errors through set_property()
author
Markus Armbruster
<armbru@redhat.com>
Thu, 12 Mar 2015 12:58:02 +0000
(13:58 +0100)
committer
Markus Armbruster
<armbru@redhat.com>
Mon, 22 Jun 2015 16:20:39 +0000
(18:20 +0200)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
qdev-monitor.c
patch
|
blob
|
history
diff --git
a/qdev-monitor.c
b/qdev-monitor.c
index 12d8f6b96986ed6a32bf9709544d6c13588164bc..c7b00e046ab8f5bad38f278a96f6d18081e8b480 100644
(file)
--- 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;