diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2012-05-02 13:31:00 +0200 |
|---|---|---|
| committer |   Andreas Färber <afaerber@suse.de> | 2012-05-12 14:17:52 +0200 |
| commit | 8185bfc146309bef43d6b0ed0e6afc27369ff0fa (patch) | |
| tree | eac664335e5b71627b4faf095e941487d5729036 | |
| parent | target-i386: Defer MCE init (diff) | |
| download | qemu-kvm-8185bfc146309bef43d6b0ed0e6afc27369ff0fa.tar.gz qemu-kvm-8185bfc146309bef43d6b0ed0e6afc27369ff0fa.tar.bz2 qemu-kvm-8185bfc146309bef43d6b0ed0e6afc27369ff0fa.zip | |
qdev: Use object_property_print() in info qtree
Otherwise, non-string properties without a legacy counterpart are missed.
Also fix error propagation in object_property_print() itself.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | hw/qdev-monitor.c | 2 | ||||
| -rw-r--r-- | qom/object.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index dc4e4e1b8..a06748c37 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); diff --git a/qom/object.c b/qom/object.c index e721fc28f..6f839ad8c 100644 --- a/qom/object.c +++ b/qom/object.c @@ -830,7 +830,7 @@ char *object_property_print(Object *obj, const char *name, char *string; mo = string_output_visitor_new(); - object_property_get(obj, string_output_get_visitor(mo), name, NULL); + object_property_get(obj, string_output_get_visitor(mo), name, errp); string = string_output_get_string(mo); string_output_visitor_cleanup(mo); return string; |