Changeset 45829 in vbox for trunk/src/VBox/VMM

Timestamp:

Apr 30, 2013 10:10:37 AM (12 years ago)

Author:

vboxsync

Message:

Don't panic on bad state and ignore assertions and other error conditions.

File:

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

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

@@ -768 +768 @@
                     AssertRC(rc2);
 
-                    VMCPU_ASSERT_STATE(pVCpu, VMCPUSTATE_STARTED_HM);
+                    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),
+                                    "Got VMCPU state %d expected %d.\n", VMCPU_GET_STATE(pVCpu), VMCPUSTATE_STARTED_HM);
+                        rc = VERR_VMM_WRONG_HM_VMCPU_STATE;
+                    }
                     VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED);
                 }