From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LUmgW-0008ID-Pc
	for qemu-devel@nongnu.org; Wed, 04 Feb 2009 13:41:16 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LUmgU-0008I1-JL
	for qemu-devel@nongnu.org; Wed, 04 Feb 2009 13:41:15 -0500
Received: from [199.232.76.173] (port=41679 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LUmgU-0008Hy-Fu
	for qemu-devel@nongnu.org; Wed, 04 Feb 2009 13:41:14 -0500
Received: from moutng.kundenserver.de ([212.227.126.171]:55863)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <weil@mail.berlios.de>) id 1LUmgT-0000SM-QO
	for qemu-devel@nongnu.org; Wed, 04 Feb 2009 13:41:14 -0500
Received: from localhost ([127.0.0.1] ident=stefan)
	by flocke.weilnetz.de with esmtp (Exim 4.69)
	(envelope-from <weil@mail.berlios.de>) id 1LUmgM-00077j-VS
	for qemu-devel@nongnu.org; Wed, 04 Feb 2009 19:41:06 +0100
Message-ID: <4989E142.7080808@mail.berlios.de>
Date: Wed, 04 Feb 2009 19:41:06 +0100
From: Stefan Weil <weil@mail.berlios.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------000702080102040106070305"
Subject: [Qemu-devel] [Qemu] [PATCH] Additional VGA options for MIPS Malta
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: QEMU Developers <qemu-devel@nongnu.org>

This is a multi-part message in MIME format.
--------------000702080102040106070305
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit

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



--------------000702080102040106070305
Content-Type: text/x-diff;
 name="malta-vga.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="malta-vga.patch"

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:

--------------000702080102040106070305--