summaryrefslogtreecommitdiff
path: root/hw/pc.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-10-26 12:18:26 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-30 08:39:29 -0500
commit5245d57a7ac830fc015465981db729646a768993 (patch)
tree653b3ea6f40b313fffc4cb977d3fd2edc582e8ed /hw/pc.c
parentde2aff17a31c47e28757d426fb3384eed20eb2e5 (diff)
downloadqemu-5245d57a7ac830fc015465981db729646a768993.tar.gz
vga roms: move loading from pc.c to vga drivers.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/pc.c')
-rw-r--r--hw/pc.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/hw/pc.c b/hw/pc.c
index c7b8c50190..42f7de8c88 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -47,8 +47,6 @@
//#define DEBUG_MULTIBOOT
#define BIOS_FILENAME "bios.bin"
-#define VGABIOS_FILENAME "vgabios.bin"
-#define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus.bin"
#define PC_MAX_BIOS_SIZE (4 * 1024 * 1024)
@@ -1050,7 +1048,6 @@ static void pc_init1(ram_addr_t ram_size,
IsaIrqState *isa_irq_state;
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
DriveInfo *fd[MAX_FD];
- int using_vga = cirrus_vga_enabled || std_vga_enabled || vmsvga_enabled;
void *fw_cfg;
if (ram_size >= 0xe0000000 ) {
@@ -1141,15 +1138,6 @@ static void pc_init1(ram_addr_t ram_size,
option_rom_offset = qemu_ram_alloc(PC_ROM_SIZE);
cpu_register_physical_memory(PC_ROM_MIN_VGA, PC_ROM_SIZE, option_rom_offset);
- if (using_vga) {
- /* VGA BIOS load */
- if (cirrus_vga_enabled) {
- rom_add_vga(VGABIOS_CIRRUS_FILENAME);
- } else {
- rom_add_vga(VGABIOS_FILENAME);
- }
- }
-
/* map all the bios at the top of memory */
cpu_register_physical_memory((uint32_t)(-bios_size),
bios_size, bios_offset | IO_MEM_ROM);