From 18b91a3e082e7111455fd69ab43181831f8e0169 Mon Sep 17 00:00:00 2001 From: Gonglei Date: Tue, 7 Oct 2014 14:33:24 +0800 Subject: [PATCH] qdev: Drop legacy_name from qdev properties MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The legacy_name is useless now, better help information is provided by description field of property. Cc: Markus Armbruster Signed-off-by: Gonglei Reviewed-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin Signed-off-by: Andreas Färber --- hw/core/qdev-properties-system.c | 4 ---- hw/core/qdev-properties.c | 6 ------ include/hw/qdev-core.h | 1 - target-ppc/translate_init.c | 1 - 4 files changed, 12 deletions(-) diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c index 55b6636106..f2bd954be5 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -112,7 +112,6 @@ static void set_drive(Object *obj, Visitor *v, void *opaque, PropertyInfo qdev_prop_drive = { .name = "str", - .legacy_name = "drive", .description = "ID of a drive to use as a backend", .get = get_drive, .set = set_drive, @@ -170,7 +169,6 @@ static void set_chr(Object *obj, Visitor *v, void *opaque, PropertyInfo qdev_prop_chr = { .name = "str", - .legacy_name = "chr", .description = "ID of a chardev to use as a backend", .get = get_chr, .set = set_chr, @@ -250,7 +248,6 @@ static void set_netdev(Object *obj, Visitor *v, void *opaque, PropertyInfo qdev_prop_netdev = { .name = "str", - .legacy_name = "netdev", .description = "ID of a netdev to use as a backend", .get = get_netdev, .set = set_netdev, @@ -331,7 +328,6 @@ static void set_vlan(Object *obj, Visitor *v, void *opaque, PropertyInfo qdev_prop_vlan = { .name = "int32", - .legacy_name = "vlan", .description = "Integer VLAN id to connect to", .print = print_vlan, .get = get_vlan, diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 5fc711eb5c..2ed995f2b7 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -120,7 +120,6 @@ static void prop_set_bit(Object *obj, Visitor *v, void *opaque, PropertyInfo qdev_prop_bit = { .name = "bool", - .legacy_name = "on/off", .description = "on/off", .get = prop_get_bit, .set = prop_set_bit, @@ -456,7 +455,6 @@ inval: PropertyInfo qdev_prop_macaddr = { .name = "str", - .legacy_name = "macaddr", .description = "Ethernet 6-byte MAC Address, example: 52:54:00:12:34:56", .get = get_mac, .set = set_mac, @@ -479,7 +477,6 @@ QEMU_BUILD_BUG_ON(sizeof(BiosAtaTranslation) != sizeof(int)); PropertyInfo qdev_prop_bios_chs_trans = { .name = "BiosAtaTranslation", - .legacy_name = "bios-chs-trans", .description = "Logical CHS translation algorithm, " "auto/none/lba/large/rechs", .enum_table = BiosAtaTranslation_lookup, @@ -555,7 +552,6 @@ static int print_pci_devfn(DeviceState *dev, Property *prop, char *dest, PropertyInfo qdev_prop_pci_devfn = { .name = "int32", - .legacy_name = "pci-devfn", .description = "Slot and optional function number, example: 06.0 or 06", .print = print_pci_devfn, .get = get_int32, @@ -603,7 +599,6 @@ static void set_blocksize(Object *obj, Visitor *v, void *opaque, PropertyInfo qdev_prop_blocksize = { .name = "uint16", - .legacy_name = "blocksize", .description = "A power of two between 512 and 32768", .get = get_uint16, .set = set_blocksize, @@ -712,7 +707,6 @@ inval: PropertyInfo qdev_prop_pci_host_devaddr = { .name = "str", - .legacy_name = "pci-host-devaddr", .description = "Address (bus/device/function) of " "the host device, example: 04:10.0", .get = get_pci_host_devaddr, diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index c30e50268f..1fca75c591 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -230,7 +230,6 @@ struct Property { struct PropertyInfo { const char *name; - const char *legacy_name; const char *description; const char **enum_table; int (*print)(DeviceState *dev, Property *prop, char *dest, size_t len); diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 0312e04778..33fb4cc9c3 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -8044,7 +8044,6 @@ static void powerpc_set_compat(Object *obj, Visitor *v, static PropertyInfo powerpc_compat_propinfo = { .name = "str", - .legacy_name = "powerpc-server-compat", .description = "compatibility mode, power6/power7/power8", .get = powerpc_get_compat, .set = powerpc_set_compat, -- 2.11.4.GIT