[Qemu-devel] [6557] Additional VGA options for MIPS Malta

[Qemu-devel] [6557] Additional VGA options for MIPS Malta

[Aurelien Jarno]

Revision: 6557
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6557
Author:   aurel32
Date:     2009-02-08 14:51:19 +0000 (Sun, 08 Feb 2009)

Log Message:
-----------
Additional VGA options for MIPS Malta

Support all kinds of pci vga cards (including none)

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Modified Paths:
--------------
    trunk/Makefile.target
    trunk/hw/mips_malta.c
    trunk/qemu-doc.texi

Modified: trunk/Makefile.target
===================================================================
--- trunk/Makefile.target	2009-02-08 14:46:17 UTC (rev 6556)
+++ trunk/Makefile.target	2009-02-08 14:51:19 UTC (rev 6557)
@@ -614,6 +614,7 @@
 OBJS+= piix_pci.o parallel.o cirrus_vga.o pcspk.o $(SOUND_HW)
 OBJS+= mipsnet.o
 OBJS+= pflash_cfi01.o
+OBJS+= vmware_vga.o
 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
 endif
 ifeq ($(TARGET_BASE_ARCH), cris)

Modified: trunk/hw/mips_malta.c
===================================================================
--- trunk/hw/mips_malta.c	2009-02-08 14:46:17 UTC (rev 6556)
+++ trunk/hw/mips_malta.c	2009-02-08 14:51:19 UTC (rev 6557)
@@ -941,8 +941,16 @@
     network_init(pci_bus);
 
     /* Optional PCI video card */
-    pci_cirrus_vga_init(pci_bus, phys_ram_base + ram_size,
+    if (cirrus_vga_enabled) {
+        pci_cirrus_vga_init(pci_bus, phys_ram_base + ram_size,
+                            ram_size, vga_ram_size);
+    } else if (vmsvga_enabled) {
+        pci_vmsvga_init(pci_bus, phys_ram_base + ram_size,
                         ram_size, vga_ram_size);
+    } else if (std_vga_enabled) {
+        pci_vga_init(pci_bus, phys_ram_base + ram_size,
+                     ram_size, vga_ram_size, 0, 0);
+    }
 }
 
 QEMUMachine mips_malta_machine = {

Modified: trunk/qemu-doc.texi
===================================================================
--- trunk/qemu-doc.texi	2009-02-08 14:46:17 UTC (rev 6556)
+++ trunk/qemu-doc.texi	2009-02-08 14:51:19 UTC (rev 6557)
@@ -2700,7 +2700,7 @@
 @item
 Malta FPGA serial device
 @item
-Cirrus VGA graphics card
+Cirrus (default) or any other PCI VGA graphics card
 @end itemize
 
 The ACER Pica emulation supports: