Changeset 15797 in vbox for trunk/src/VBox

Timestamp:

Jan 5, 2009 12:15:28 PM (16 years ago)

Author:

vboxsync

Message:

Redid r41365.

File:

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

trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp

@@ -849 +849 @@
 
     RTCCUINTREG     fFlags = ASMIntDisableFlags();
-    RTCPUID         idCpu = RTMpCpuId();
-    PHWACCM_CPUINFO pCpu = &HWACCMR0Globals.aCpuInfo[idCpu];
-
+    PHWACCM_CPUINFO pCpu = HWACCMR0GetCurrentCpu();
+
+    /* @note Not correct as we can be rescheduled to a different cpu, but the fInUse case is mostly for debugging. */
     ASMAtomicWriteBool(&pCpu->fInUse, true);
+    ASMSetFlags(fFlags);
 
     /* Init a VT-x or AMD-V VM. */
@@ -858 +859 @@
 
     ASMAtomicWriteBool(&pCpu->fInUse, false);
-    ASMSetFlags(fFlags);
-
     return rc;
 }
@@ -883 +882 @@
     AssertReturn(!ASMAtomicReadBool(&HWACCMR0Globals.fSuspended), VERR_HWACCM_SUSPEND_PENDING);
 
+    /* @note Not correct as we can be rescheduled to a different cpu, but the fInUse case is mostly for debugging. */
     RTCCUINTREG     fFlags = ASMIntDisableFlags();
-    RTCPUID         idCpu = RTMpCpuId();
-    PHWACCM_CPUINFO pCpu = &HWACCMR0Globals.aCpuInfo[idCpu];
+    PHWACCM_CPUINFO pCpu = HWACCMR0GetCurrentCpu();
 
     ASMAtomicWriteBool(&pCpu->fInUse, true);
+    ASMSetFlags(fFlags);
 
     /* Terminate a VT-x or AMD-V VM. */
@@ -893 +893 @@
 
     ASMAtomicWriteBool(&pCpu->fInUse, false);
-    ASMSetFlags(fFlags);
     return rc;
 }