Changeset 2922 in vbox for trunk/src/VBox

Timestamp:

May 29, 2007 4:28:27 PM (18 years ago)

Author:

vboxsync

Message:

sync some I/O-APIC code from qemu (r1.11: APIC init fix + APIC get_irq fix)

File:

• trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -615 +615 @@
     memset(s->tmr, 0, sizeof(s->tmr));
     memset(s->irr, 0, sizeof(s->irr));
-    memset(s->lvt, 0, sizeof(s->lvt));
+    for(i = 0; i < APIC_LVT_NB; i++)
+        s->lvt[i] = 1 << 16; /* mask LVT */
     s->esr = 0;
     memset(s->icr, 0, sizeof(s->icr));
@@ -731 +732 @@
         return -1;
     }
-    reset_bit(s->irr, intno);
     if (s->tpr && (uint32_t)intno <= s->tpr) {
         Log(("apic_get_interrupt: returns %d (sp)\n", s->spurious_vec & 0xff));
         return s->spurious_vec & 0xff;
     }
+    reset_bit(s->irr, intno);
     set_bit(s->isr, intno);
     apic_update_irq(s);