From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:42293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R3l3M-0007KG-VU for qemu-devel@nongnu.org; Wed, 14 Sep 2011 04:42:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R3l3G-0000WL-27 for qemu-devel@nongnu.org; Wed, 14 Sep 2011 04:42:44 -0400 From: Alexander Graf Date: Wed, 14 Sep 2011 10:42:27 +0200 Message-Id: <1315989802-18753-4-git-send-email-agraf@suse.de> In-Reply-To: <1315989802-18753-1-git-send-email-agraf@suse.de> References: <1315989802-18753-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 03/58] spapr: make irq customizable via qdev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Developers Cc: Blue Swirl , Paolo Bonzini , qemu-ppc@nongnu.org, Aurelien Jarno , David Gibson From: Paolo Bonzini This also lets the user see the irq in "info qtree". Signed-off-by: Paolo Bonzini Cc: Alexander Graf Cc: David Gibson Signed-off-by: Alexander Graf --- hw/spapr_vio.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/hw/spapr_vio.c b/hw/spapr_vio.c index ba2e1c1..0546ccb 100644 --- a/hw/spapr_vio.c +++ b/hw/spapr_vio.c @@ -52,6 +52,10 @@ static struct BusInfo spapr_vio_bus_info = { .name = "spapr-vio", .size = sizeof(VIOsPAPRBus), + .props = (Property[]) { + DEFINE_PROP_UINT32("irq", VIOsPAPRDevice, vio_irq_num, 0), \ + DEFINE_PROP_END_OF_LIST(), + }, }; VIOsPAPRDevice *spapr_vio_find_by_reg(VIOsPAPRBus *bus, uint32_t reg) @@ -604,7 +608,9 @@ static int spapr_vio_busdev_init(DeviceState *qdev, DeviceInfo *qinfo) } dev->qdev.id = id; - dev->vio_irq_num = bus->irq++; + if (!dev->vio_irq_num) { + dev->vio_irq_num = bus->irq++; + } dev->qirq = spapr_find_qirq(spapr, dev->vio_irq_num); rtce_init(dev); -- 1.6.0.2