aboutsummaryrefslogtreecommitdiff
path: root/hw/alpha_pci.c
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2011-09-27 19:15:42 +0000
committerBlue Swirl <blauwirbel@gmail.com>2012-01-22 07:27:06 +0000
commita369da5f31ddbdeb32a7f76622e480d3995fbb00 (patch)
tree01555226ca58ca3ddff5e70c5d0963117f844e52 /hw/alpha_pci.c
parent0ae469969484e93354f307971b3425bafe51cb35 (diff)
downloadqemu-a369da5f31ddbdeb32a7f76622e480d3995fbb00.zip
qemu-a369da5f31ddbdeb32a7f76622e480d3995fbb00.tar.gz
qemu-a369da5f31ddbdeb32a7f76622e480d3995fbb00.tar.bz2
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 <jan.kiszka@siemens.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/alpha_pci.c')
-rw-r--r--hw/alpha_pci.c6
1 files changed, 2 insertions, 4 deletions
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. */