From a369da5f31ddbdeb32a7f76622e480d3995fbb00 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Tue, 27 Sep 2011 19:15:42 +0000 Subject: vga: improve VGA logic Improve VGA selection logic, push check for device availabilty to vl.c. Create the devices at board level unconditionally. Remove now unused pci_try_create*() functions. Make PCI VGA devices optional. Reviewed-by: Jan Kiszka Signed-off-by: Blue Swirl --- hw/alpha_pci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'hw/alpha_pci.c') diff --git a/hw/alpha_pci.c b/hw/alpha_pci.c index e975702..6735577 100644 --- a/hw/alpha_pci.c +++ b/hw/alpha_pci.c @@ -121,10 +121,8 @@ void alpha_pci_vga_setup(PCIBus *pci_bus) pci_cirrus_vga_init(pci_bus); return; case VGA_VMWARE: - if (pci_vmsvga_init(pci_bus)) { - return; - } - break; + 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. */ -- cgit v1.1