From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MLH21-0006uM-BN for qemu-devel@nongnu.org; Mon, 29 Jun 2009 09:36:25 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MLH1u-0006rc-Vg for qemu-devel@nongnu.org; Mon, 29 Jun 2009 09:36:23 -0400 Received: from [199.232.76.173] (port=37387 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MLH1u-0006rX-KD for qemu-devel@nongnu.org; Mon, 29 Jun 2009 09:36:18 -0400 Received: from cantor2.suse.de ([195.135.220.15]:59301 helo=mx2.suse.de) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MLH1t-00044C-Gw for qemu-devel@nongnu.org; Mon, 29 Jun 2009 09:36:18 -0400 From: Alexander Graf Date: Mon, 29 Jun 2009 15:37:38 +0200 Message-Id: <1246282661-4658-3-git-send-email-agraf@suse.de> In-Reply-To: <1246282661-4658-2-git-send-email-agraf@suse.de> References: <1246282661-4658-1-git-send-email-agraf@suse.de> <1246282661-4658-2-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 2/5] Expose fw_cfg v2 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, rene@exactcode.de Multiboot passes options to the option rom using the fw_cfg device. Right now, that device is local to the bochs_bios_init function. Let's change that and expose it, so everyone may put data in there. Signed-off-by: Alexander Graf --- v2 leaves env alone and just returns fw_cfg --- hw/pc.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index f54de7e..6994326 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -448,7 +448,7 @@ static void bochs_bios_write(void *opaque, uint32_t addr, uint32_t val) extern uint64_t node_cpumask[MAX_NODES]; -static void bochs_bios_init(void) +static void *bochs_bios_init(void) { void *fw_cfg; uint8_t *smbios_table; @@ -468,6 +468,7 @@ static void bochs_bios_init(void) register_ioport_write(0x503, 1, 1, bochs_bios_write, NULL); fw_cfg = fw_cfg_init(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 1, 0, 0); + fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1); fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size); fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES, (uint8_t *)acpi_tables, @@ -497,6 +498,8 @@ static void bochs_bios_init(void) } fw_cfg_add_bytes(fw_cfg, FW_CFG_NUMA, (uint8_t *)numa_fw_cfg, (1 + smp_cpus + nb_numa_nodes) * 8); + + return fw_cfg; } /* Generate an initial boot sector which sets state and jump to @@ -851,6 +854,7 @@ static void pc_init1(ram_addr_t ram_size, BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; BlockDriverState *fd[MAX_FD]; int using_vga = cirrus_vga_enabled || std_vga_enabled || vmsvga_enabled; + void *fw_cfg; if (ram_size >= 0xe0000000 ) { above_4g_mem_size = ram_size - 0xe0000000; @@ -971,7 +975,7 @@ static void pc_init1(ram_addr_t ram_size, cpu_register_physical_memory((uint32_t)(-bios_size), bios_size, bios_offset | IO_MEM_ROM); - bochs_bios_init(); + fw_cfg = bochs_bios_init(); if (linux_boot) { load_linux(0xc0000 + oprom_area_size, -- 1.6.0.2