diff mbox

[3/3] mac99: add a video card only when requested

Message ID 1347031634-12526-3-git-send-email-aurelien@aurel32.net
State New
Headers show

Commit Message

Aurelien Jarno Sept. 7, 2012, 3:27 p.m. UTC 
The mac99 machine always add a video card, even when the "-vga none"
is passed. Fix that by checking if it is enabled or not before
instanciating it.

Cc: Alexander Graf <agraf@suse.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
 hw/ppc_newworld.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index e95cfe8..6db8b3a 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -330,7 +330,9 @@  static void ppc_core99_init (ram_addr_t ram_size,
         machine_arch = ARCH_MAC99;
     }
     /* init basic PC hardware */
-    pci_vga_init(pci_bus);
+    if (std_vga_enabled) {
+        pci_vga_init(pci_bus);
+    }
 
     escc_mem = escc_init(0, pic[0x25], pic[0x24],
                          serial_hds[0], serial_hds[1], ESCC_CLOCK, 4);