From: Kevin O'Connor <kevin@koconnor.net>
Date: Fri, 14 Jun 2013 00:04:31 +0000 (-0400)
Subject: make qemu_cfg_init depend on QEMU_HARDWARE instead of QEMU
X-Git-Tag: rel-1.7.3~2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7507ce28f436fe8b37bcd09a85c7289bf4c4284f;p=seabios.git

make qemu_cfg_init depend on QEMU_HARDWARE instead of QEMU

Gets qemu features like direct kernel boot and boot
ordering going when seabios runs on coreboot.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
---

diff --git a/src/paravirt.c b/src/paravirt.c
index e5027d0..d1a5d3e 100644
--- a/src/paravirt.c
+++ b/src/paravirt.c
@@ -222,6 +222,9 @@ struct qemu_smbios_header {
 static void
 qemu_cfg_legacy(void)
 {
+    if (!CONFIG_QEMU)
+        return;
+
     // Misc config items.
     qemu_romfile_add("etc/show-boot-menu", QEMU_CFG_BOOT_MENU, 0, 2);
     qemu_romfile_add("etc/irq0-override", QEMU_CFG_IRQ0_OVERRIDE, 0, 1);
@@ -301,7 +304,7 @@ struct QemuCfgFile {
 
 void qemu_cfg_init(void)
 {
-    if (!CONFIG_QEMU)
+    if (!runningOnQEMU())
         return;
 
     // Detect fw_cfg interface.