Changeset 48448 in vbox

Timestamp:

Sep 12, 2013 12:53:17 PM (11 years ago)

Author:

vboxsync

Message:

VMM: Assertions.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMR0.cpp (modified) (3 diffs)
• VMMR0.cpp (modified) (2 diffs)

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

@@ -800 +800 @@
 {
     PHMR0FIRSTRC pFirstRc = (PHMR0FIRSTRC)pvUser1;
+    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
     Assert(idCpu == (RTCPUID)RTMpCpuIdToSetIndex(idCpu)); /** @todo fix idCpu == index assumption (rainy day) */
-    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
     NOREF(pvUser2);
 
@@ -904 +904 @@
  * @param   pVM         Pointer to the VM (can be NULL).
  * @param   idCpu       The identifier for the CPU the function is called on.
+ *
+ * @remarks Maybe called with interrupts disabled!
  */
 static int hmR0EnableCpu(PVM pVM, RTCPUID idCpu)
@@ -1071 +1073 @@
 
     Assert(!g_HvmR0.vmx.fSupported || !g_HvmR0.vmx.fUsingSUPR0EnableVTx);
+    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
     Assert(idCpu == (RTCPUID)RTMpCpuIdToSetIndex(idCpu)); /** @todo fix idCpu == index assumption (rainy day) */
     Assert(idCpu < RT_ELEMENTS(g_HvmR0.aCpuInfo));
     Assert(!pCpu->fConfigured || pCpu->hMemObj != NIL_RTR0MEMOBJ);
-    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
     if (pCpu->hMemObj == NIL_RTR0MEMOBJ)

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

@@ -948 +948 @@
                     rc = vmmR0CallRing3SetJmp(&pVCpu->vmm.s.CallRing3JmpBufR0, HMR0RunGuestCode, pVM, pVCpu);
 
+                    /* Manual assert as normal assertions are going to crash in this case. */
                     if (RT_UNLIKELY(   VMCPU_GET_STATE(pVCpu) != VMCPUSTATE_STARTED_HM
                                     && RT_SUCCESS_NP(rc)  && rc !=  VINF_VMM_CALL_HOST ))
                     {
-                        /* Manual assert as normal assertions are going to crash in this case. */
                         pVM->vmm.s.szRing0AssertMsg1[0] = '\0';
                         RTStrPrintf(pVM->vmm.s.szRing0AssertMsg2, sizeof(pVM->vmm.s.szRing0AssertMsg2),
@@ -957 +957 @@
                         rc = VERR_VMM_WRONG_HM_VMCPU_STATE;
                     }
+                    else if (RT_UNLIKELY(VMMR0ThreadCtxHooksAreRegistered(pVCpu)))
+                    {
+                        pVM->vmm.s.szRing0AssertMsg1[0] = '\0';
+                        RTStrPrintf(pVM->vmm.s.szRing0AssertMsg2, sizeof(pVM->vmm.s.szRing0AssertMsg2),
+                                    "Thread-context hooks still registered! VCPU=%p Id=%u rc=%d.\n", pVCpu, pVCpu->idCpu, rc);
+                        rc = VERR_INVALID_STATE;
+                    }
+
                     VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED);
                 }