From patchwork Thu Aug 27 23:15:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 32338 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 05A98B7BF2 for ; Fri, 28 Aug 2009 10:58:59 +1000 (EST) Received: from localhost ([127.0.0.1]:60550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mgpnn-0001jS-3K for incoming@patchwork.ozlabs.org; Thu, 27 Aug 2009 20:58:51 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mgpmn-0001S3-0D for qemu-devel@nongnu.org; Thu, 27 Aug 2009 20:57:49 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mgpmi-0001PO-BO for qemu-devel@nongnu.org; Thu, 27 Aug 2009 20:57:48 -0400 Received: from [199.232.76.173] (port=42811 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mgpmh-0001P1-R8 for qemu-devel@nongnu.org; Thu, 27 Aug 2009 20:57:43 -0400 Received: from mx20.gnu.org ([199.232.41.8]:6041) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MgoED-00055k-MS for qemu-devel@nongnu.org; Thu, 27 Aug 2009 19:18:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MgoEA-0005XC-1k for qemu-devel@nongnu.org; Thu, 27 Aug 2009 19:17:58 -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 n7RNHuYR009073 for ; Thu, 27 Aug 2009 19:17:57 -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 n7RNHeu3031343; Thu, 27 Aug 2009 19:17:55 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Fri, 28 Aug 2009 01:15:16 +0200 Message-Id: <1becec718ed54071b5d4d03131e1edeef50c54e3.1251414727.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-Detected-Operating-System: by mx20.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Subject: [Qemu-devel] [PATCH 12/13] pci_irq_levels[] belong to PIIX3State 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 With previous cleanups, now it is possible to put it where it belongs Signed-off-by: Juan Quintela --- hw/piix_pci.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 8e01a52..580c987 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -35,6 +35,7 @@ typedef PCIHostState I440FXState; typedef struct PIIX3State { PCIDevice dev; + int pci_irq_levels[4]; } PIIX3State; typedef struct PIIX3IrqState { @@ -73,8 +74,6 @@ static int pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num) return (irq_num + slot_addend) & 3; } -static int pci_irq_levels[4]; - static void update_pam(PCII440FXState *d, uint32_t start, uint32_t end, int r) { uint32_t addr; @@ -164,7 +163,7 @@ static void i440fx_save(QEMUFile* f, void *opaque) qemu_put_8s(f, &d->smm_enabled); for (i = 0; i < 4; i++) - qemu_put_be32(f, pci_irq_levels[i]); + qemu_put_be32(f, d->irq_state->piix3->pci_irq_levels[i]); } static int i440fx_load(QEMUFile* f, void *opaque, int version_id) @@ -182,7 +181,7 @@ static int i440fx_load(QEMUFile* f, void *opaque, int version_id) if (version_id >= 2) for (i = 0; i < 4; i++) - pci_irq_levels[i] = qemu_get_be32(f); + d->irq_state->piix3->pci_irq_levels[i] = qemu_get_be32(f); return 0; } @@ -251,7 +250,7 @@ static void piix3_set_irq(void *opaque, int irq_num, int level) int i, pic_irq, pic_level; PIIX3IrqState *irq_state = opaque; - pci_irq_levels[irq_num] = level; + irq_state->piix3->pci_irq_levels[irq_num] = level; /* now we change the pic irq level according to the piix irq mappings */ /* XXX: optimize */ @@ -262,7 +261,7 @@ static void piix3_set_irq(void *opaque, int irq_num, int level) pic_level = 0; for (i = 0; i < 4; i++) { if (pic_irq == irq_state->piix3->dev.config[0x60 + i]) - pic_level |= pci_irq_levels[i]; + pic_level |= irq_state->piix3->pci_irq_levels[i]; } qemu_set_irq(irq_state->pic[pic_irq], pic_level); } @@ -305,7 +304,7 @@ static void piix3_reset(void *opaque) pci_conf[0xac] = 0x00; pci_conf[0xae] = 0x00; - memset(pci_irq_levels, 0, sizeof(pci_irq_levels)); + memset(d->pci_irq_levels, 0, sizeof(d->pci_irq_levels)); } static void piix_save(QEMUFile* f, void *opaque)