Revision 5245d57a hw/pc.c

b/hw/pc.c
47 47
//#define DEBUG_MULTIBOOT
48 48

  
49 49
#define BIOS_FILENAME "bios.bin"
50
#define VGABIOS_FILENAME "vgabios.bin"
51
#define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus.bin"
52 50

  
53 51
#define PC_MAX_BIOS_SIZE (4 * 1024 * 1024)
54 52

  
......
1050 1048
    IsaIrqState *isa_irq_state;
1051 1049
    DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
1052 1050
    DriveInfo *fd[MAX_FD];
1053
    int using_vga = cirrus_vga_enabled || std_vga_enabled || vmsvga_enabled;
1054 1051
    void *fw_cfg;
1055 1052

  
1056 1053
    if (ram_size >= 0xe0000000 ) {
......
1141 1138
    option_rom_offset = qemu_ram_alloc(PC_ROM_SIZE);
1142 1139
    cpu_register_physical_memory(PC_ROM_MIN_VGA, PC_ROM_SIZE, option_rom_offset);
1143 1140

  
1144
    if (using_vga) {
1145
        /* VGA BIOS load */
1146
        if (cirrus_vga_enabled) {
1147
            rom_add_vga(VGABIOS_CIRRUS_FILENAME);
1148
        } else {
1149
            rom_add_vga(VGABIOS_FILENAME);
1150
        }
1151
    }
1152

  
1153 1141
    /* map all the bios at the top of memory */
1154 1142
    cpu_register_physical_memory((uint32_t)(-bios_size),
1155 1143
                                 bios_size, bios_offset | IO_MEM_ROM);

Also available in: Unified diff