vga-isa: make optional

Ignore failure with vga-isa device creation, but print a warning
message.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

diff --git a/hw/pc.h b/hw/pc.h
index 475484ac2ca54b3a712afc5e33537bb1bed49632..60f8c4263b0b88fe1c85a22a32b5370f52cc9d15 100644 (file)
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -183,9 +183,15 @@ extern enum vga_retrace_method vga_retrace_method;
 
 static inline int isa_vga_init(void)
 {
-    isa_create_simple("isa-vga");
+    ISADevice *dev;
 
-    return 0;
+    dev = isa_try_create("isa-vga");
+    if (!dev) {
+        fprintf(stderr, "Warning: isa-vga not available\n");
+        return 0;
+    }
+    qdev_init_nofail(&dev->qdev);
+    return 1;
 }
 
 int pci_vga_init(PCIBus *bus);