From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5x6u-0004bU-Uy for qemu-devel@nongnu.org; Fri, 19 Jun 2015 10:17:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5x6s-0002WW-0b for qemu-devel@nongnu.org; Fri, 19 Jun 2015 10:17:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42170) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5x6r-0002WN-R9 for qemu-devel@nongnu.org; Fri, 19 Jun 2015 10:17:33 -0400 From: Markus Armbruster Date: Fri, 19 Jun 2015 16:17:27 +0200 Message-Id: <1434723448-24879-7-git-send-email-armbru@redhat.com> In-Reply-To: <1434723448-24879-1-git-send-email-armbru@redhat.com> References: <1434723448-24879-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 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 Reviewed-by: Andreas F=C3=A4rber --- qdev-monitor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index 12d8f6b..c7b00e0 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -156,8 +156,7 @@ static int set_property(void *opaque, const char *nam= e, const char *value, =20 object_property_parse(obj, value, name, &err); if (err !=3D 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) } =20 /* 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; --=20 1.9.3