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/qdev-monitor.c | |
| parent | 7a85d1cf1cf9b2b9379c35f1b672d1661e2d8132 (diff) | |
| parent | 0c9dfe460d0c239cc0dc78d6223118cb63261b45 (diff) | |
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/qdev-monitor.c')
| -rw-r--r-- | hw/qdev-monitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index 41b9e2c82f..eed781d2f0 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); |