Changeset 20981 in vbox for trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp

Timestamp:

Jun 26, 2009 3:03:24 PM (16 years ago)

Author:

vboxsync

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

49189

Message:

Backed out 49187; toxic

File:

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

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

@@ -851 +851 @@
         PVMCPU pVCpu = &pVM->aCpus[i];
 
+        pVCpu->hwaccm.s.idEnteredCpu              = NIL_RTCPUID;
+
         /* Invalidate the last cpu we were running on. */
         pVCpu->hwaccm.s.idLastCpu                 = NIL_RTCPUID;
@@ -961 +963 @@
     /* Make sure we can't enter a session after we've disabled hwaccm in preparation of a suspend. */
     AssertReturn(!ASMAtomicReadBool(&HWACCMR0Globals.fSuspended), VERR_HWACCM_SUSPEND_PENDING);
-    Assert(pVCpu->idHostCpu == NIL_RTCPUID);
-
     ASMAtomicWriteBool(&pCpu->fInUse, true);
-    ASMAtomicWriteU32(&pVCpu->idHostCpu, idCpu);
+
+    AssertMsg(pVCpu->hwaccm.s.idEnteredCpu == NIL_RTCPUID, ("%d", (int)pVCpu->hwaccm.s.idEnteredCpu));
+    pVCpu->hwaccm.s.idEnteredCpu = idCpu;
 
     pCtx = CPUMQueryGuestCtxPtr(pVCpu);
@@ -998 +1000 @@
 #endif
     }
+    else
+        pVCpu->hwaccm.s.idEnteredCpu = NIL_RTCPUID;
     return rc;
 }
@@ -1038 +1042 @@
     /* keep track of the CPU owning the VMCS for debugging scheduling weirdness and ring-3 calls. */
 #ifdef RT_STRICT
-    if (RT_UNLIKELY(    pVCpu->idHostCpu != idCpu
+    if (RT_UNLIKELY(    pVCpu->hwaccm.s.idEnteredCpu != idCpu
                     &&  RT_FAILURE(rc)))
     {
-        AssertMsgFailed(("Owner is %d, I'm %d", (int)pVCpu->idHostCpu, (int)idCpu));
+        AssertMsgFailed(("Owner is %d, I'm %d", (int)pVCpu->hwaccm.s.idEnteredCpu, (int)idCpu));
         rc = VERR_INTERNAL_ERROR;
     }
 #endif
+    pVCpu->hwaccm.s.idEnteredCpu = NIL_RTCPUID;
 
     ASMAtomicWriteBool(&pCpu->fInUse, false);
@@ -1195 +1200 @@
         PVMCPU pVCpu = &pVM->aCpus[idCpu];
 
-        if (pVCpu->idHostCpu == idHostCpu)
+        if (pVCpu->hwaccm.s.idEnteredCpu == idHostCpu)
             return pVCpu;
     }