Commit 4caa489d authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qdev-monitor: Propagate errors through set_property() 



Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarAndreas Färber <afaerber@suse.de>
parent d2828429

qdev-monitor.c

+3 −3
Original line number Diff line number Diff line
@@ -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;