From patchwork Thu Aug 27 23:15:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 32333 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 8C2E1B7B90 for ; Fri, 28 Aug 2009 10:15:31 +1000 (EST) Received: from localhost ([127.0.0.1]:33672 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mgp7m-0007x8-LJ for incoming@patchwork.ozlabs.org; Thu, 27 Aug 2009 20:15:26 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mgp7G-0007wj-EZ for qemu-devel@nongnu.org; Thu, 27 Aug 2009 20:14:54 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mgp7B-0007uy-RZ for qemu-devel@nongnu.org; Thu, 27 Aug 2009 20:14:53 -0400 Received: from [199.232.76.173] (port=39487 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mgp7B-0007ur-Da for qemu-devel@nongnu.org; Thu, 27 Aug 2009 20:14:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48334) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mgoe8-0002Rx-BS for qemu-devel@nongnu.org; Thu, 27 Aug 2009 19:44:48 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7RNHq4l011942 for ; Thu, 27 Aug 2009 19:17:52 -0400 Received: from localhost.localdomain (vpn1-4-202.ams2.redhat.com [10.36.4.202]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7RNHetx031343; Thu, 27 Aug 2009 19:17:51 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Fri, 28 Aug 2009 01:15:12 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 08/13] Introduce PIIX3IrqState for piix3 irq's state 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: Juan Quintela --- hw/piix_pci.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 29bd92c..0443a1d 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -37,6 +37,10 @@ typedef struct PIIX3State { PCIDevice dev; } PIIX3State; +typedef struct PIIX3IrqState { + qemu_irq *pic; +} PIIX3IrqState; + struct PCII440FXState { PCIDevice dev; target_phys_addr_t isa_page_descs[384 / 4]; @@ -217,11 +221,13 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, qemu_irq *pic) PCIBus *b; PCIDevice *d; I440FXState *s; + PIIX3IrqState *irq_state = qemu_malloc(sizeof(*irq_state)); + irq_state->pic = pic; dev = qdev_create(NULL, "i440FX-pcihost"); s = FROM_SYSBUS(I440FXState, sysbus_from_qdev(dev)); b = pci_register_bus(&s->busdev.qdev, "pci.0", - piix3_set_irq, pci_slot_get_pirq, pic, 0, 4); + piix3_set_irq, pci_slot_get_pirq, irq_state, 0, 4); s->bus = b; qdev_init(dev); @@ -238,7 +244,7 @@ static PIIX3State *piix3_dev; static void piix3_set_irq(void *opaque, int irq_num, int level) { int i, pic_irq, pic_level; - qemu_irq *pic = opaque; + PIIX3IrqState *irq_state = opaque; pci_irq_levels[irq_num] = level; @@ -253,7 +259,7 @@ static void piix3_set_irq(void *opaque, int irq_num, int level) if (pic_irq == piix3_dev->dev.config[0x60 + i]) pic_level |= pci_irq_levels[i]; } - qemu_set_irq(pic[pic_irq], pic_level); + qemu_set_irq(irq_state->pic[pic_irq], pic_level); } }