From patchwork Wed Apr 11 21:30:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 151908 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9A227B7069 for ; Thu, 12 Apr 2012 08:36:07 +1000 (EST) Received: from localhost ([::1]:34581 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI58h-0000Z4-NY for incoming@patchwork.ozlabs.org; Wed, 11 Apr 2012 17:31:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI57z-00072Z-U3 for qemu-devel@nongnu.org; Wed, 11 Apr 2012 17:31:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SI57y-0002Yb-3Z for qemu-devel@nongnu.org; Wed, 11 Apr 2012 17:30:59 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:35576) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI57x-0002YG-R8 for qemu-devel@nongnu.org; Wed, 11 Apr 2012 17:30:58 -0400 Received: by werp12 with SMTP id p12so992253wer.4 for ; Wed, 11 Apr 2012 14:30:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=fXG4PAV5B5JNgvIvRrPUAickrs/XNHeO9R/miChXvVk=; b=YfDYo5+hwJJW5bMZ6tcjx3VaW4eQRcE729qvQeYtlHBUhRFnBmTcap9T/V1C9+104k ixcqaODVmZ/3eYrEJ3/15RqM6s+SIsoOImoOf4FQ7xaz3728jqgrnItIZGLj8TJsVZss w6tCMpAj80f/EQ5bNqVjQwoZaX/8BVHQQaOwgJImsSVePCBg3TBdoHzNocfZknXE/WuH jGKFdVaZAoQiflzRpzOc4XuRn7FEUUGf2I2HShw2J0l3S6rWSAHIWLl3JfJwYjw1Wc2j x63VlcxZeM650lwP9iUjYGKTGZ3bafiXtAHmZEooQyXp3hXsIyj0Z9sg1X3mPptVlYz0 8Chw== Received: by 10.180.92.71 with SMTP id ck7mr107028wib.2.1334179855939; Wed, 11 Apr 2012 14:30:55 -0700 (PDT) Received: from yakj.lan (93-34-182-16.ip50.fastwebnet.it. [93.34.182.16]) by mx.google.com with ESMTPS id h8sm13849678wix.4.2012.04.11.14.30.54 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Apr 2012 14:30:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 11 Apr 2012 23:30:25 +0200 Message-Id: <1334179842-6061-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.9.3 In-Reply-To: <1334179793-5914-1-git-send-email-pbonzini@redhat.com> References: <1334179793-5914-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.173 Cc: aliguori@us.ibm.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v2 07/24] qdev: use object_property_print in info qtree X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 0acfc82..07ac525 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -492,7 +492,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 f3ffaa6..ff36946 100644 --- a/qom/object.c +++ b/qom/object.c @@ -850,7 +850,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;