From patchwork Tue Feb 5 20:39:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 218349 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 1FA4E2C02C6 for ; Wed, 6 Feb 2013 08:07:38 +1100 (EST) Received: from localhost ([::1]:38111 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2pHX-000372-E4 for incoming@patchwork.ozlabs.org; Tue, 05 Feb 2013 15:38:19 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2pHA-0002Rj-08 for qemu-devel@nongnu.org; Tue, 05 Feb 2013 15:38:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U2pH0-00014O-Dw for qemu-devel@nongnu.org; Tue, 05 Feb 2013 15:37:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54227) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2pH0-000148-5Z for qemu-devel@nongnu.org; Tue, 05 Feb 2013 15:37:46 -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 r15KbhgY005993 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 5 Feb 2013 15:37:44 -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 r15KbRvc020516; Tue, 5 Feb 2013 15:37:41 -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:18 +0100 Message-Id: <1360096768-8863-6-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 05/15] qdev_prop_parse(): change return type to void 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 Problems are now reported via Error only. Signed-off-by: Laszlo Ersek --- hw/qdev-properties.h | 4 ++-- hw/qdev-monitor.c | 3 ++- hw/qdev-properties.c | 14 ++++++-------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/hw/qdev-properties.h b/hw/qdev-properties.h index 0fe4030..43fd11a 100644 --- a/hw/qdev-properties.h +++ b/hw/qdev-properties.h @@ -100,8 +100,8 @@ extern PropertyInfo qdev_prop_pci_host_devaddr; /* Set properties between creation and init. */ void *qdev_get_prop_ptr(DeviceState *dev, Property *prop); -int qdev_prop_parse(DeviceState *dev, const char *name, const char *value, - Error **errp); +void qdev_prop_parse(DeviceState *dev, const char *name, const char *value, + Error **errp); void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value); void qdev_prop_set_uint8(DeviceState *dev, const char *name, uint8_t value); void qdev_prop_set_uint16(DeviceState *dev, const char *name, uint16_t value); diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index 5eb1c8c..cf96046 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -110,7 +110,8 @@ static int set_property(const char *name, const char *value, void *opaque) if (strcmp(name, "bus") == 0) return 0; - if (qdev_prop_parse(dev, name, value, &err) == -1) { + qdev_prop_parse(dev, name, value, &err); + if (error_is_set(&err)) { qerror_report_err(err); error_free(err); return -1; diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 8e3d014..d94909e 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -835,8 +835,8 @@ void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *dev, } } -int qdev_prop_parse(DeviceState *dev, const char *name, const char *value, - Error **errp) +void qdev_prop_parse(DeviceState *dev, const char *name, const char *value, + Error **errp) { char *legacy_name; Error *err = NULL; @@ -849,11 +849,7 @@ int qdev_prop_parse(DeviceState *dev, const char *name, const char *value, } g_free(legacy_name); - if (err) { - error_propagate(errp, err); - return -1; - } - return 0; + error_propagate(errp, err); } void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value) @@ -967,7 +963,9 @@ void qdev_prop_set_globals(DeviceState *dev) if (strcmp(object_class_get_name(class), prop->driver) != 0) { continue; } - if (qdev_prop_parse(dev, prop->property, prop->value, &err) != 0) { + + qdev_prop_parse(dev, prop->property, prop->value, &err); + if (error_is_set(&err)) { qerror_report_err(err); error_free(err); exit(1);