[PATCH 07/10] Always enable the IRQ0 override if the VIRTUTECH_IRQ0_OVERRIDE option is set.

[Magnus Christensson]

---
 src/config.h   |    3 +++
 src/paravirt.c |    4 ++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/config.h b/src/config.h
index 3033133..71903bb 100644
--- a/src/config.h
+++ b/src/config.h
@@ -189,4 +189,7 @@
 #define DEBUG_HDL_pmm 1
 #define DEBUG_thread 1
 
+/* Options for running on the Virtutech Simics x86-440bx machine model */
+#define VIRTUTECH_IRQ0_OVERRIDE 1
+
 #endif // config.h
diff --git a/src/paravirt.c b/src/paravirt.c
index 6f48d2e..577c7e8 100644
--- a/src/paravirt.c
+++ b/src/paravirt.c
@@ -82,6 +82,9 @@ int qemu_cfg_show_boot_menu(void)
 
 int qemu_cfg_irq0_override(void)
 {
+#if VIRTUTECH_IRQ0_OVERRIDE
+    return 1;
+#else
     u8 v;
 
     if (!qemu_cfg_present)
@@ -90,6 +93,7 @@ int qemu_cfg_irq0_override(void)
     qemu_cfg_read_entry(&v, QEMU_CFG_IRQ0_OVERRIDE, sizeof(v));
 
     return v;
+#endif
 }
 
 u16 qemu_cfg_acpi_additional_tables(void)
-- 
1.6.2.5


--------------080100040501080908060605
Content-Type: text/x-patch;
 name="0008-Handle-Virtutech-Simics-x86-440bx-shadowing-with-the.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0008-Handle-Virtutech-Simics-x86-440bx-shadowing-with-the.pa";
 filename*1="tch"