Commit 81a204e4 authored by Eduard - Gabriel Munteanu's avatar Eduard - Gabriel Munteanu Committed by Blue Swirl
Browse files

pc: fix segfault introduced by 3d53f5c3 



Commit 3d53f5c3 introduced a segfault by erroneously making fw_cfg a
'void **' and passing it around in different ways.

Signed-off-by: default avatarEduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 70c48285

hw/pc.c

+2 −2
Original line number Diff line number Diff line
@@ -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++) {