From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53297) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWd3-0002Qx-T4 for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFWct-00068B-EA for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:33 -0500 Received: from cantor2.suse.de ([195.135.220.15]:41674 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWct-000682-43 for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:23 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 17 Feb 2014 23:24:48 +0100 Message-Id: <1392675899-21210-39-git-send-email-afaerber@suse.de> In-Reply-To: <1392675899-21210-1-git-send-email-afaerber@suse.de> References: <1392675899-21210-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 v2 38/49] qdev: Legacy properties are now read-only 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 | 10 +--------- hw/core/qdev.c | 30 ++---------------------------- include/hw/qdev-core.h | 1 - 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index e223ce1..a60a183 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -936,15 +936,7 @@ void error_set_from_qdev_prop_error(Error **errp, in= t ret, DeviceState *dev, void qdev_prop_parse(DeviceState *dev, const char *name, const char *val= ue, Error **errp) { - char *legacy_name; - - legacy_name =3D g_strdup_printf("legacy-%s", name); - if (object_property_get_type(OBJECT(dev), legacy_name, NULL)) { - object_property_parse(OBJECT(dev), value, legacy_name, errp); - } else { - object_property_parse(OBJECT(dev), value, name, errp); - } - g_free(legacy_name); + object_property_parse(OBJECT(dev), value, name, errp); } =20 void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 82a9123..7c1b732 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -578,31 +578,6 @@ static void qdev_get_legacy_property(Object *obj, Vi= sitor *v, void *opaque, visit_type_str(v, &ptr, name, errp); } =20 -static void qdev_set_legacy_property(Object *obj, Visitor *v, void *opaq= ue, - const char *name, Error **errp) -{ - DeviceState *dev =3D DEVICE(obj); - Property *prop =3D opaque; - Error *local_err =3D NULL; - char *ptr =3D NULL; - int ret; - - if (dev->realized) { - qdev_prop_set_after_realize(dev, name, errp); - return; - } - - visit_type_str(v, &ptr, name, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } - - ret =3D prop->info->parse(dev, prop, ptr); - error_set_from_qdev_prop_error(errp, ret, dev, prop, ptr); - g_free(ptr); -} - /** * @qdev_add_legacy_property - adds a legacy property * @@ -618,8 +593,7 @@ void qdev_property_add_legacy(DeviceState *dev, Prope= rty *prop, gchar *name, *type; =20 /* Register pointer properties as legacy properties */ - if (!prop->info->print && !prop->info->parse && - (prop->info->set || prop->info->get)) { + if (!prop->info->print && prop->info->get) { return; } =20 @@ -629,7 +603,7 @@ void qdev_property_add_legacy(DeviceState *dev, Prope= rty *prop, =20 object_property_add(OBJECT(dev), name, type, prop->info->print ? qdev_get_legacy_property : p= rop->info->get, - prop->info->parse ? qdev_set_legacy_property : p= rop->info->set, + NULL, NULL, prop, errp); =20 diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 2c4f140..d0cda38 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -209,7 +209,6 @@ struct PropertyInfo { const char *name; const char *legacy_name; const char **enum_table; - int (*parse)(DeviceState *dev, Property *prop, const char *str); int (*print)(DeviceState *dev, Property *prop, char *dest, size_t le= n); ObjectPropertyAccessor *get; ObjectPropertyAccessor *set; --=20 1.8.4.5