Changeset 39405 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Nov 23, 2011 7:30:29 PM (13 years ago)

Author:

vboxsync

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

75023

Message:

VMM: Don't use generic IPE status codes, use specific ones. Part 2.

File:

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

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

@@ -873 +873 @@
 
     /* Should never happen */
-    if (pCpu->hMemObj == NIL_RTR0MEMOBJ)
-    {
-        AssertLogRelMsgFailed(("hmR0EnableCpu failed idCpu=%u.\n", idCpu));
-        return VERR_INTERNAL_ERROR;
-    }
+    AssertLogRelMsgReturn(pCpu->hMemObj != NIL_RTR0MEMOBJ, ("hmR0EnableCpu failed idCpu=%u.\n", idCpu), VERR_HM_IPE_1);
 
     void    *pvCpuPage     = RTR0MemObjAddress(pCpu->hMemObj);
@@ -1477 +1473 @@
     /* Keep track of the CPU owning the VMCS for debugging scheduling weirdness
        and ring-3 calls. */
-#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
+    AssertMsgStmt(   pVCpu->hwaccm.s.idEnteredCpu == idCpu
+                  || RT_FAILURE_NP(rc),
+                  ("Owner is %u, I'm %u", pVCpu->hwaccm.s.idEnteredCpu, idCpu),
+                  rc = VERR_HM_WRONG_CPU_1);
     pVCpu->hwaccm.s.idEnteredCpu = NIL_RTCPUID;
 
@@ -1713 +1705 @@
 
         default:
-            AssertFailed();
-            return VERR_INTERNAL_ERROR;
+            AssertFailedReturn(VERR_HM_WRONG_SWITCHER);
     }
 
     PHMGLOBLCPUINFO pCpu = HWACCMR0GetCurrentCpu();
-    AssertReturn(pCpu && pCpu->hMemObj != NIL_RTR0MEMOBJ, VERR_INTERNAL_ERROR);
+    AssertReturn(pCpu && pCpu->hMemObj != NIL_RTR0MEMOBJ, VERR_HM_IPE_2);
 
     *pfVTxDisabled = true;
@@ -1747 +1738 @@
 
     PHMGLOBLCPUINFO pCpu = HWACCMR0GetCurrentCpu();
-    AssertReturn(pCpu && pCpu->hMemObj != NIL_RTR0MEMOBJ, VERR_INTERNAL_ERROR);
+    AssertReturn(pCpu && pCpu->hMemObj != NIL_RTR0MEMOBJ, VERR_HM_IPE_2);
 
     void           *pvCpuPage     = RTR0MemObjAddress(pCpu->hMemObj);