Skip to content

Commit

Permalink
qdev-monitor: Propagate errors through set_property()
Browse files Browse the repository at this point in the history
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
  • Loading branch information
Markus Armbruster committed Jun 22, 2015
1 parent d282842 commit 4caa489
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions qdev-monitor.c
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 4caa489

Please sign in to comment.