From patchwork Wed Jun 8 18:55:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 99545 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AA635B6FDE for ; Thu, 9 Jun 2011 05:31:18 +1000 (EST) Received: from localhost ([::1]:59678 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUOTC-000839-Su for incoming@patchwork.ozlabs.org; Wed, 08 Jun 2011 15:31:14 -0400 Received: from eggs.gnu.org ([140.186.70.92]:42065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUNuh-0006O1-Ec for qemu-devel@nongnu.org; Wed, 08 Jun 2011 14:55:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QUNuf-0006BM-JF for qemu-devel@nongnu.org; Wed, 08 Jun 2011 14:55:35 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:32842) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUNue-0006At-Vz for qemu-devel@nongnu.org; Wed, 08 Jun 2011 14:55:33 -0400 Received: from smtp01.web.de ( [172.20.0.243]) by fmmailgate02.web.de (Postfix) with ESMTP id 6DA101A2C7CDE; Wed, 8 Jun 2011 20:55:24 +0200 (CEST) Received: from [87.173.123.15] (helo=af.local) by smtp01.web.de with asmtp (WEB.DE 4.110 #2) id 1QUNuW-0002zl-00; Wed, 08 Jun 2011 20:55:24 +0200 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Wed, 8 Jun 2011 20:55:12 +0200 Message-Id: <1307559319-16183-6-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.5.3 In-Reply-To: <1307559319-16183-5-git-send-email-andreas.faerber@web.de> References: <4DEF2F25.5070104@redhat.com> <1307559319-16183-1-git-send-email-andreas.faerber@web.de> <1307559319-16183-2-git-send-email-andreas.faerber@web.de> <1307559319-16183-3-git-send-email-andreas.faerber@web.de> <1307559319-16183-4-git-send-email-andreas.faerber@web.de> <1307559319-16183-5-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX1/08NVixynOcObnhLEfIiAJvgiS7k6gqE3dBhxg xEj5PrDV4mrmKTagvnvNuHesdnTP15Ynr+mnjzOv5Ap+0aOlYG dRv4oHbSK1oMPGET9G7A== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.227 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , hpoussin@reactos.org, kraxel@redhat.com Subject: [Qemu-devel] [RFC v4 05/12] isa: Allow to un-associate an IRQ 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 Signed-off-by: Andreas Färber --- hw/isa-bus.c | 14 ++++++++++++++ hw/isa.h | 1 + 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 1f64673..6ac3e61 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -80,6 +80,20 @@ void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq) dev->nirqs++; } +void isa_discard_irq(ISADevice *dev, int isairq) +{ + int i, j; + for (i = 0; i < dev->nirqs; i++) { + if (dev->isairq[i] == isairq) { + for (j = i + 1; j < dev->nirqs; j++) { + dev->isairq[j - 1] = dev->isairq[j]; + } + dev->nirqs--; + break; + } + } +} + static void isa_init_ioport_one(ISADevice *dev, uint16_t ioport) { assert(dev->nioports < ARRAY_SIZE(dev->ioports)); diff --git a/hw/isa.h b/hw/isa.h index ba7a696..46b35f3 100644 --- a/hw/isa.h +++ b/hw/isa.h @@ -31,6 +31,7 @@ ISABus *isa_bus_new(DeviceState *dev); void isa_bus_irqs(qemu_irq *irqs); qemu_irq isa_get_irq(int isairq); void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq); +void isa_discard_irq(ISADevice *dev, int isairq); void isa_init_ioport(ISADevice *dev, uint16_t ioport); void isa_init_ioport_range(ISADevice *dev, uint16_t start, uint16_t length); void isa_discard_ioport_range(ISADevice *dev, uint16_t start, uint16_t length);