From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Mon, 3 Jan 2005 23:28:51 +0000 (+0000)
Subject: initial APIC support (only for x86_64 target now)
X-Git-Tag: release_0_7_0~235
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f7631cfb540b452a01a0375716b51bcc933ef53;p=thirdparty%2Fqemu.git

initial APIC support (only for x86_64 target now)


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1185 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/hw/i8259.c b/hw/i8259.c
index 221506b28f7..8f1821d97f8 100644
--- a/hw/i8259.c
+++ b/hw/i8259.c
@@ -197,6 +197,15 @@ int cpu_get_pic_interrupt(CPUState *env)
 {
     int irq, irq2, intno;
 
+#ifdef TARGET_X86_64
+    intno = apic_get_interrupt(env);
+    if (intno >= 0) {
+        /* set irq request if a PIC irq is still pending */
+        /* XXX: improve that */
+        pic_update_irq(); 
+        return intno;
+    }
+#endif
     /* read the irq from the PIC */
 
     irq = pic_get_irq(&pics[0]);