diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-14 10:15:52 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-14 10:15:52 -0500 |
commit | 8592d5259a2be71fdca45fc0db62a5ad10abe9f5 (patch) | |
tree | 93d7c1b91928d5fb4cbcc5c2f2238f74f5ec72e5 /hw | |
parent | 7a85d1cf1cf9b2b9379c35f1b672d1661e2d8132 (diff) | |
parent | 0c9dfe460d0c239cc0dc78d6223118cb63261b45 (diff) | |
download | qemu-8592d5259a2be71fdca45fc0db62a5ad10abe9f5.zip qemu-8592d5259a2be71fdca45fc0db62a5ad10abe9f5.tar.gz qemu-8592d5259a2be71fdca45fc0db62a5ad10abe9f5.tar.bz2 |
Merge remote-tracking branch 'afaerber-or/qom-1.1' into staging
* afaerber-or/qom-1.1:
mips_fulong2e: Don't register "cpu" VMState twice
pc: Add back PCI.rombar compat property
qdev: Fix adding of ptr properties
qdev: Use object_property_print() in info qtree
target-i386: Defer MCE init
qom: Documentation addition for object_class_by_name()
target-mips: Remove commented-out function declaration
Diffstat (limited to 'hw')
-rw-r--r-- | hw/mips_fulong2e.c | 1 | ||||
-rw-r--r-- | hw/pc_piix.c | 4 | ||||
-rw-r--r-- | hw/qdev-monitor.c | 2 | ||||
-rw-r--r-- | hw/qdev.c | 5 |
4 files changed, 9 insertions, 3 deletions
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c index 37dc711..1a8df10 100644 --- a/hw/mips_fulong2e.c +++ b/hw/mips_fulong2e.c @@ -284,7 +284,6 @@ static void mips_fulong2e_init(ram_addr_t ram_size, const char *boot_device, exit(1); } - register_savevm(NULL, "cpu", 0, 3, cpu_save, cpu_load, env); qemu_register_reset(main_cpu_reset, env); /* fulong 2e has 256M ram. */ diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 6a75718..a7aad4b 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -522,6 +522,10 @@ static QEMUMachine pc_machine_v0_12 = { .driver = "virtio-blk-pci",\ .property = "vectors",\ .value = stringify(0),\ + },{\ + .driver = "PCI",\ + .property = "rombar",\ + .value = stringify(0),\ } static QEMUMachine pc_machine_v0_11 = { diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index 41b9e2c..eed781d 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -493,7 +493,7 @@ static void qdev_print_props(Monitor *mon, DeviceState *dev, Property *props, if (object_property_get_type(OBJECT(dev), legacy_name, NULL)) { value = object_property_get_str(OBJECT(dev), legacy_name, &err); } else { - value = object_property_get_str(OBJECT(dev), props->name, &err); + value = object_property_print(OBJECT(dev), props->name, &err); } g_free(legacy_name); @@ -576,9 +576,12 @@ void qdev_property_add_legacy(DeviceState *dev, Property *prop, { gchar *name, *type; - if (!prop->info->print && !prop->info->parse) { + /* Register pointer properties as legacy properties */ + if (!prop->info->print && !prop->info->parse && + (prop->info->set || prop->info->get)) { return; } + name = g_strdup_printf("legacy-%s", prop->name); type = g_strdup_printf("legacy<%s>", prop->info->legacy_name ?: prop->info->name); |