From patchwork Sat Dec 26 21:19:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Baum X-Patchwork-Id: 41810 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9BD9DB7BFF for ; Sun, 27 Dec 2009 08:26:15 +1100 (EST) Received: from localhost ([127.0.0.1]:42604 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NOe9L-0006DA-Li for incoming@patchwork.ozlabs.org; Sat, 26 Dec 2009 16:26:11 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NOe30-0004CT-C7 for qemu-devel@nongnu.org; Sat, 26 Dec 2009 16:19:38 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NOe2t-00049w-PF for qemu-devel@nongnu.org; Sat, 26 Dec 2009 16:19:36 -0500 Received: from [199.232.76.173] (port=43614 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NOe2t-00049m-HP for qemu-devel@nongnu.org; Sat, 26 Dec 2009 16:19:31 -0500 Received: from smarthost.c4l.co.uk ([82.197.83.77]:53785) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NOe2t-0005Dy-3a for qemu-devel@nongnu.org; Sat, 26 Dec 2009 16:19:31 -0500 Received: from [93.97.162.229] (helo=mx.parenthephobia.org.uk) by smarthost.c4l.co.uk with esmtp (Exim 4.69) (envelope-from ) id 1NOe2p-0007uI-Jv for qemu-devel@nongnu.org; Sat, 26 Dec 2009 21:19:28 +0000 Received: from athens (93-97-162-231.zone5.bethere.co.uk [93.97.162.231]) by mx.parenthephobia.org.uk (Postfix) with ESMTP id 3664C53784 for ; Sat, 26 Dec 2009 21:26:48 +0000 (GMT) Received: by athens (Postfix, from userid 1000) id CE18F5EEEC; Sat, 26 Dec 2009 21:19:23 +0000 (GMT) From: Nathan Baum To: qemu-devel@nongnu.org Date: Sat, 26 Dec 2009 21:19:17 +0000 Message-Id: <1261862362-2530-7-git-send-email-nathan@parenthephobia.org.uk> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1261862362-2530-1-git-send-email-nathan@parenthephobia.org.uk> References: <1261862362-2530-1-git-send-email-nathan@parenthephobia.org.uk> X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 06/11] qdev: sysbus_dev_info X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Returns information about the system bus as a QObject. Signed-off-by: Nathan Baum --- hw/sysbus.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/hw/sysbus.c b/hw/sysbus.c index 1f7f138..2092d9f 100644 --- a/hw/sysbus.c +++ b/hw/sysbus.c @@ -20,6 +20,7 @@ #include "sysbus.h" #include "sysemu.h" #include "monitor.h" +#include "qjson.h" static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent); @@ -170,3 +171,20 @@ static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent) indent, "", s->mmio[i].addr, s->mmio[i].size); } } + +static QObject *sysbus_dev_info(Monitor *mon, DeviceState *dev) +{ + SysBusDevice *s = sysbus_from_qdev(dev); + QDict *dict = qdict_new(); + QList *list = qlist_new(); + int i; + + for (i = 0; i < s->num_mmio; i++) { + qlist_append_obj(list, qobject_from_jsonf("{ 'addr': " TARGET_FMT_plx ", 'size': " TARGET_FMT_plx " }", + s->mmio[i].addr, s->mmio[i].size)); + } + + qdict_put(dict, "mmio", list); + return (QObject *) dict; + +}