Changeset 55756 in vbox for trunk

Timestamp:

May 8, 2015 2:28:36 PM (10 years ago)

Author:

vboxsync

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

100178

Message:

VMM/HM: Add some rudimentary logging for VERR_VMX_INVALID_VMXON_PTR errors.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMVMXR0.cpp (modified) (2 diffs)
• VMMR3/HM.cpp (modified) (3 diffs)
• include/HMInternal.h (modified) (1 diff)

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

@@ -781 +781 @@
 
     /* Enter VMX root mode. */
-    int rc = VMXEnable(HCPhysCpuPage);
-    if (   RT_FAILURE(rc)
-        && !(uOldCr4 & X86_CR4_VMXE))
-        SUPR0ChangeCR4(0, ~X86_CR4_VMXE);
+    int rc = VMXEnable(HCPhysCpuPage+5);
+    if (RT_FAILURE(rc))
+    {
+        if (!(uOldCr4 & X86_CR4_VMXE))
+            SUPR0ChangeCR4(0, ~X86_CR4_VMXE);
+
+        if (pVM)
+            pVM->hm.s.vmx.HCPhysVmxEnableError = HCPhysCpuPage+5;
+    }
 
     /* Restore interrupts. */
@@ -5285 +5290 @@
         SUPR0ChangeCR4(0, ~X86_CR4_VMXE);
         ASMSetFlags(uOldEflags);
+        pVM->hm.s.vmx.HCPhysVmxEnableError = HCPhysCpuPage;
         return rc2;
     }

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -974 +974 @@
     if (RT_FAILURE(rc))
     {
-        LogRel(("HM: HMR3InitFinalize: SUPR3CallVMMR0Ex VMMR0_DO_HM_ENABLE failed with %Rrc\n", rc));
+        LogRel(("HM: Failed to enable, error %Rrc\n", rc));
+        HMR3CheckError(pVM, rc);
         return rc;
     }
@@ -1299 +1300 @@
             LogRel(("HM: CPU[%u] HM error                %#x (%u)\n", i, pVCpu->hm.s.u32HMError, pVCpu->hm.s.u32HMError));
         }
+        HMR3CheckError(pVM, rc);
         return VMSetError(pVM, rc, RT_SRC_POS, "VT-x setup failed: %Rrc", rc);
     }
@@ -3002 +3004 @@
         LogRel(("HM: VERR_VMX_UNABLE_TO_START_VM: VM-entry disallowed %#RX32\n", pVM->hm.s.vmx.Msrs.VmxEntry.n.disallowed0));
     }
+    else if (iStatusCode == VERR_VMX_INVALID_VMXON_PTR)
+        LogRel(("HM: HCPhysVmxEnableError         = %#RHp\n", pVM->hm.s.vmx.HCPhysVmxEnableError));
 }
 

trunk/src/VBox/VMM/include/HMInternal.h

@@ -426 +426 @@
         VMXFLUSHEPT                 enmFlushEpt;
         VMXFLUSHVPID                enmFlushVpid;
+
+        /** Host-physical address for a failing VMXON instruction. */
+        RTHCPHYS                    HCPhysVmxEnableError;
     } vmx;