From patchwork Mon Jul 9 19:17:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 169942 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 744262C01B4 for ; Tue, 10 Jul 2012 05:39:29 +1000 (EST) Received: from localhost ([::1]:39594 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoJTz-0002kD-3E for incoming@patchwork.ozlabs.org; Mon, 09 Jul 2012 15:18:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40616) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoJT1-0000Zu-8R for qemu-devel@nongnu.org; Mon, 09 Jul 2012 15:17:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SoJSy-0003ME-G1 for qemu-devel@nongnu.org; Mon, 09 Jul 2012 15:17:54 -0400 Received: from vms173005pub.verizon.net ([206.46.173.5]:54577) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoJSy-0003Lh-AR for qemu-devel@nongnu.org; Mon, 09 Jul 2012 15:17:52 -0400 Received: from wf-rch.minyard.home ([unknown] [173.57.151.210]) by vms173005.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0M6W0039JQWQGUQ9@vms173005.mailsrvcs.net> for qemu-devel@nongnu.org; Mon, 09 Jul 2012 14:17:20 -0500 (CDT) Received: from i.minyard.home (i2.minyard.home [192.168.27.116]) by wf-rch.minyard.home (Postfix) with ESMTP id 87D8C1F93D; Mon, 09 Jul 2012 14:17:12 -0500 (CDT) Received: by i.minyard.home (Postfix, from userid 1000) id BB34C7FEC8; Mon, 09 Jul 2012 14:17:11 -0500 (CDT) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Mon, 09 Jul 2012 14:17:02 -0500 Message-id: <1341861429-6297-3-git-send-email-minyard@acm.org> X-Mailer: git-send-email 1.7.4.1 In-reply-to: <1341861429-6297-1-git-send-email-minyard@acm.org> References: <1341861429-6297-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Solaris 10 (1203?) X-Received-From: 206.46.173.5 Cc: Corey Minyard Subject: [Qemu-devel] [PATCH 2/9] pc: move SMBIOS setup to after device init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Corey Minyard Setting up the firmware interface for the SMBIOS table needs to be done later in the process, after device initialization, so that devices can add entries to the table. Signed-off-by: Corey Minyard --- hw/pc.c | 22 +++++++++++++--------- hw/pc.h | 9 +++++---- hw/pc_piix.c | 12 ++++++++---- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index fb04c8b..c0acb6a 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -971,20 +971,12 @@ void pc_cpus_init(const char *cpu_model) } void pc_memory_init(MemoryRegion *system_memory, - const char *kernel_filename, - const char *kernel_cmdline, - const char *initrd_filename, ram_addr_t below_4g_mem_size, ram_addr_t above_4g_mem_size, - MemoryRegion *rom_memory, MemoryRegion **ram_memory) { - int linux_boot, i; - MemoryRegion *ram, *option_rom_mr; + MemoryRegion *ram; MemoryRegion *ram_below_4g, *ram_above_4g; - void *fw_cfg; - - linux_boot = (kernel_filename != NULL); /* Allocate RAM. We allocate it as a single memory region and use * aliases to address portions of it, mostly for backwards compatibility @@ -1006,7 +998,17 @@ void pc_memory_init(MemoryRegion *system_memory, memory_region_add_subregion(system_memory, 0x100000000ULL, ram_above_4g); } +} +void pc_bios_init(const char *kernel_filename, + const char *kernel_cmdline, + const char *initrd_filename, + ram_addr_t below_4g_mem_size, + MemoryRegion *rom_memory) +{ + MemoryRegion *option_rom_mr; + void *fw_cfg; + int linux_boot, i; /* Initialize PC system firmware */ pc_system_firmware_init(rom_memory); @@ -1019,6 +1021,8 @@ void pc_memory_init(MemoryRegion *system_memory, option_rom_mr, 1); + linux_boot = (kernel_filename != NULL); + fw_cfg = bochs_bios_init(); rom_set_fw(fw_cfg); diff --git a/hw/pc.h b/hw/pc.h index 8ccf202..33ab689 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -107,13 +107,14 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level); void pc_cpus_init(const char *cpu_model); void pc_memory_init(MemoryRegion *system_memory, - const char *kernel_filename, - const char *kernel_cmdline, - const char *initrd_filename, ram_addr_t below_4g_mem_size, ram_addr_t above_4g_mem_size, - MemoryRegion *rom_memory, MemoryRegion **ram_memory); +void pc_bios_init(const char *kernel_filename, + const char *kernel_cmdline, + const char *initrd_filename, + ram_addr_t below_4g_mem_size, + MemoryRegion *rom_memory); qemu_irq *pc_allocate_cpu_irq(void); DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus); void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, diff --git a/hw/pc_piix.c b/hw/pc_piix.c index fb86f27..21b4f59 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -176,10 +176,8 @@ static void pc_init1(MemoryRegion *system_memory, /* allocate ram and load rom/bios */ if (!xen_enabled()) { - pc_memory_init(system_memory, - kernel_filename, kernel_cmdline, initrd_filename, - below_4g_mem_size, above_4g_mem_size, - pci_enabled ? rom_memory : system_memory, &ram_memory); + pc_memory_init(system_memory, below_4g_mem_size, above_4g_mem_size, + &ram_memory); } gsi_state = g_malloc0(sizeof(*gsi_state)); @@ -287,6 +285,12 @@ static void pc_init1(MemoryRegion *system_memory, if (pci_enabled) { pc_pci_device_init(pci_bus); } + + if (!xen_enabled()) { + pc_bios_init(kernel_filename, kernel_cmdline, initrd_filename, + below_4g_mem_size, + pci_enabled ? rom_memory : system_memory); + } } static void pc_init_pci(ram_addr_t ram_size,