diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-02-05 14:34:37 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-02-12 08:28:22 +0000 |
| commit | 7ba7e49e6a7493e1cd0fe07cc67403846d642fc5 (patch) | |
| tree | 56175042ccf012b1dd1caa71f95ad7ab49ee3d17 /hw/mips_malta.c | |
| parent | 7cc050b1659545d0c87108c17f0bf78561efcf9a (diff) | |
| download | qemu-7ba7e49e6a7493e1cd0fe07cc67403846d642fc5.zip qemu-7ba7e49e6a7493e1cd0fe07cc67403846d642fc5.tar.gz qemu-7ba7e49e6a7493e1cd0fe07cc67403846d642fc5.tar.bz2 | |
x86,MIPS: make vmware_vga optional
Allow failure with vmware_vga device creation and use standard
VGA instead.
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, 5 insertions, 1 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 2d3f242..930c51c 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -957,7 +957,11 @@ void mips_malta_init (ram_addr_t ram_size, if (cirrus_vga_enabled) { pci_cirrus_vga_init(pci_bus); } else if (vmsvga_enabled) { - pci_vmsvga_init(pci_bus); + if (!pci_vmsvga_init(pci_bus)) { + fprintf(stderr, "Warning: vmware_vga not available," + " using standard VGA instead\n"); + pci_vga_init(pci_bus); + } } else if (std_vga_enabled) { pci_vga_init(pci_bus); } |