Ignore failure with vga-isa device creation, but print a warning message. Signed-off-by: Blue Swirl <blauwir...@gmail.com> --- hw/pc.h | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/pc.h b/hw/pc.h
index 475484a..60f8c42 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);
--
1.6.2.4
0003-vga-isa-make-optional.patch
Description: application/mbox
