From patchwork Mon Jul 9 19:17:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 169944 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 2385D2C0219 for ; Tue, 10 Jul 2012 05:44:17 +1000 (EST) Received: from localhost ([::1]:41453 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoJUJ-0003hj-7s for incoming@patchwork.ozlabs.org; Mon, 09 Jul 2012 15:19:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40649) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoJT4-0000jR-5F for qemu-devel@nongnu.org; Mon, 09 Jul 2012 15:17:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SoJSy-0003ML-Iq for qemu-devel@nongnu.org; Mon, 09 Jul 2012 15:17:57 -0400 Received: from vms173001pub.verizon.net ([206.46.173.1]:42348) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoJSy-0003Li-DO for qemu-devel@nongnu.org; Mon, 09 Jul 2012 15:17:52 -0400 Received: from wf-rch.minyard.home ([unknown] [173.57.151.210]) by vms173001.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0M6W00DKOQWQ9K7N@vms173001.mailsrvcs.net> for qemu-devel@nongnu.org; Mon, 09 Jul 2012 14:17:20 -0500 (CDT) Received: from i.minyard.home (i2.minyard.home [192.168.27.116]) by wf-rch.minyard.home (Postfix) with ESMTP id D16BF1F94F; Mon, 09 Jul 2012 14:17:12 -0500 (CDT) Received: by i.minyard.home (Postfix, from userid 1000) id CE058811FB; Mon, 09 Jul 2012 14:17:11 -0500 (CDT) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Mon, 09 Jul 2012 14:17:03 -0500 Message-id: <1341861429-6297-4-git-send-email-minyard@acm.org> X-Mailer: git-send-email 1.7.4.1 In-reply-to: <1341861429-6297-1-git-send-email-minyard@acm.org> References: <1341861429-6297-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Solaris 10 (1203?) X-Received-From: 206.46.173.1 Cc: Corey Minyard Subject: [Qemu-devel] [PATCH 3/9] isa: Add a way to query for a free interrupt 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 From: Corey Minyard This lets devices that don't care about their interrupt number, like IPMI, just grab any unused interrupt. Signed-off-by: Corey Minyard --- hw/isa-bus.c | 13 +++++++++++++ hw/isa.h | 2 ++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 5a43f03..f561f21 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -71,6 +71,7 @@ qemu_irq isa_get_irq(ISADevice *dev, int isairq) if (isairq < 0 || isairq > 15) { hw_error("isa irq %d invalid", isairq); } + isabus->irq_inuse[isairq] = 1; return isabus->irqs[isairq]; } @@ -82,6 +83,18 @@ void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq) dev->nirqs++; } +int isa_find_free_irq(ISABus *bus) +{ + unsigned int i; + + /* 0 and 1 are called for, 2 is the chain interrupt */ + for (i = 3; i < ISA_NUM_IRQS; i++) { + if (!bus->irq_inuse[i]) + return i; + } + return 0; +} + static inline void isa_init_ioport(ISADevice *dev, uint16_t ioport) { if (dev && (dev->ioport_id == 0 || ioport < dev->ioport_id)) { diff --git a/hw/isa.h b/hw/isa.h index f7bc4b5..9447296 100644 --- a/hw/isa.h +++ b/hw/isa.h @@ -28,6 +28,7 @@ struct ISABus { BusState qbus; MemoryRegion *address_space_io; qemu_irq *irqs; + int irq_inuse[ISA_NUM_IRQS]; }; struct ISADevice { @@ -41,6 +42,7 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space_io); void isa_bus_irqs(ISABus *bus, qemu_irq *irqs); qemu_irq isa_get_irq(ISADevice *dev, int isairq); void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq); +int isa_find_free_irq(ISABus *bus); MemoryRegion *isa_address_space(ISADevice *dev); ISADevice *isa_create(ISABus *bus, const char *name); ISADevice *isa_try_create(ISABus *bus, const char *name);