Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

[qemu.git] / hw / pc.c

diff --git a/hw/pc.c b/hw/pc.c
index 6a8a8719cef877182ef4ed116b3b4c1fab4f1556..f3124d3b8e56baa2c7ef194eaed3decfe8c01f06 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1086,16 +1086,11 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus)
         if (pci_bus) {
             dev = pci_cirrus_vga_init(pci_bus);
         } else {
-            dev = isa_cirrus_vga_init(get_system_memory());
+            dev = &isa_create_simple(isa_bus, "isa-cirrus-vga")->qdev;
         }
     } 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__);
         }