From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:37651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOq3Z-0008R0-7i for qemu-devel@nongnu.org; Tue, 24 May 2011 07:45:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QOq3Y-0004aH-EJ for qemu-devel@nongnu.org; Tue, 24 May 2011 07:45:49 -0400 Received: from mail-pv0-f173.google.com ([74.125.83.173]:38611) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOq3Y-0004ZT-9p for qemu-devel@nongnu.org; Tue, 24 May 2011 07:45:48 -0400 Received: by mail-pv0-f173.google.com with SMTP id 3so3579545pvg.4 for ; Tue, 24 May 2011 04:45:47 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 24 May 2011 13:45:07 +0200 Message-Id: <1306237507-19189-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1306237507-19189-1-git-send-email-pbonzini@redhat.com> References: <1306237507-19189-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] spapr: make irq customizable via qdev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agraf@suse.de, david@gibson.dropbear.id.au Signed-off-by: Paolo Bonzini Cc: Alexander Graf Cc: David Gibson --- 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 be535d6..fee4c46 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 = xics_find_qirq(spapr->icp, dev->vio_irq_num); rtce_init(dev); -- 1.7.4.4