Skip to contentSkip to conversation

Additional VGA options for MIPS Malta

PATCH Applied Stefan Weil 2 participants 3 messages Feb 4, 2009 – Feb 8, 2009 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Additional VGA options for MIPS Malta

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

support all kinds of pci vga cards (including none)

hw/mips_malta.c +9 -1
Index: trunk/hw/mips_malta.c
===================================================================
@@ -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 = {
qemu-doc.texi +1 -1
Index: trunk/qemu-doc.texi
===================================================================
@@ -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:
#1 lore raw
Quoted 10 lines · Stefan Weil

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

Sorry, the patch for Makefile.target was missing.
Here is an update of the complete patch.

Please apply it to Qemu trunk.

Regards,
Stefan

support all kinds of pci vga cards (including none)

hw/mips_malta.c +9 -1
Index: trunk/hw/mips_malta.c
===================================================================
@@ -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 = {
qemu-doc.texi +1 -1
Index: trunk/qemu-doc.texi
===================================================================
@@ -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:
Makefile.target +1 -0
Index: trunk/Makefile.target
===================================================================
@@ -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)
#2 lore raw
Quoted 12 lines · Stefan Weil
Quoted 10 lines · Stefan Weil

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

Quoted 8 lines

Sorry, the patch for Makefile.target was missing.
Here is an update of the complete patch.

Please apply it to Qemu trunk.

Regards,
Stefan

Thanks, applied.

Signature · 2 lines
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
[email protected]                 http://www.aurel32.net