From patchwork Tue Feb 5 20:39:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 218346 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CCF522C02C1 for ; Wed, 6 Feb 2013 08:00:40 +1100 (EST) Received: from localhost ([::1]:38931 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2pHl-0003T3-0w for incoming@patchwork.ozlabs.org; Tue, 05 Feb 2013 15:38:33 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56264) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2pHF-0002kd-Sw for qemu-devel@nongnu.org; Tue, 05 Feb 2013 15:38:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U2pH7-00017W-HL for qemu-devel@nongnu.org; Tue, 05 Feb 2013 15:38:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52706) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2pH7-00017I-8D for qemu-devel@nongnu.org; Tue, 05 Feb 2013 15:37:53 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r15KbnDO011802 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 5 Feb 2013 15:37:49 -0500 Received: from lacos-laptop.usersys.redhat.com (vpn1-5-180.ams2.redhat.com [10.36.5.180]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r15KbRve020516; Tue, 5 Feb 2013 15:37:46 -0500 From: Laszlo Ersek To: aliguori@us.ibm.com, pbonzini@redhat.com, afaerber@suse.de, lcapitulino@redhat.com, stefanha@linux.vnet.ibm.com, xiawenc@linux.vnet.ibm.com, kwolf@redhat.com, ehabkost@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org Date: Tue, 5 Feb 2013 21:39:20 +0100 Message-Id: <1360096768-8863-8-git-send-email-lersek@redhat.com> In-Reply-To: <1360096768-8863-1-git-send-email-lersek@redhat.com> References: <1360096768-8863-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 07/15] set_property(): push error handling to callers 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 The return type can't be changed to void, because "set_property" must have type "qemu_opt_loopfunc". Conversion status (call chains covered or substituted by error propagation marked with square brackets): do_device_add -> [qemu_find_opts -> error_report] do_device_add -> qdev_device_add -> qerror_report do_device_add -> qdev_device_add -> qbus_find -> qbus_find_recursive -> qerror_report do_device_add -> qdev_device_add -> qbus_find -> qerror_report do_device_add -> qdev_device_add -> [set_property -> qdev_prop_parse -> qerror_report_err] Signed-off-by: Laszlo Ersek --- hw/qdev-monitor.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index 545e66c..da32763 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -117,8 +117,7 @@ static int set_property(const char *name, const char *value, void *opaque) qdev_prop_parse(ctx->dev, name, value, &err); if (error_is_set(&err)) { - qerror_report_err(err); - error_free(err); + error_propagate(ctx->errp, err); return -1; } return 0; @@ -424,6 +423,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) const char *driver, *path, *id; DeviceState *qdev; BusState *bus; + Error *local_err = NULL; driver = qemu_opt_get(opts, "driver"); if (!driver) { @@ -488,9 +488,11 @@ DeviceState *qdev_device_add(QemuOpts *opts) } { - PropertyContext ctx = { .dev = qdev, .errp = NULL }; + PropertyContext ctx = { .dev = qdev, .errp = &local_err }; if (qemu_opt_foreach(opts, set_property, &ctx, 1) != 0) { + qerror_report_err(local_err); + error_free(local_err); qdev_free(qdev); return NULL; }