From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sypsq-000257-Hi for qemu-devel@nongnu.org; Tue, 07 Aug 2012 15:56:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sypsp-0008Py-5i for qemu-devel@nongnu.org; Tue, 07 Aug 2012 15:56:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13272) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sypso-0008Os-Ut for qemu-devel@nongnu.org; Tue, 07 Aug 2012 15:56:03 -0400 From: Eduardo Habkost Date: Tue, 7 Aug 2012 16:56:45 -0300 Message-Id: <1344369413-9053-8-git-send-email-ehabkost@redhat.com> In-Reply-To: <1344369413-9053-1-git-send-email-ehabkost@redhat.com> References: <1344369413-9053-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 07/15] qdev: allow qdev_prop_parse() to report errors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Gleb Natapov , Paolo Bonzini Signed-off-by: Eduardo Habkost --- hw/qdev-monitor.c | 6 +++++- hw/qdev-properties.c | 21 ++++++++------------- hw/qdev.h | 3 ++- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index b22a37a..99784c1 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -101,13 +101,17 @@ static void qdev_print_devinfo(ObjectClass *klass, void *opaque) static int set_property(const char *name, const char *value, void *opaque) { DeviceState *dev = opaque; + Error *err = NULL; if (strcmp(name, "driver") == 0) return 0; if (strcmp(name, "bus") == 0) return 0; - if (qdev_prop_parse(dev, name, value) == -1) { + qdev_prop_parse(dev, name, value, &err); + if (err) { + qerror_report_err(err); + error_free(err); return -1; } return 0; diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 8aca0d4..a52884f 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -1087,25 +1087,17 @@ 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) +void qdev_prop_parse(DeviceState *dev, const char *name, const char *value, + Error **errp) { char *legacy_name; - Error *err = NULL; - legacy_name = g_strdup_printf("legacy-%s", name); if (object_property_get_type(OBJECT(dev), legacy_name, NULL)) { - object_property_parse(OBJECT(dev), value, legacy_name, &err); + object_property_parse(OBJECT(dev), value, legacy_name, errp); } else { - object_property_parse(OBJECT(dev), value, name, &err); + object_property_parse(OBJECT(dev), value, name, errp); } g_free(legacy_name); - - if (err) { - qerror_report_err(err); - error_free(err); - return -1; - } - return 0; } void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value) @@ -1250,11 +1242,14 @@ void qdev_prop_set_globals(DeviceState *dev) do { GlobalProperty *prop; + Error *err = NULL; QTAILQ_FOREACH(prop, &global_props, next) { if (strcmp(object_class_get_name(class), prop->driver) != 0) { continue; } - if (qdev_prop_parse(dev, prop->property, prop->value) != 0) { + qdev_prop_parse(dev, prop->property, prop->value, &err); + if (err) { + qerror_report_err(err); exit(1); } } diff --git a/hw/qdev.h b/hw/qdev.h index d699194..41db6c0 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -311,7 +311,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); +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); -- 1.7.11.2