Changeset 12684 in vbox for trunk/src/VBox/VMM/PDMDevice.cpp

Timestamp:

Sep 24, 2008 12:12:24 PM (16 years ago)

Author:

vboxsync

Message:

refactoring to simplify migration to per-CPU action flags

File:

• trunk/src/VBox/VMM/PDMDevice.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -4008 +4008 @@
     PVM pVM = pDevIns->Internal.s.pVMHC;
     LogFlow(("pdmR3PicHlp_SetInterruptFF: caller='%s'/%d: VM_FF_INTERRUPT_PIC %d -> 1\n",
-             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, VM_FF_ISSET(pVM, VM_FF_INTERRUPT_PIC)));
-    VM_FF_SET(pVM, VM_FF_INTERRUPT_PIC);
+             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, VMCPU_FF_ISSET(pVM, 0, VM_FF_INTERRUPT_PIC)));
+    /* for PIC we always deliver to CPU 0, MP use APIC */
+    VMCPU_FF_SET(pVM, 0, VM_FF_INTERRUPT_PIC);
     REMR3NotifyInterruptSet(pVM);
     VMR3NotifyFF(pVM, true);
@@ -4020 +4021 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     LogFlow(("pdmR3PicHlp_ClearInterruptFF: caller='%s'/%d: VM_FF_INTERRUPT_PIC %d -> 0\n",
-             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, VM_FF_ISSET(pDevIns->Internal.s.pVMHC, VM_FF_INTERRUPT_PIC)));
-    VM_FF_CLEAR(pDevIns->Internal.s.pVMHC, VM_FF_INTERRUPT_PIC);
+             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, VMCPU_FF_ISSET(pDevIns->Internal.s.pVMHC, 0, VM_FF_INTERRUPT_PIC)));
+    /* for PIC we always deliver to CPU 0, MP use APIC */
+    VMCPU_FF_CLEAR(pDevIns->Internal.s.pVMHC, 0, VM_FF_INTERRUPT_PIC);
     REMR3NotifyInterruptClear(pDevIns->Internal.s.pVMHC);
 }
@@ -4077 +4079 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     PVM pVM = pDevIns->Internal.s.pVMHC;
-#ifdef VBOX_WITH_SMP_GUESTS
     LogFlow(("pdmR3ApicHlp_SetInterruptFF: caller='%s'/%d: VM_FF_INTERRUPT %d -> 1\n",
              pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, VMCPU_FF_ISSET(pVM, cpuid, VM_FF_INTERRUPT_APIC)));
     VMCPU_FF_SET(pVM, cpuid, VM_FF_INTERRUPT_APIC);
-#else
-    LogFlow(("pdmR3ApicHlp_SetInterruptFF: caller='%s'/%d: VM_FF_INTERRUPT %d -> 1\n",
-             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, VM_FF_ISSET(pVM, VM_FF_INTERRUPT_APIC)));
-    VM_FF_SET(pVM, VM_FF_INTERRUPT_APIC);
-#endif
     REMR3NotifyInterruptSet(pVM);
     VMR3NotifyFF(pVM, true);
@@ -4095 +4091 @@
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
-#ifdef VBOX_WITH_SMP_GUESTS
     LogFlow(("pdmR3ApicHlp_ClearInterruptFF: caller='%s'/%d: VM_FF_INTERRUPT %d -> 0\n",
              pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, VMCPU_FF_ISSET(pDevIns->Internal.s.pVMHC, cpuid, VM_FF_INTERRUPT_APIC)));
     VMCPU_FF_CLEAR(pDevIns->Internal.s.pVMHC, cpuid, VM_FF_INTERRUPT_APIC);
-#else
-    LogFlow(("pdmR3ApicHlp_ClearInterruptFF: caller='%s'/%d: VM_FF_INTERRUPT %d -> 0\n",
-             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, VM_FF_ISSET(pDevIns->Internal.s.pVMHC, VM_FF_INTERRUPT_APIC)));
-    VM_FF_CLEAR(pDevIns->Internal.s.pVMHC, VM_FF_INTERRUPT_APIC);
-#endif
     REMR3NotifyInterruptClear(pDevIns->Internal.s.pVMHC);
 }