From patchwork Fri Aug 21 17:36:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 31844 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 CC1E3B7B66 for ; Sat, 22 Aug 2009 03:48:32 +1000 (EST) Received: from localhost ([127.0.0.1]:41190 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MeYE1-0003MH-Rd for incoming@patchwork.ozlabs.org; Fri, 21 Aug 2009 13:48:29 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MeY4d-0006HJ-Li for qemu-devel@nongnu.org; Fri, 21 Aug 2009 13:38:47 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MeY4Y-00068W-QL for qemu-devel@nongnu.org; Fri, 21 Aug 2009 13:38:47 -0400 Received: from [199.232.76.173] (port=56028 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MeY4Y-00067J-A0 for qemu-devel@nongnu.org; Fri, 21 Aug 2009 13:38:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65071) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MeY4X-0004dA-Qc for qemu-devel@nongnu.org; Fri, 21 Aug 2009 13:38:42 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7LHceTD027867 for ; Fri, 21 Aug 2009 13:38:41 -0400 Received: from localhost.localdomain (vpn2-8-162.ams2.redhat.com [10.36.8.162]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7LHcXja021006; Fri, 21 Aug 2009 13:38:40 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Fri, 21 Aug 2009 19:36:19 +0200 Message-Id: <6f6a46b9e1677bc001e1ed7ec54cb7feb4b5f80d.1250875331.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 5/5] Cleanup of pci_irq_levels belong to i440fx 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 Do there in a new reset function. Signed-off-by: Juan Quintela --- hw/piix_pci.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hw/piix_pci.c b/hw/piix_pci.c index d8aeeec..bd6ab9b 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -63,8 +63,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; @@ -177,6 +175,13 @@ static int i440fx_load(QEMUFile* f, void *opaque, int version_id) return 0; } +static void i440fx_reset(void *opaque) +{ + PCII440FXState *d = opaque; + + memset(d->pci_irq_levels, 0, sizeof(d->pci_irq_levels)); +} + static void i440fx_pcihost_initfn(SysBusDevice *dev) { I440FXState *s = FROM_SYSBUS(I440FXState, dev); @@ -205,6 +210,9 @@ static void i440fx_initfn(PCIDevice *dev) d->dev.config[0x72] = 0x02; /* SMRAM */ register_savevm("I440FX", 0, 2, i440fx_save, i440fx_load, d); + + i440fx_reset(d); + qemu_register_reset(i440fx_reset, d); } PCIBus *i440fx_init(PCII440FXState **pi440fx_state, qemu_irq *pic) @@ -288,8 +296,6 @@ static void piix3_reset(void *opaque) pci_conf[0xab] = 0x00; pci_conf[0xac] = 0x00; pci_conf[0xae] = 0x00; - - memset(pci_irq_levels, 0, sizeof(pci_irq_levels)); } static void piix_save(QEMUFile* f, void *opaque)