From patchwork Sat Jun 13 11:18:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 483844 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 95BCE14016A for ; Sat, 13 Jun 2015 21:21:15 +1000 (AEST) Received: from localhost ([::1]:55526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3jUv-0004x6-Fh for incoming@patchwork.ozlabs.org; Sat, 13 Jun 2015 07:21:13 -0400 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 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id B3EBDB7CCD; Sat, 13 Jun 2015 11:18:27 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-35.ams2.redhat.com [10.36.116.35]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5DBIP1A021431 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sat, 13 Jun 2015 07:18:27 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 43656303F190; Sat, 13 Jun 2015 13:18:23 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, afaerber@suse.de, kraxel@redhat.com Subject: [Qemu-devel] [PATCH v2 6/7] qdev-monitor: Propagate errors through set_property() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Andreas Färber --- 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;