From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53421) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWdA-0002Ws-Uj for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFWd0-0006BY-9n for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:40 -0500 Received: from cantor2.suse.de ([195.135.220.15]:41719 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWcz-0006B8-GJ for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:29 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 17 Feb 2014 23:24:57 +0100 Message-Id: <1392675899-21210-48-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 47/49] qdev: Use QAPI type names for properties 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 Use "drive", "chr", etc. only for legacy_name (which shows up in -device foo,? output). Reviewed-by: Igor Mammedov Reviewed-by: Eric Blake Signed-off-by: Paolo Bonzini Signed-off-by: Andreas F=C3=A4rber --- hw/core/qdev-properties-system.c | 12 ++++++++---- hw/core/qdev-properties.c | 18 +++++++++++------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-s= ystem.c index 3f29b49..5f5957e 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -109,7 +109,8 @@ static void set_drive(Object *obj, Visitor *v, void *= opaque, } =20 PropertyInfo qdev_prop_drive =3D { - .name =3D "drive", + .name =3D "str", + .legacy_name =3D "drive", .get =3D get_drive, .set =3D set_drive, .release =3D release_drive, @@ -164,7 +165,8 @@ static void set_chr(Object *obj, Visitor *v, void *op= aque, } =20 PropertyInfo qdev_prop_chr =3D { - .name =3D "chr", + .name =3D "str", + .legacy_name =3D "chr", .get =3D get_chr, .set =3D set_chr, .release =3D release_chr, @@ -242,7 +244,8 @@ static void set_netdev(Object *obj, Visitor *v, void = *opaque, } =20 PropertyInfo qdev_prop_netdev =3D { - .name =3D "netdev", + .name =3D "str", + .legacy_name =3D "netdev", .get =3D get_netdev, .set =3D set_netdev, }; @@ -321,7 +324,8 @@ static void set_vlan(Object *obj, Visitor *v, void *o= paque, } =20 PropertyInfo qdev_prop_vlan =3D { - .name =3D "vlan", + .name =3D "int32", + .legacy_name =3D "vlan", .print =3D print_vlan, .get =3D get_vlan, .set =3D set_vlan, diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 0a2ca05..77d0c66 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -107,7 +107,7 @@ static void prop_set_bit(Object *obj, Visitor *v, voi= d *opaque, } =20 PropertyInfo qdev_prop_bit =3D { - .name =3D "boolean", + .name =3D "bool", .legacy_name =3D "on/off", .get =3D prop_get_bit, .set =3D prop_set_bit, @@ -141,7 +141,7 @@ static void set_bool(Object *obj, Visitor *v, void *o= paque, } =20 PropertyInfo qdev_prop_bool =3D { - .name =3D "boolean", + .name =3D "bool", .get =3D get_bool, .set =3D set_bool, }; @@ -358,7 +358,7 @@ static void set_string(Object *obj, Visitor *v, void = *opaque, } =20 PropertyInfo qdev_prop_string =3D { - .name =3D "string", + .name =3D "str", .release =3D release_string, .get =3D get_string, .set =3D set_string, @@ -442,7 +442,8 @@ inval: } =20 PropertyInfo qdev_prop_macaddr =3D { - .name =3D "macaddr", + .name =3D "str", + .legacy_name =3D "macaddr", .get =3D get_mac, .set =3D set_mac, }; @@ -463,7 +464,8 @@ PropertyInfo qdev_prop_losttickpolicy =3D { QEMU_BUILD_BUG_ON(sizeof(BiosAtaTranslation) !=3D sizeof(int)); =20 PropertyInfo qdev_prop_bios_chs_trans =3D { - .name =3D "bios-chs-trans", + .name =3D "BiosAtaTranslation", + .legacy_name =3D "bios-chs-trans", .enum_table =3D BiosAtaTranslation_lookup, .get =3D get_enum, .set =3D set_enum, @@ -582,7 +584,8 @@ static void set_blocksize(Object *obj, Visitor *v, vo= id *opaque, } =20 PropertyInfo qdev_prop_blocksize =3D { - .name =3D "blocksize", + .name =3D "uint16", + .legacy_name =3D "blocksize", .get =3D get_uint16, .set =3D set_blocksize, }; @@ -689,7 +692,8 @@ inval: } =20 PropertyInfo qdev_prop_pci_host_devaddr =3D { - .name =3D "pci-host-devaddr", + .name =3D "str", + .legacy_name =3D "pci-host-devaddr", .get =3D get_pci_host_devaddr, .set =3D set_pci_host_devaddr, }; --=20 1.8.4.5