diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-09-27 19:15:42 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-01-22 07:27:06 +0000 |
| commit | a369da5f31ddbdeb32a7f76622e480d3995fbb00 (patch) | |
| tree | 01555226ca58ca3ddff5e70c5d0963117f844e52 /hw/pc.c | |
| parent | 0ae469969484e93354f307971b3425bafe51cb35 (diff) | |
| download | focaccia-qemu-a369da5f31ddbdeb32a7f76622e480d3995fbb00.tar.gz focaccia-qemu-a369da5f31ddbdeb32a7f76622e480d3995fbb00.zip | |
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/pc.c')
| -rw-r--r-- | hw/pc.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/hw/pc.c b/hw/pc.c index 85304cf115..8cb78d9d47 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1085,11 +1085,6 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus) } else if (vmsvga_enabled) { if (pci_bus) { dev = pci_vmsvga_init(pci_bus); - if (!dev) { - fprintf(stderr, "Warning: vmware_vga not available," - " using standard VGA instead\n"); - dev = pci_vga_init(pci_bus); - } } else { fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __FUNCTION__); } |