From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LVYOf-0002w2-Ej for qemu-devel@nongnu.org; Fri, 06 Feb 2009 16:38:01 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LVYOd-0002vN-TF for qemu-devel@nongnu.org; Fri, 06 Feb 2009 16:38:01 -0500 Received: from [199.232.76.173] (port=33690 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LVYOd-0002vK-Hp for qemu-devel@nongnu.org; Fri, 06 Feb 2009 16:37:59 -0500 Received: from moutng.kundenserver.de ([212.227.126.187]:51999) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LVYOc-0001sh-Uf for qemu-devel@nongnu.org; Fri, 06 Feb 2009 16:37:59 -0500 Received: from localhost ([127.0.0.1] ident=stefan) by flocke.weilnetz.de with esmtp (Exim 4.69) (envelope-from ) id 1LVYOZ-0001Bn-1s for qemu-devel@nongnu.org; Fri, 06 Feb 2009 22:37:55 +0100 Message-ID: <498CADB2.6060600@mail.berlios.de> Date: Fri, 06 Feb 2009 22:37:54 +0100 From: Stefan Weil MIME-Version: 1.0 Subject: Re: [Qemu-devel] [Qemu] [PATCH] Additional VGA options for MIPS Malta References: <4989E142.7080808@mail.berlios.de> In-Reply-To: <4989E142.7080808@mail.berlios.de> Content-Type: multipart/mixed; boundary="------------090705030003080000080509" Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is a multi-part message in MIME format. --------------090705030003080000080509 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit 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 --------------090705030003080000080509 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 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) --------------090705030003080000080509--