From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 3 Nov 2011 15:00:22 +0000 (+0100)
Subject: disable automatic loading of sgabios when -nographic
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6023d832480e6713e5ae81d3b74f53e6306f3a1b;p=qmiga%2Fqemu.git

disable automatic loading of sgabios when -nographic

sgabios hasn't gotten a lot of coverage since it was not shipped.  For 1.0,
let's disable the automatic loading of the option ROM in -nographic
mode.  We can put it back for 1.1.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/pc.c b/hw/pc.c
index 25bfa85022..3015671858 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1103,15 +1103,6 @@ void pc_vga_init(PCIBus *pci_bus)
             isa_vga_init();
         }
     }
-
-    /*
-     * sga does not suppress normal vga output. So a machine can have both a
-     * vga card and sga manually enabled. Output will be seen on both.
-     * For nographic case, sga is enabled at all times
-     */
-    if (display_type == DT_NOGRAPHIC) {
-        isa_create_simple("sga");
-    }
 }
 
 static void cpu_request_exit(void *opaque, int irq, int level)