]> xenbits.xensource.com Git - seabios.git/commitdiff
make qemu_cfg_init depend on QEMU_HARDWARE instead of QEMU
authorKevin O'Connor <kevin@koconnor.net>
Fri, 14 Jun 2013 00:04:31 +0000 (20:04 -0400)
committerKevin O'Connor <kevin@koconnor.net>
Fri, 14 Jun 2013 00:50:21 +0000 (20:50 -0400)
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>
src/paravirt.c

index e5027d044ea46dab0a270a1e612159c58d964758..d1a5d3e2f20bd739d0ec2acad42223c01a994f68 100644 (file)
@@ -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.