VGA PCI support

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@826 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/hw/pc.c b/hw/pc.c
index 1139781a0cc3ac398204a5159b0945d04c10c27e..895f3e1bd25ef6fab5a5c3154d5d961e6a14cf33 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -391,7 +391,7 @@ void pc_init(int ram_size, int vga_ram_size, int boot_device,
     register_ioport_write(0xf0, 1, 1, ioportF0_write, NULL);
 
     vga_initialize(ds, phys_ram_base + ram_size, ram_size, 
-                   vga_ram_size);
+                   vga_ram_size, pci_enabled);
 
     rtc_state = rtc_init(0x70, 8);
     register_ioport_read(0x61, 1, 1, speaker_ioport_read, NULL);

diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 02c7f0d456dcb166b2befbbe6aab6487b42a415d..f64649cf5af01f8ee85cd25e1008554d5922ed49 100644 (file)
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -950,7 +950,7 @@ void ppc_prep_init(int ram_size, int vga_ram_size, int boot_device,
 
     /* init basic PC hardware */
     vga_initialize(ds, phys_ram_base + ram_size, ram_size, 
-                   vga_ram_size);
+                   vga_ram_size, 0);
     rtc_init(0x70, 8);
     pic_init();
     //    pit_init(0x40, 0);