From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STdWq-00081U-Ot for qemu-devel@nongnu.org; Sun, 13 May 2012 14:28:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1STdWn-0007YJ-Q3 for qemu-devel@nongnu.org; Sun, 13 May 2012 14:28:24 -0400 Received: from cantor2.suse.de ([195.135.220.15]:38461 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STdWn-0007Xn-Jz for qemu-devel@nongnu.org; Sun, 13 May 2012 14:28:21 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 13 May 2012 20:27:42 +0200 Message-Id: <1336933665-3867-5-git-send-email-afaerber@suse.de> In-Reply-To: <1336933665-3867-1-git-send-email-afaerber@suse.de> References: <1336933665-3867-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 4/7] 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: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws From: Paolo Bonzini Otherwise, non-string properties without a legacy counterpart are missed. Also fix error propagation in object_property_print() itself. Signed-off-by: Paolo Bonzini Reviewed-by: Anthony Liguori Signed-off-by: Andreas F=C3=A4rber --- 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 dc4e4e1..a06748c 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -493,7 +493,7 @@ static void qdev_print_props(Monitor *mon, DeviceStat= e *dev, Property *props, if (object_property_get_type(OBJECT(dev), legacy_name, NULL)) { value =3D object_property_get_str(OBJECT(dev), legacy_name, = &err); } else { - value =3D object_property_get_str(OBJECT(dev), props->name, = &err); + value =3D object_property_print(OBJECT(dev), props->name, &e= rr); } g_free(legacy_name); =20 diff --git a/qom/object.c b/qom/object.c index e721fc2..6f839ad 100644 --- a/qom/object.c +++ b/qom/object.c @@ -830,7 +830,7 @@ char *object_property_print(Object *obj, const char *= name, char *string; =20 mo =3D 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 =3D string_output_get_string(mo); string_output_visitor_cleanup(mo); return string; --=20 1.7.7