Revision a88b362c hw/i386/pc.c

b/hw/i386/pc.c
595 595
    return x86_cpu_apic_id_from_index(max_cpus - 1) + 1;
596 596
}
597 597

  
598
static void *bochs_bios_init(void)
598
static FWCfgState *bochs_bios_init(void)
599 599
{
600
    void *fw_cfg;
600
    FWCfgState *fw_cfg;
601 601
    uint8_t *smbios_table;
602 602
    size_t smbios_len;
603 603
    uint64_t *numa_fw_cfg;
......
674 674
    return size;
675 675
}
676 676

  
677
static void load_linux(void *fw_cfg,
677
static void load_linux(FWCfgState *fw_cfg,
678 678
                       const char *kernel_filename,
679 679
                       const char *initrd_filename,
680 680
                       const char *kernel_cmdline,
......
1012 1012
    }
1013 1013
}
1014 1014

  
1015
void *pc_memory_init(MemoryRegion *system_memory,
1016
                    const char *kernel_filename,
1017
                    const char *kernel_cmdline,
1018
                    const char *initrd_filename,
1019
                    ram_addr_t below_4g_mem_size,
1020
                    ram_addr_t above_4g_mem_size,
1021
                    MemoryRegion *rom_memory,
1022
                    MemoryRegion **ram_memory)
1015
FWCfgState *pc_memory_init(MemoryRegion *system_memory,
1016
                           const char *kernel_filename,
1017
                           const char *kernel_cmdline,
1018
                           const char *initrd_filename,
1019
                           ram_addr_t below_4g_mem_size,
1020
                           ram_addr_t above_4g_mem_size,
1021
                           MemoryRegion *rom_memory,
1022
                           MemoryRegion **ram_memory)
1023 1023
{
1024 1024
    int linux_boot, i;
1025 1025
    MemoryRegion *ram, *option_rom_mr;
1026 1026
    MemoryRegion *ram_below_4g, *ram_above_4g;
1027
    void *fw_cfg;
1027
    FWCfgState *fw_cfg;
1028 1028

  
1029 1029
    linux_boot = (kernel_filename != NULL);
1030 1030

  

Also available in: Unified diff