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/mips_malta.c | |
| parent | 0ae469969484e93354f307971b3425bafe51cb35 (diff) | |
| download | qemu-a369da5f31ddbdeb32a7f76622e480d3995fbb00.tar.gz qemu-a369da5f31ddbdeb32a7f76622e480d3995fbb00.tar.bz2 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/mips_malta.c')
| -rw-r--r-- | hw/mips_malta.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c index e625ec398f..4a4f76d9f2 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -996,11 +996,7 @@ void mips_malta_init (ram_addr_t ram_size, if (cirrus_vga_enabled) { pci_cirrus_vga_init(pci_bus); } else if (vmsvga_enabled) { - if (!pci_vmsvga_init(pci_bus)) { - fprintf(stderr, "Warning: vmware_vga not available," - " using standard VGA instead\n"); - pci_vga_init(pci_bus); - } + pci_vmsvga_init(pci_bus); } else if (std_vga_enabled) { pci_vga_init(pci_bus); } |