From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCvjT-0004ps-Dg for qemu-devel@nongnu.org; Mon, 10 Feb 2014 13:37:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCvjC-0005tp-KS for qemu-devel@nongnu.org; Mon, 10 Feb 2014 13:37:27 -0500 Received: from cantor2.suse.de ([195.135.220.15]:47162 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCvjC-0005qG-Er for qemu-devel@nongnu.org; Mon, 10 Feb 2014 13:37:10 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 10 Feb 2014 19:36:57 +0100 Message-Id: <1392057426-31990-41-git-send-email-afaerber@suse.de> In-Reply-To: <1392057426-31990-1-git-send-email-afaerber@suse.de> References: <1392057426-31990-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 40/48] qdev: Inline qdev_prop_parse() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Paolo Bonzini Reviewed-by: Igor Mammedov Reviewed-by: Eric Blake Signed-off-by: Paolo Bonzini Signed-off-by: Andreas F=C3=A4rber --- 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, in= t ret, DeviceState *dev, } } =20 -void qdev_prop_parse(DeviceState *dev, const char *name, const char *val= ue, - 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 *de= v, const char *typename, if (strcmp(typename, prop->driver) !=3D 0) { continue; } - qdev_prop_parse(dev, prop->property, prop->value, &err); + object_property_parse(OBJECT(dev), prop->value, prop->property, = &err); if (err !=3D 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; =20 /* 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 *val= ue, - 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 val= ue); void qdev_prop_set_uint16(DeviceState *dev, const char *name, uint16_t v= alue); 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) =20 static int set_property(const char *name, const char *value, void *opaqu= e) { - DeviceState *dev =3D opaque; + Object *obj =3D opaque; Error *err =3D NULL; =20 if (strcmp(name, "driver") =3D=3D 0) @@ -153,7 +153,7 @@ static int set_property(const char *name, const char = *value, void *opaque) if (strcmp(name, "bus") =3D=3D 0) return 0; =20 - qdev_prop_parse(dev, name, value, &err); + object_property_parse(obj, value, name, &err); if (err !=3D NULL) { qerror_report_err(err); error_free(err); --=20 1.8.4.5