From patchwork Sat Dec 26 21:19:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Baum X-Patchwork-Id: 41807 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 61FDEB7BF8 for ; Sun, 27 Dec 2009 08:20:20 +1100 (EST) Received: from localhost ([127.0.0.1]:53885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NOe3d-0004BD-4d for incoming@patchwork.ozlabs.org; Sat, 26 Dec 2009 16:20:17 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NOe2x-0004Ag-5O for qemu-devel@nongnu.org; Sat, 26 Dec 2009 16:19:35 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NOe2s-00049Y-Ag for qemu-devel@nongnu.org; Sat, 26 Dec 2009 16:19:34 -0500 Received: from [199.232.76.173] (port=43611 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NOe2s-00049V-6B for qemu-devel@nongnu.org; Sat, 26 Dec 2009 16:19:30 -0500 Received: from smarthost.c4l.co.uk ([82.197.83.77]:53783) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NOe2r-0005Dg-N7 for qemu-devel@nongnu.org; Sat, 26 Dec 2009 16:19:30 -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 1NOe2o-0007uG-ND for qemu-devel@nongnu.org; Sat, 26 Dec 2009 21:19:27 +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 3D5BE53707 for ; Sat, 26 Dec 2009 21:26:46 +0000 (GMT) Received: by athens (Postfix, from userid 1000) id AE7955EABB; Sat, 26 Dec 2009 21:19:23 +0000 (GMT) From: Nathan Baum To: qemu-devel@nongnu.org Date: Sat, 26 Dec 2009 21:19:13 +0000 Message-Id: <1261862362-2530-3-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 02/11] qdev: isabus_dev_info returns a QObject detailing the IRQ lines used by the device. 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 Signed-off-by: Nathan Baum --- hw/isa-bus.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 4d489d2..b3d599f 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -21,6 +21,8 @@ #include "monitor.h" #include "sysbus.h" #include "isa.h" +#include "qjson.h" +#include "qint.h" struct ISABus { BusState qbus; @@ -143,6 +145,21 @@ static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent) } } +static QObject *isabus_dev_info(Monitor *mon, DeviceState *dev) +{ + ISADevice *d = DO_UPCAST(ISADevice, qdev, dev); + + if (d->isairq[1] != -1) { + return qobject_from_jsonf("{'irq':[%d,%d]}", + d->isairq[0], d->isairq[1]); + } else if (d->isairq[0] != -1) { + return qobject_from_jsonf("{'irq':[%d]}", + d->isairq[0]); + } else { + return qobject_from_jsonf("{'irq':[]}"); + } +} + static int isabus_bridge_init(SysBusDevice *dev) { /* nothing */