From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:32851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPXms-0003kb-Sg for qemu-devel@nongnu.org; Wed, 02 May 2012 07:32:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SPXmm-0000Jt-LI for qemu-devel@nongnu.org; Wed, 02 May 2012 07:32:02 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:48124) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPXmm-0000FY-Cg for qemu-devel@nongnu.org; Wed, 02 May 2012 07:31:56 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so1148607pbb.4 for ; Wed, 02 May 2012 04:31:55 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 2 May 2012 13:31:00 +0200 Message-Id: <1335958273-769-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1335958273-769-1-git-send-email-pbonzini@redhat.com> References: <1335958273-769-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 08/21] qdev: use object_property_print in info qtree List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, liwp@linux.vnet.ibm.com, afaerber@suse.de Otherwise, non-string properties without a legacy counterpart are missed. Also fix error propagation in object_property_print itself. Signed-off-by: Paolo Bonzini --- hw/qdev-monitor.c | 2 +- qom/object.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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); diff --git a/qom/object.c b/qom/object.c index 464fc8f..b4f6c1d 100644 --- a/qom/object.c +++ b/qom/object.c @@ -839,7 +839,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; -- 1.7.9.3