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

[Stefan Weil <weil@mail.berlios.de>]

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

Hi,

any of the VGA PCI cards supported by Qemu can be used not only by
PC guests but also by MIPS Malta guests.

This patch adds the missing code and updates the documentation.
It also allows to run Malta without any VGA card.

Regards
Stefan



[-- Attachment #2: malta-vga.patch --]
[-- Type: text/x-diff, Size: 1373 bytes --]

support all kinds of pci vga cards (including none)

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Index: trunk/hw/mips_malta.c
===================================================================
--- trunk.orig/hw/mips_malta.c	2009-02-04 19:26:33.000000000 +0100
+++ trunk/hw/mips_malta.c	2009-02-04 19:27:34.000000000 +0100
@@ -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 = {
Index: trunk/qemu-doc.texi
===================================================================
--- trunk.orig/qemu-doc.texi	2009-02-04 19:32:20.000000000 +0100
+++ trunk/qemu-doc.texi	2009-02-04 19:32:28.000000000 +0100
@@ -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: