Changeset 55754 in vbox

Timestamp:

May 8, 2015 2:09:00 PM (9 years ago)

Author:

vboxsync

Message:

VMM/HM: Avoid some fatal assertions in places that can fail.

File:

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

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

@@ -752 +752 @@
             Assert(RT_SUCCESS(rc) || rc == VERR_NOT_SUPPORTED);
             if (RT_SUCCESS(rc))
-            {
                 rc = hmR0FirstRcGetStatus(&FirstRc);
-                AssertMsgRC(rc, ("%u: %Rrc\n", hmR0FirstRcGetCpuId(&FirstRc), rc));
-            }
         }
 
@@ -860 +857 @@
             rc = g_HvmR0.pfnEnableCpu(pCpu, pVM, pvCpuPage, HCPhysCpuPage, false, NULL /* pvArg */);
     }
-    AssertRC(rc);
     if (RT_SUCCESS(rc))
         pCpu->fConfigured = true;
@@ -968 +964 @@
         if (RT_SUCCESS(rc))
             rc = hmR0FirstRcGetStatus(&FirstRc);
-        AssertMsgRC(rc, ("hmR0EnableAllCpuOnce failed for cpu %d with rc=%d\n", hmR0FirstRcGetCpuId(&FirstRc), rc));
     }
 
@@ -1222 +1217 @@
 
     /*
-     * Initialize some per CPU fields.
+     * Initialize some per-VCPU fields.
      */
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
@@ -1298 +1293 @@
     {
         rc = hmR0EnableCpu(pVM, idCpu);
-        AssertRCReturnStmt(rc, RTThreadPreemptRestore(&PreemptState), rc);
+        if (RT_FAILURE(rc))
+        {
+            RTThreadPreemptRestore(&PreemptState)
+            return rc;
+        }
     }