diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2011-12-18 17:05:10 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-19 10:27:34 -0600 |
| commit | cafe5bdb9a6179f80562e99ef3f29bdf0b5df678 (patch) | |
| tree | aa01bcb7568b61048a466f4e780e326ddef4a655 /hw/qdev.c | |
| parent | 80e555c2418c50e5130fed6245537dfd2ba4bebd (diff) | |
| download | focaccia-qemu-cafe5bdb9a6179f80562e99ef3f29bdf0b5df678.tar.gz focaccia-qemu-cafe5bdb9a6179f80562e99ef3f29bdf0b5df678.zip | |
qom: distinguish "legacy" property type name from QOM type name
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/qdev.c')
| -rw-r--r-- | hw/qdev.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/hw/qdev.c b/hw/qdev.c index 2a146f7e43..c6fcf4c2ed 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -218,13 +218,15 @@ int qdev_device_help(QemuOpts *opts) if (!prop->info->parse) { continue; /* no way to set it, don't show */ } - error_printf("%s.%s=%s\n", info->name, prop->name, prop->info->name); + error_printf("%s.%s=%s\n", info->name, prop->name, + prop->info->legacy_name ?: prop->info->name); } for (prop = info->bus_info->props; prop && prop->name; prop++) { if (!prop->info->parse) { continue; /* no way to set it, don't show */ } - error_printf("%s.%s=%s\n", info->name, prop->name, prop->info->name); + error_printf("%s.%s=%s\n", info->name, prop->name, + prop->info->legacy_name ?: prop->info->name); } return 1; } @@ -1180,7 +1182,8 @@ void qdev_property_add_legacy(DeviceState *dev, Property *prop, { gchar *type; - type = g_strdup_printf("legacy<%s>", prop->info->name); + type = g_strdup_printf("legacy<%s>", + prop->info->legacy_name ?: prop->info->name); qdev_property_add(dev, prop->name, type, prop->info->print ? qdev_get_legacy_property : NULL, |