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

Timestamp:

Dec 13, 2008 1:02:11 AM (16 years ago)

Author:

vboxsync

Message:

Made exitting on the wrong cpu fatal in strict builds but not when we're already in an error path.

File:

• trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp (modified) (1 diff)

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

@@ -1021 +1021 @@
 
     /* keep track of the CPU owning the VMCS for debugging scheduling weirdness and ring-3 calls. */
-    AssertMsg(pVCpu->hwaccm.s.idEnteredCpu == idCpu, ("owner is %d, I'm %d", (int)pVCpu->hwaccm.s.idEnteredCpu, (int)idCpu));
+#ifdef RT_STRICT
+    if (RT_UNLIKELY(    pVCpu->hwaccm.s.idEnteredCpu != idCpu
+                    &&  RT_FAILURE(rc)))
+    {
+        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;