Changeset 12667 in vbox for trunk/src/VBox/Devices

Timestamp:

Sep 23, 2008 11:25:46 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

36960

Message:

CPU id passed to interrupt callback, proper typing

File:

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

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

@@ -309 +309 @@
 DECLINLINE(APICState*) getLapic(APICDeviceInfo* dev)
 {
-    uint32_t id = dev->CTX_SUFF(pApicHlp)->pfnGetCpuId(dev->CTX_SUFF(pDevIns));
+    /* LAPIC's array is indexed by CPU id */
+    VMCPUID id = dev->CTX_SUFF(pApicHlp)->pfnGetCpuId(dev->CTX_SUFF(pDevIns));
     return LAPIC_BASE(dev) + id;
 }
 
-
-DECLINLINE(void) cpuSetInterrupt(APICDeviceInfo* dev, uint32_t cpuid)
-{
-    dev->CTX_SUFF(pApicHlp)->pfnSetInterruptFF(dev->CTX_SUFF(pDevIns));
-}
-
-DECLINLINE(void) cpuClearInterrupt(APICDeviceInfo* dev, uint32_t cpuid)
-{
-    dev->CTX_SUFF(pApicHlp)->pfnClearInterruptFF(dev->CTX_SUFF(pDevIns));
-}
+DECLINLINE(VMCPUID) getCpuFromLapic(APICDeviceInfo* dev, APICState *s)
+{
+    /* for now we assume LAPIC id == CPU id */
+    return VMCPUID(s->id);
+}
+
+DECLINLINE(void) cpuSetInterrupt(APICDeviceInfo* dev, APICState *s)
+{
+    dev->CTX_SUFF(pApicHlp)->pfnSetInterruptFF(dev->CTX_SUFF(pDevIns), 
+                                               getCpuFromLapic(dev, s));
+}
+
+DECLINLINE(void) cpuClearInterrupt(APICDeviceInfo* dev, APICState *s)
+{
+    dev->CTX_SUFF(pApicHlp)->pfnClearInterruptFF(dev->CTX_SUFF(pDevIns), 
+                                                 getCpuFromLapic(dev, s));
+}
+
+
 #endif /* VBOX */
 
@@ -393 +403 @@
             /** @todo: what do we really do with SMI */
             foreach_apic(dev, deliver_bitmask,
-                         cpuSetInterrupt(dev, apic->id));
+                         cpuSetInterrupt(dev, apic));
             return;
 
@@ -399 +409 @@
             /** @todo: what do we really do with NMI */
             foreach_apic(dev, deliver_bitmask,
-                         cpuSetInterrupt(dev, apic->id));
+                         cpuSetInterrupt(dev, apic));
             return;
 
@@ -470 +480 @@
 
         /* Clear any pending APIC interrupt action flag. */
-        cpuClearInterrupt(dev, s->id);
+        cpuClearInterrupt(dev, s);
         dev->CTX_SUFF(pApicHlp)->pfnChangeFeature(pDevIns, false);
     }
@@ -632 +642 @@
     {
         /* Clear any pending APIC interrupt action flag. */
-        cpuClearInterrupt(dev, s->id);
+        cpuClearInterrupt(dev, s);
         return false;
     }
@@ -647 +657 @@
     cpu_interrupt(s->cpu_env, CPU_INTERRUPT_HARD);
 #else
-    cpuSetInterrupt(dev, s->id);
+    cpuSetInterrupt(dev, s);
     return true;
 #endif
@@ -693 +703 @@
         Log(("apic_update_tpr: deactivate interrupt that was masked by the TPR update (%x)\n", val));
         STAM_COUNTER_INC(&dev->StatClearedActiveIrq);
-        cpuClearInterrupt(dev, s->id);
+        cpuClearInterrupt(dev, s);
     }
 }
@@ -1804 +1814 @@
     dev->pApicHlpR3->pfnChangeFeature(dev->pDevInsR3, true);
     /* Clear any pending APIC interrupt action flag. */
-    cpuClearInterrupt(dev, s->id);
+    cpuClearInterrupt(dev, s);
     APIC_UNLOCK(dev);
 }