From patchwork Wed Mar 16 09:29:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 87198 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 ozlabs.org (Postfix) with ESMTPS id EA0BBB6FF3 for ; Wed, 16 Mar 2011 20:45:21 +1100 (EST) Received: from localhost ([127.0.0.1]:45823 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PznI5-000538-7C for incoming@patchwork.ozlabs.org; Wed, 16 Mar 2011 05:45:17 -0400 Received: from [140.186.70.92] (port=34432 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pzn35-0006Fc-Fm for qemu-devel@nongnu.org; Wed, 16 Mar 2011 05:29:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pzn31-0006Ei-D8 for qemu-devel@nongnu.org; Wed, 16 Mar 2011 05:29:47 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:37367) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pzn30-0006D6-R2 for qemu-devel@nongnu.org; Wed, 16 Mar 2011 05:29:43 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 7899118939; Wed, 16 Mar 2011 18:29:41 +0900 (JST) Received: (nullmailer pid 18375 invoked by uid 1000); Wed, 16 Mar 2011 09:29:37 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Wed, 16 Mar 2011 18:29:31 +0900 Message-Id: X-Mailer: git-send-email 1.7.1.1 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 210.128.90.3 Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH 20/26] pc, i440fx: simply i440fx initialization 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 simply i440fx initialization by eliminating i440fx_init_memory_mappings(). Signed-off-by: Isaku Yamahata --- hw/pc.h | 2 +- hw/pc_piix.c | 8 +------- hw/piix_pci.c | 15 ++++++--------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/hw/pc.h b/hw/pc.h index 598747d..d382bb6 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -178,7 +178,7 @@ int pcspk_audio_init(qemu_irq *pic); struct PCII440FXState; typedef struct PCII440FXState PCII440FXState; -PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn, qemu_irq *pic, ram_addr_t ram_size); +PCIBus *i440fx_init(int *piix_devfn, qemu_irq *pic, ram_addr_t ram_size); void i440fx_init_memory_mappings(PCII440FXState *d); /* piix4.c */ diff --git a/hw/pc_piix.c b/hw/pc_piix.c index f04d58b..a3697e7 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -58,7 +58,6 @@ static void pc_init1(ram_addr_t ram_size, int i; ram_addr_t below_4g_mem_size, above_4g_mem_size; PCIBus *pci_bus; - PCII440FXState *i440fx_state; int piix3_devfn = -1; qemu_irq *isa_irq; qemu_irq *cmos_s3; @@ -84,10 +83,9 @@ static void pc_init1(ram_addr_t ram_size, } if (pci_enabled) { - pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, isa_irq, ram_size); + pci_bus = i440fx_init(&piix3_devfn, isa_irq, ram_size); } else { pci_bus = NULL; - i440fx_state = NULL; isa_bus_new(NULL); } isa_bus_irqs(isa_irq); @@ -136,10 +134,6 @@ static void pc_init1(ram_addr_t ram_size, smbus_eeprom_init(smbus, 8, NULL, 0); } - if (i440fx_state) { - i440fx_init_memory_mappings(i440fx_state); - } - if (pci_enabled) { pc_pci_device_init(pci_bus); } diff --git a/hw/piix_pci.c b/hw/piix_pci.c index f619162..151353c 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -84,11 +84,6 @@ static void i440fx_set_smm(int val, void *arg) smram_set_smm(&d->pam, val, d->dev.config[I440FX_SMRAM]); } -void i440fx_init_memory_mappings(PCII440FXState *d) -{ - pam_init_memory_mappings(&d->pam); -} - static void i440fx_write_config(PCIDevice *dev, uint32_t address, uint32_t val, int len) { @@ -166,15 +161,17 @@ static int i440fx_initfn(PCIDevice *dev) d->dev.config[I440FX_SMRAM] = 0x02; cpu_smm_register(&i440fx_set_smm, d); + pam_init_memory_mappings(&d->pam); return 0; } -PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn, qemu_irq *pic, ram_addr_t ram_size) +PCIBus *i440fx_init(int *piix3_devfn, qemu_irq *pic, ram_addr_t ram_size) { DeviceState *dev; PCIBus *b; PCIDevice *d; I440FXState *s; + PCII440FXState *i440fx_state; PIIX3State *piix3; dev = qdev_create(NULL, "i440FX-pcihost"); @@ -184,20 +181,20 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn, qemu_irq * qdev_init_nofail(dev); d = pci_create_simple(b, 0, "i440FX"); - *pi440fx_state = DO_UPCAST(PCII440FXState, dev, d); + i440fx_state = DO_UPCAST(PCII440FXState, dev, d); piix3 = DO_UPCAST(PIIX3State, dev, pci_create_simple_multifunction(b, -1, true, "PIIX3")); piix3->pic = pic; pci_bus_irqs(b, piix3_set_irq, pci_slot_get_pirq, piix3, 4); - (*pi440fx_state)->piix3 = piix3; + i440fx_state->piix3 = piix3; *piix3_devfn = piix3->dev.devfn; ram_size = ram_size / 8 / 1024 / 1024; if (ram_size > 255) ram_size = 255; - (*pi440fx_state)->dev.config[0x57]=ram_size; + i440fx_state->dev.config[0x57]=ram_size; return b; }