From 81a204e44356a4e147ee4bcfded3d25793c5a2ad Mon Sep 17 00:00:00 2001 From: Eduard - Gabriel Munteanu Date: Thu, 20 May 2010 09:14:04 +0300 Subject: [PATCH] pc: fix segfault introduced by 3d53f5c36ff6 Commit 3d53f5c36ff6 introduced a segfault by erroneously making fw_cfg a 'void **' and passing it around in different ways. Signed-off-by: Eduard - Gabriel Munteanu Signed-off-by: Blue Swirl --- hw/pc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 20dc7fdb51..7715b17d56 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -818,7 +818,7 @@ void pc_memory_init(ram_addr_t ram_size, ram_addr_t ram_addr, bios_offset, option_rom_offset; ram_addr_t below_4g_mem_size, above_4g_mem_size = 0; int bios_size, isa_bios_size; - void **fw_cfg; + void *fw_cfg; if (ram_size >= 0xe0000000 ) { above_4g_mem_size = ram_size - 0xe0000000; @@ -893,7 +893,7 @@ void pc_memory_init(ram_addr_t ram_size, rom_set_fw(fw_cfg); if (linux_boot) { - load_linux(*fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size); + load_linux(fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size); } for (i = 0; i < nb_option_roms; i++) { -- 2.11.0