From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MGwZJ-0006B9-TQ for qemu-devel@nongnu.org; Wed, 17 Jun 2009 10:56:53 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MGwZF-00069W-6b for qemu-devel@nongnu.org; Wed, 17 Jun 2009 10:56:53 -0400 Received: from [199.232.76.173] (port=60507 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MGwZE-00069F-Ns for qemu-devel@nongnu.org; Wed, 17 Jun 2009 10:56:48 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60202 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 1MGwZD-000557-Uq for qemu-devel@nongnu.org; Wed, 17 Jun 2009 10:56:48 -0400 From: Alexander Graf Date: Wed, 17 Jun 2009 16:56:42 +0200 Message-Id: <1245250604-6291-3-git-send-email-agraf@suse.de> In-Reply-To: <1245250604-6291-2-git-send-email-agraf@suse.de> References: <1245250604-6291-1-git-send-email-agraf@suse.de> <1245250604-6291-2-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 2/4] Expose fw_cfg 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 to env, so everyone may put data in there. Signed-off-by: Alexander Graf --- hw/pc.c | 8 +++++--- target-i386/cpu.h | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index f0df669..171447e 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(CPUState *env) { void *fw_cfg; uint8_t *smbios_table; @@ -468,6 +468,8 @@ 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); + env->fw_cfg = fw_cfg; + 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, @@ -849,7 +851,7 @@ static void pc_init1(ram_addr_t ram_size, int bios_size, isa_bios_size, oprom_area_size; PCIBus *pci_bus; int piix3_devfn = -1; - CPUState *env; + CPUState *env = NULL; qemu_irq *cpu_irq; qemu_irq *i8259; int index; @@ -974,7 +976,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(); + bochs_bios_init(env); if (linux_boot) { load_linux(0xc0000 + oprom_area_size, diff --git a/target-i386/cpu.h b/target-i386/cpu.h index d7b32d4..9fef0f7 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -676,6 +676,9 @@ typedef struct CPUX86State { /* in order to simplify APIC support, we leave this pointer to the user */ struct APICState *apic_state; + + /* Firmware configuration device */ + void *fw_cfg; } CPUX86State; CPUX86State *cpu_x86_init(const char *cpu_model); -- 1.6.0.2