[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 08/17] mips/malta: use the new pci_vga_init() fun
From: |
Aurelien Jarno |
Subject: |
[Qemu-devel] [PATCH v3 08/17] mips/malta: use the new pci_vga_init() function |
Date: |
Tue, 11 Sep 2012 21:10:33 +0200 |
Signed-off-by: Aurelien Jarno <address@hidden>
---
hw/mips_malta.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index c39dee5..632b466 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -33,7 +33,6 @@
#include "mips.h"
#include "mips_cpudevs.h"
#include "pci.h"
-#include "vmware_vga.h"
#include "qemu-char.h"
#include "sysemu.h"
#include "arch_init.h"
@@ -48,7 +47,6 @@
#include "blockdev.h"
#include "exec-memory.h"
#include "sysbus.h" /* SysBusDevice */
-#include "vga-pci.h"
//#define DEBUG_BOARD_INIT
@@ -987,13 +985,7 @@ void mips_malta_init (ram_addr_t ram_size,
network_init();
/* Optional PCI video card */
- if (cirrus_vga_enabled) {
- pci_cirrus_vga_init(pci_bus);
- } else if (vmsvga_enabled) {
- pci_vmsvga_init(pci_bus);
- } else if (std_vga_enabled) {
- pci_std_vga_init(pci_bus);
- }
+ pci_vga_init(pci_bus);
}
static int mips_malta_sysbus_device_init(SysBusDevice *sysbusdev)
--
1.7.10.4
- [Qemu-devel] [PATCH v3 00/17] Rework ISA/PCI video card initialization, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 16/17] mips/r4k: use the new is_vga_init() function, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 02/17] vga: rename isa_vga_init() to isa_std_vga_init(), Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 15/17] pc: use the new pci_vga_init() and isa_vga_init() functions, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 14/17] sun/sun4u: use the new pci_vga_init() function, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 13/17] ppc/pSeries: use the new pci_vga_init() function, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 12/17] ppc/prep: use the new pci_vga_init() function, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 11/17] ppc/oldworld: use the new pci_vga_init() function, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 10/17] ppc/newworld: use the new pci_vga_init() function, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 09/17] alpha: use the new pci_vga_init() function, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 08/17] mips/malta: use the new pci_vga_init() function,
Aurelien Jarno <=
- [Qemu-devel] [PATCH v3 17/17] vga: cleanup after isa_vga_init() and pci_vga_init() conversion, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 01/17] vga: rename pci_vga_init() into pci_std_vga_init(), Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 03/17] vl.c: convert *vga_enabled functions to QOM, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 06/17] pci: add a pci_vga_init() function, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 05/17] vl.c: default to std if cirrus is not available, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 04/17] vl.c: check for qxl availability, Aurelien Jarno, 2012/09/11
- [Qemu-devel] [PATCH v3 07/17] isa: add a isa_vga_init() function, Aurelien Jarno, 2012/09/11