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

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

[Stefan Weil]

[-- 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:

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

[Stefan Weil]

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

Stefan Weil schrieb:
> 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



[-- Attachment #2: malta-vga.patch --]
[-- Type: text/x-diff, Size: 1829 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-05 22:19:01.000000000 +0100
+++ trunk/hw/mips_malta.c	2009-02-06 22:21:53.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-05 22:19:01.000000000 +0100
+++ trunk/qemu-doc.texi	2009-02-06 22:31:19.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:
Index: trunk/Makefile.target
===================================================================
--- trunk.orig/Makefile.target	2009-02-06 22:31:39.000000000 +0100
+++ trunk/Makefile.target	2009-02-06 22:31:57.000000000 +0100
@@ -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)

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

[Aurelien Jarno]

On Fri, Feb 06, 2009 at 10:37:54PM +0100, Stefan Weil wrote:
> Stefan Weil schrieb:
> > 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
> 

Thanks, applied.


-- 
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net