diff options
| author | Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro> | 2010-05-20 09:14:04 +0300 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-05-20 20:37:04 +0000 |
| commit | 81a204e44356a4e147ee4bcfded3d25793c5a2ad (patch) | |
| tree | 7b41e21a6751f1b133f6758ee5351462e71ea7dd | |
| parent | 70c482852aed861d728654c7bad9404eff76d9e3 (diff) | |
| download | qemu-81a204e44356a4e147ee4bcfded3d25793c5a2ad.tar.gz qemu-81a204e44356a4e147ee4bcfded3d25793c5a2ad.tar.bz2 qemu-81a204e44356a4e147ee4bcfded3d25793c5a2ad.zip | |
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 <eduard.munteanu@linux360.ro>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | hw/pc.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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++) { |