[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 09/17] alpha: use the new pci_vga_init() function
From: |
Aurelien Jarno |
Subject: |
[Qemu-devel] [PATCH v3 09/17] alpha: use the new pci_vga_init() function |
Date: |
Tue, 11 Sep 2012 21:10:34 +0200 |
This remove the fallback to std-vga in case, as availability of the
requested vga device is now tested in vl.c, and returns an error message
to the user.
Acked-by: Richard Henderson <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
---
hw/alpha_dp264.c | 2 +-
hw/alpha_pci.c | 24 ------------------------
hw/alpha_sys.h | 2 --
3 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/hw/alpha_dp264.c b/hw/alpha_dp264.c
index 9eb939f..5ea04c7 100644
--- a/hw/alpha_dp264.c
+++ b/hw/alpha_dp264.c
@@ -77,7 +77,7 @@ static void clipper_init(ram_addr_t ram_size,
isa_create_simple(isa_bus, "i8042");
/* VGA setup. Don't bother loading the bios. */
- alpha_pci_vga_setup(pci_bus);
+ pci_vga_init(pci_bus);
/* Serial code setup. */
for (i = 0; i < MAX_SERIAL_PORTS; ++i) {
diff --git a/hw/alpha_pci.c b/hw/alpha_pci.c
index 0352e72..8079a46 100644
--- a/hw/alpha_pci.c
+++ b/hw/alpha_pci.c
@@ -10,8 +10,6 @@
#include "alpha_sys.h"
#include "qemu-log.h"
#include "sysemu.h"
-#include "vmware_vga.h"
-#include "vga-pci.h"
/* PCI IO reads/writes, to byte-word addressable memory. */
@@ -109,25 +107,3 @@ const MemoryRegionOps alpha_pci_iack_ops = {
.max_access_size = 4,
},
};
-
-void alpha_pci_vga_setup(PCIBus *pci_bus)
-{
- switch (vga_interface_type) {
-#ifdef CONFIG_SPICE
- case VGA_QXL:
- pci_create_simple(pci_bus, -1, "qxl-vga");
- return;
-#endif
- case VGA_CIRRUS:
- pci_cirrus_vga_init(pci_bus);
- return;
- case VGA_VMWARE:
- pci_vmsvga_init(pci_bus);
- return;
- }
- /* If VGA is enabled at all, and one of the above didn't work, then
- fallback to Standard VGA. */
- if (vga_interface_type != VGA_NONE) {
- pci_std_vga_init(pci_bus);
- }
-}
diff --git a/hw/alpha_sys.h b/hw/alpha_sys.h
index de40f8b..7604d09 100644
--- a/hw/alpha_sys.h
+++ b/hw/alpha_sys.h
@@ -19,6 +19,4 @@ extern const MemoryRegionOps alpha_pci_bw_io_ops;
extern const MemoryRegionOps alpha_pci_conf1_ops;
extern const MemoryRegionOps alpha_pci_iack_ops;
-void alpha_pci_vga_setup(PCIBus *pci_bus);
-
#endif
--
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 <=
- [Qemu-devel] [PATCH v3 08/17] mips/malta: use the new pci_vga_init() function, Aurelien Jarno, 2012/09/11
- [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