Changeset 17968 in vbox for trunk/src/VBox/Devices/PC/DevAPIC.cpp

Timestamp:

Mar 16, 2009 7:02:29 PM (16 years ago)

Author:

vboxsync

Message:

APIC: locking refined

File:

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

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

@@ -352 +352 @@
 DECLINLINE(void) cpuSetInterrupt(APICDeviceInfo* dev, APICState *s)
 {
+    Log2(("apic: setting interrupt flag\n"));
     dev->CTX_SUFF(pApicHlp)->pfnSetInterruptFF(dev->CTX_SUFF(pDevIns),
                                                getCpuFromLapic(dev, s));
@@ -358 +359 @@
 DECLINLINE(void) cpuClearInterrupt(APICDeviceInfo* dev, APICState *s)
 {
+    Log2(("apic: clear interrupt flag\n"));
     dev->CTX_SUFF(pApicHlp)->pfnClearInterruptFF(dev->CTX_SUFF(pDevIns),
                                                  getCpuFromLapic(dev, s));
@@ -1183 +1185 @@
     if (!(s->spurious_vec & APIC_SV_ENABLE)) {
         Log(("apic_get_interrupt: returns -1 (APIC_SV_ENABLE)\n"));
-        return -1;
+        intno = -1;
+        goto done;
     }
 
@@ -1190 +1193 @@
     if (intno < 0) {
         Log(("apic_get_interrupt: returns -1 (irr)\n"));
-        return -1;
+        intno = -1;
+        goto done;
     }
     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;
+        intno = s->spurious_vec & 0xff;
+        goto done;
     }
     reset_bit(s->irr, intno);
@@ -1200 +1205 @@
     apic_update_irq(dev, s);
     LogFlow(("apic_get_interrupt: returns %d\n", intno));
+ done:
     APIC_UNLOCK(dev);
     return intno;