From c74b88dffcb2ebfe018e460ac759ae8b1234911d Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sun, 13 Feb 2011 14:17:00 +0000 Subject: vga-isa: make optional Ignore failure with vga-isa device creation, but print a warning message. Signed-off-by: Blue Swirl --- hw/pc.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/pc.h b/hw/pc.h index 475484ac2c..60f8c4263b 100644 --- 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); -- cgit v1.2.3