Changeset 45474 in vbox for trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

Timestamp:

Apr 10, 2013 8:25:33 PM (12 years ago)

Author:

vboxsync

Message:

VMM: Remove unused error codes, use more specific error codes. Restore CR4 on VMXON failures in the new VT-x code.

File:

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

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

@@ -387 +387 @@
  * @param    pVM        Pointer to the VM.
  * @param    pVCpu      Pointer to the VMCPU (can be NULL if @a rc is not
- *                      VERR_VMX_GENERIC).
+ *                      VERR_VMX_UNABLE_TO_START_VM or
+ *                      VERR_VMX_INVALID_VMCS_FIELD).
  * @param    rc         The error code.
  */
@@ -393 +394 @@
 {
     AssertPtr(pVM);
-    if (rc == VERR_VMX_GENERIC)
+    if (   rc == VERR_VMX_INVALID_VMCS_FIELD
+        || rc == VERR_VMX_UNABLE_TO_START_VM)
     {
         AssertPtrReturnVoid(pVCpu);
@@ -603 +605 @@
     /* Enter VMXON root mode. */
     int rc = VMXEnable(HCPhysCpuPage);
+    if (RT_FAILURE(rc))
+        ASMSetCR4(uCr4);
 
     /* Restore interrupts. */
@@ -1533 +1537 @@
     /* Enable the VMX preemption timer. */
     if (pVM->hm.s.vmx.fUsePreemptTimer)
+    {
+        Assert(pVM->hm.s.vmx.msr.vmx_pin_ctls.n.allowed1 & VMX_VMCS_CTRL_PIN_EXEC_CONTROLS_PREEMPT_TIMER);
         val |= VMX_VMCS_CTRL_PIN_EXEC_CONTROLS_PREEMPT_TIMER;
+    }
 
     if ((val & zap) != val)
@@ -1657 +1664 @@
      * Secondary processor-based VM-execution controls.
      */
-    if (pVCpu->hm.s.vmx.u32ProcCtls & VMX_VMCS_CTRL_PROC_EXEC_USE_SECONDARY_EXEC_CTRL)
+    if (RT_LIKELY(pVCpu->hm.s.vmx.u32ProcCtls & VMX_VMCS_CTRL_PROC_EXEC_USE_SECONDARY_EXEC_CTRL))
     {
         val = pVM->hm.s.vmx.msr.vmx_proc_ctls2.n.disallowed0;           /* Bits set here must be set in the VMCS. */
@@ -3741 +3748 @@
             AssertFailed();
             break;
-        case VINF_SUCCESS:      /* VMLAUNCH/VMRESUME succeeded but VM-entry failed... yeah, true story. */
-        case VERR_VMX_UNABLE_TO_START_VM:
-        case VERR_VMX_UNABLE_TO_RESUME_VM:
+        case VINF_SUCCESS:                  /* VMLAUNCH/VMRESUME succeeded but VM-entry failed... yeah, true story. */
+        case VERR_VMX_UNABLE_TO_START_VM:   /* VMLAUNCH/VMRESUME itself failed. */
         {
             int rc = VMXReadVmcs32(VMX_VMCS32_RO_EXIT_REASON, &pVCpu->hm.s.vmx.lasterror.u32ExitReason);
@@ -4099 +4105 @@
         ASMSetCR4(ASMGetCR4() & ~X86_CR4_VMXE);
         ASMSetFlags(uOldEFlags);
-        return VERR_VMX_VMXON_FAILED;
+        return rc2;
     }
 
@@ -6924 +6930 @@
 
 /**
- * VM-exit handler for WBINVD (VMX_EXIT_INVD). Unconditional VM-exit.
+ * VM-exit handler for INVD (VMX_EXIT_INVD). Unconditional VM-exit.
  */
 static DECLCALLBACK(int) hmR0VmxExitInvd(PVM pVM, PVMCPU pVCpu, PCPUMCTX pMixedCtx, PVMXTRANSIENT pVmxTransient)