From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WC4jz-0007lh-Va for qemu-devel@nongnu.org; Sat, 08 Feb 2014 05:02:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WC4jr-0004Iw-JI for qemu-devel@nongnu.org; Sat, 08 Feb 2014 05:02:27 -0500 Received: from mail-ee0-x22d.google.com ([2a00:1450:4013:c00::22d]:52553) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WC4jr-0004Ig-DC for qemu-devel@nongnu.org; Sat, 08 Feb 2014 05:02:19 -0500 Received: by mail-ee0-f45.google.com with SMTP id b15so1931800eek.18 for ; Sat, 08 Feb 2014 02:02:18 -0800 (PST) Received: from yakj.usersys.redhat.com.cz (auth47-172.fi.muni.cz. [147.251.47.172]) by mx.google.com with ESMTPSA id k41sm27156087een.19.2014.02.08.02.02.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Feb 2014 02:02:17 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Sat, 8 Feb 2014 11:01:49 +0100 Message-Id: <1391853717-3837-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1391853717-3837-1-git-send-email-pbonzini@redhat.com> References: <1391853717-3837-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 06/14] qdev: inline qdev_prop_parse List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Reviewed-by: Igor Mammedov Reviewed-by: Eric Blake Signed-off-by: Paolo Bonzini --- hw/core/qdev-properties.c | 8 +------- include/hw/qdev-properties.h | 2 -- qdev-monitor.c | 4 ++-- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index a60a183..22ddebf 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -933,12 +933,6 @@ void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *dev, } } -void qdev_prop_parse(DeviceState *dev, const char *name, const char *value, - Error **errp) -{ - object_property_parse(OBJECT(dev), value, name, errp); -} - void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value) { object_property_set_bool(OBJECT(dev), value, name, &error_abort); @@ -1031,7 +1025,7 @@ void qdev_prop_set_globals_for_type(DeviceState *dev, const char *typename, if (strcmp(typename, prop->driver) != 0) { continue; } - qdev_prop_parse(dev, prop->property, prop->value, &err); + object_property_parse(OBJECT(dev), prop->value, prop->property, &err); if (err != NULL) { error_propagate(errp, err); return; diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 77c6f7c..4651459 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -168,8 +168,6 @@ extern PropertyInfo qdev_prop_arraylen; /* Set properties between creation and init. */ void *qdev_get_prop_ptr(DeviceState *dev, Property *prop); -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/qdev-monitor.c b/qdev-monitor.c index 1d3b68d..4d1634c 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -145,7 +145,7 @@ static void qdev_print_devinfos(bool show_no_user) static int set_property(const char *name, const char *value, void *opaque) { - DeviceState *dev = opaque; + Object *obj = opaque; Error *err = NULL; if (strcmp(name, "driver") == 0) @@ -153,7 +153,7 @@ static int set_property(const char *name, const char *value, void *opaque) if (strcmp(name, "bus") == 0) return 0; - qdev_prop_parse(dev, name, value, &err); + object_property_parse(obj, value, name, &err); if (err != NULL) { qerror_report_err(err); error_free(err); -- 1.8.5.3