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

Timestamp:

Sep 12, 2013 9:46:35 AM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Leave VT-x properly for VERR_VMX_INVALID_GUEST_STATE and VERR_VMX_INVALID_VMCS_PTR gurus.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

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

@@ -6262 +6262 @@
     HMVMX_ASSERT_PREEMPT_SAFE();
 
-    if (RT_UNLIKELY(rcExit == VERR_VMX_INVALID_GUEST_STATE))
-    {
-        /* We've done what is required in hmR0VmxExitErrInvalidGuestState(). We're not going to continue guest execution... */
-        return VINF_SUCCESS;
-    }
-    else if (RT_UNLIKELY(rcExit == VERR_VMX_INVALID_VMCS_PTR))
+    if (RT_UNLIKELY(rcExit == VERR_VMX_INVALID_VMCS_PTR))
     {
         VMXGetActivatedVmcs(&pVCpu->hm.s.vmx.LastError.u64VMCSPhys);
@@ -6273 +6268 @@
         pVCpu->hm.s.vmx.LastError.idEnteredCpu    = pVCpu->hm.s.idEnteredCpu;
         /* LastError.idCurrentCpu was updated in hmR0VmxPreRunGuestCommitted(). */
-        return VINF_SUCCESS;
     }