From patchwork Fri Aug 21 17:36:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 31843 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 9CCF5B7B6C for ; Sat, 22 Aug 2009 03:47:02 +1000 (EST) Received: from localhost ([127.0.0.1]:40472 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MeYCY-0002st-LV for incoming@patchwork.ozlabs.org; Fri, 21 Aug 2009 13:46:58 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MeY4c-0006G4-Ub 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 1MeY4X-00065v-Bj for qemu-devel@nongnu.org; Fri, 21 Aug 2009 13:38:45 -0400 Received: from [199.232.76.173] (port=56027 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MeY4X-00065U-1N for qemu-devel@nongnu.org; Fri, 21 Aug 2009 13:38:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1025) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MeY4W-0004cu-F6 for qemu-devel@nongnu.org; Fri, 21 Aug 2009 13:38:40 -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 n7LHcdro002409 for ; Fri, 21 Aug 2009 13:38:39 -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 n7LHcXjZ021006; Fri, 21 Aug 2009 13:38:38 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Fri, 21 Aug 2009 19:36:18 +0200 Message-Id: <5159214efaa7faccb0134c25512a2f8019f6cf8c.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 4/5] Move smm_enabled and isa_memory_mappings to PCII440FXState 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 | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 2450c31..d8aeeec 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -35,6 +35,8 @@ typedef PCIHostState I440FXState; struct PCII440FXState { PCIDevice dev; + target_phys_addr_t isa_page_descs[384 / 4]; + uint8_t smm_enabled; }; static void i440fx_addr_writel(void* opaque, uint32_t addr, uint32_t val) @@ -61,8 +63,6 @@ static int pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num) return (irq_num + slot_addend) & 3; } -static target_phys_addr_t isa_page_descs[384 / 4]; -static uint8_t smm_enabled; static int pci_irq_levels[4]; static void update_pam(PCII440FXState *d, uint32_t start, uint32_t end, int r) @@ -86,7 +86,7 @@ static void update_pam(PCII440FXState *d, uint32_t start, uint32_t end, int r) /* XXX: should distinguish read/write cases */ for(addr = start; addr < end; addr += 4096) { cpu_register_physical_memory(addr, 4096, - isa_page_descs[(addr - 0xa0000) >> 12]); + d->isa_page_descs[(addr - 0xa0000) >> 12]); } break; } @@ -103,12 +103,12 @@ static void i440fx_update_memory_mappings(PCII440FXState *d) update_pam(d, 0xc0000 + 0x4000 * i, 0xc0000 + 0x4000 * (i + 1), r); } smram = d->dev.config[0x72]; - if ((smm_enabled && (smram & 0x08)) || (smram & 0x40)) { + if ((d->smm_enabled && (smram & 0x08)) || (smram & 0x40)) { cpu_register_physical_memory(0xa0000, 0x20000, 0xa0000); } else { for(addr = 0xa0000; addr < 0xc0000; addr += 4096) { cpu_register_physical_memory(addr, 4096, - isa_page_descs[(addr - 0xa0000) >> 12]); + d->isa_page_descs[(addr - 0xa0000) >> 12]); } } } @@ -116,8 +116,8 @@ static void i440fx_update_memory_mappings(PCII440FXState *d) void i440fx_set_smm(PCII440FXState *d, int val) { val = (val != 0); - if (smm_enabled != val) { - smm_enabled = val; + if (d->smm_enabled != val) { + d->smm_enabled = val; i440fx_update_memory_mappings(d); } } @@ -130,7 +130,7 @@ void i440fx_init_memory_mappings(PCII440FXState *d) { int i; for(i = 0; i < 96; i++) { - isa_page_descs[i] = cpu_get_physical_page_desc(0xa0000 + i * 0x1000); + d->isa_page_descs[i] = cpu_get_physical_page_desc(0xa0000 + i * 0x1000); } } @@ -151,7 +151,7 @@ static void i440fx_save(QEMUFile* f, void *opaque) int i; pci_device_save(&d->dev, f); - qemu_put_8s(f, &smm_enabled); + qemu_put_8s(f, &d->smm_enabled); for (i = 0; i < 4; i++) qemu_put_be32(f, pci_irq_levels[i]); @@ -168,7 +168,7 @@ static int i440fx_load(QEMUFile* f, void *opaque, int version_id) if (ret < 0) return ret; i440fx_update_memory_mappings(d); - qemu_get_8s(f, &smm_enabled); + qemu_get_8s(f, &d->smm_enabled); if (version_id >= 2) for (i = 0; i < 4; i++)