diff options
author | bellard <bellard> | 2006-08-17 10:45:19 +0000 |
---|---|---|
committer | bellard <bellard> | 2006-08-17 10:45:19 +0000 |
commit | fad81a7ca6cca8bded98481b7583d83afb9e067d (patch) | |
tree | d5842c5aa87740984f1dd812d625e3941983be34 /qemu/hw/pc.c | |
parent | d28990e431b37adde87a3213305718a1c7e08661 (diff) |
vga init changes
Diffstat (limited to 'qemu/hw/pc.c')
-rw-r--r-- | qemu/hw/pc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c index 898d0681..b233d8cd 100644 --- a/qemu/hw/pc.c +++ b/qemu/hw/pc.c @@ -768,8 +768,13 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device, vga_ram_size); } } else { - vga_initialize(pci_bus, ds, phys_ram_base + ram_size, ram_size, - vga_ram_size, 0, 0); + if (pci_enabled) { + pci_vga_init(pci_bus, ds, phys_ram_base + ram_size, ram_size, + vga_ram_size, 0, 0); + } else { + isa_vga_init(ds, phys_ram_base + ram_size, ram_size, + vga_ram_size); + } } rtc_state = rtc_init(0x70, 8); |