From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3jSI-0000N3-QW for qemu-devel@nongnu.org; Sat, 13 Jun 2015 07:18:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z3jSG-0005b4-F6 for qemu-devel@nongnu.org; Sat, 13 Jun 2015 07:18:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34779) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3jSG-0005ar-AB for qemu-devel@nongnu.org; Sat, 13 Jun 2015 07:18:28 -0400 From: Markus Armbruster Date: Sat, 13 Jun 2015 13:18:21 +0200 Message-Id: <1434194302-26589-7-git-send-email-armbru@redhat.com> In-Reply-To: <1434194302-26589-1-git-send-email-armbru@redhat.com> References: <1434194302-26589-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 6/7] qdev-monitor: Propagate errors through set_property() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, afaerber@suse.de, kraxel@redhat.com Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- qdev-monitor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index b5b9a88..e7e9a50 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; -- 1.9.3