mirror of https://github.com/xemu-project/xemu.git
alpha: use the new pci_vga_init() function
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 <rth@twiddle.net> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
parent
9c59864d16
commit
606f90cc22
|
@ -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) {
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue