From 89b6b508929d63b2a3dda18692fcb724afb43336 Mon Sep 17 00:00:00 2001
From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Thu, 17 Aug 2006 10:45:20 +0000
Subject: vga init changes

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2114 c046a42c-6fe2-441c-8c8c-71466251a162
---
 hw/pc.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'hw/pc.c')

diff --git a/hw/pc.c b/hw/pc.c
index 898d0681e1..b233d8cd01 100644
--- a/hw/pc.c
+++ b/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);
-- 
cgit v1.2.3