[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 47/49] qdev: Use QAPI type names for properties
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL v2 47/49] qdev: Use QAPI type names for properties |
Date: |
Mon, 17 Feb 2014 23:24:57 +0100 |
From: Paolo Bonzini <address@hidden>
Use "drive", "chr", etc. only for legacy_name (which shows up
in -device foo,? output).
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
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-system.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,
}
PropertyInfo qdev_prop_drive = {
- .name = "drive",
+ .name = "str",
+ .legacy_name = "drive",
.get = get_drive,
.set = set_drive,
.release = release_drive,
@@ -164,7 +165,8 @@ static void set_chr(Object *obj, Visitor *v, void *opaque,
}
PropertyInfo qdev_prop_chr = {
- .name = "chr",
+ .name = "str",
+ .legacy_name = "chr",
.get = get_chr,
.set = set_chr,
.release = release_chr,
@@ -242,7 +244,8 @@ static void set_netdev(Object *obj, Visitor *v, void
*opaque,
}
PropertyInfo qdev_prop_netdev = {
- .name = "netdev",
+ .name = "str",
+ .legacy_name = "netdev",
.get = get_netdev,
.set = set_netdev,
};
@@ -321,7 +324,8 @@ static void set_vlan(Object *obj, Visitor *v, void *opaque,
}
PropertyInfo qdev_prop_vlan = {
- .name = "vlan",
+ .name = "int32",
+ .legacy_name = "vlan",
.print = print_vlan,
.get = get_vlan,
.set = 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, void
*opaque,
}
PropertyInfo qdev_prop_bit = {
- .name = "boolean",
+ .name = "bool",
.legacy_name = "on/off",
.get = prop_get_bit,
.set = prop_set_bit,
@@ -141,7 +141,7 @@ static void set_bool(Object *obj, Visitor *v, void *opaque,
}
PropertyInfo qdev_prop_bool = {
- .name = "boolean",
+ .name = "bool",
.get = get_bool,
.set = set_bool,
};
@@ -358,7 +358,7 @@ static void set_string(Object *obj, Visitor *v, void
*opaque,
}
PropertyInfo qdev_prop_string = {
- .name = "string",
+ .name = "str",
.release = release_string,
.get = get_string,
.set = set_string,
@@ -442,7 +442,8 @@ inval:
}
PropertyInfo qdev_prop_macaddr = {
- .name = "macaddr",
+ .name = "str",
+ .legacy_name = "macaddr",
.get = get_mac,
.set = set_mac,
};
@@ -463,7 +464,8 @@ PropertyInfo qdev_prop_losttickpolicy = {
QEMU_BUILD_BUG_ON(sizeof(BiosAtaTranslation) != sizeof(int));
PropertyInfo qdev_prop_bios_chs_trans = {
- .name = "bios-chs-trans",
+ .name = "BiosAtaTranslation",
+ .legacy_name = "bios-chs-trans",
.enum_table = BiosAtaTranslation_lookup,
.get = get_enum,
.set = set_enum,
@@ -582,7 +584,8 @@ static void set_blocksize(Object *obj, Visitor *v, void
*opaque,
}
PropertyInfo qdev_prop_blocksize = {
- .name = "blocksize",
+ .name = "uint16",
+ .legacy_name = "blocksize",
.get = get_uint16,
.set = set_blocksize,
};
@@ -689,7 +692,8 @@ inval:
}
PropertyInfo qdev_prop_pci_host_devaddr = {
- .name = "pci-host-devaddr",
+ .name = "str",
+ .legacy_name = "pci-host-devaddr",
.get = get_pci_host_devaddr,
.set = set_pci_host_devaddr,
};
--
1.8.4.5
- [Qemu-devel] [PULL v2 37/49] qdev: Remove legacy parsers for hex8/32/64, (continued)
- [Qemu-devel] [PULL v2 37/49] qdev: Remove legacy parsers for hex8/32/64, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 40/49] qdev: Inline qdev_prop_parse(), Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 38/49] qdev: Legacy properties are now read-only, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 41/49] qapi: Add human mode to StringOutputVisitor, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 42/49] qdev: Use human mode in "info qtree", Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 43/49] qdev: Remove most legacy printers, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 46/49] qdev: Add enum property types to QAPI schema, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 44/49] qdev: Remove hex8/32/64 property types, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 47/49] qdev: Use QAPI type names for properties,
Andreas Färber <=
- [Qemu-devel] [PULL v2 48/49] qapi: Refine human printing of sizes, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 49/49] qtest: Include system headers before user headers, Andreas Färber, 2014/02/17
- [Qemu-devel] [PULL v2 45/49] block: Handle "rechs" and "large" translation options, Andreas Färber, 2014/02/17
- Re: [Qemu-devel] [PULL v2 00/49] QOM devices patch queue 2014-02-17, Peter Maydell, 2014/02/20