Changeset 57051 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Jul 22, 2015 9:44:48 AM (10 years ago)

Author:

vboxsync

Message:

VMM, SUPDrv: More fine-grained error codes and checking, corrected typo in a couple of existing error codes.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp (modified) (8 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp

@@ -3794 +3794 @@
     fMaybeSmxMode       = RT_BOOL(ASMGetCR4() & X86_CR4_SMXE);
     fMsrLocked          = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_LOCK);
-    fSmxVmxAllowed      = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_SMX_VMXON);
-    fVmxAllowed         = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_VMXON);
+    fSmxVmxAllowed      = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_SMX_VMX);
+    fVmxAllowed         = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_VMX);
     fIsSmxModeAmbiguous = false;
     rc                  = VERR_INTERNAL_ERROR_5;
@@ -3805 +3805 @@
             rc = VINF_SUCCESS;
         else if (!fVmxAllowed && !fSmxVmxAllowed)
-            rc = VERR_VMX_MSR_ALL_VMXON_DISABLED;
+            rc = VERR_VMX_MSR_ALL_VMX_DISABLED;
         else if (!fMaybeSmxMode)
         {
@@ -3811 +3811 @@
                 rc = VINF_SUCCESS;
             else
-                rc = VERR_VMX_MSR_VMXON_DISABLED;
+                rc = VERR_VMX_MSR_VMX_DISABLED;
         }
         else
@@ -3831 +3831 @@
          * this MSR can no longer be modified.
          *
-         * Set both the VMXON and SMX_VMXON bits (if supported) as we can't determine SMX mode
+         * Set both the VMX and SMX_VMX bits (if supported) as we can't determine SMX mode
          * accurately. See @bugref{6873}.
          *
-         * We need to check for VMX-in-SMX hardware support here, before writing the MSR as
+         * We need to check for SMX hardware support here, before writing the MSR as
          * otherwise we will #GP fault on CPUs that do not support it. Callers do not check
          * for it.
@@ -3855 +3855 @@
 
         u64FeatMsr |= MSR_IA32_FEATURE_CONTROL_LOCK
-                    | MSR_IA32_FEATURE_CONTROL_VMXON;
+                    | MSR_IA32_FEATURE_CONTROL_VMX;
         if (fSmxVmxHwSupport)
-            u64FeatMsr |= MSR_IA32_FEATURE_CONTROL_SMX_VMXON;
+            u64FeatMsr |= MSR_IA32_FEATURE_CONTROL_SMX_VMX;
 
         /*
@@ -3880 +3880 @@
         else
             fMsrLocked = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_LOCK);
-        fSmxVmxAllowed = fMsrLocked && RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_SMX_VMXON);
-        fVmxAllowed    = fMsrLocked && RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_VMXON);
-        if (   fVmxAllowed
-            && (   !fSmxVmxHwSupport
-                || fSmxVmxAllowed))
-            rc = VINF_SUCCESS;
+
+        if (fMsrLocked)
+        {
+            fSmxVmxAllowed = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_SMX_VMX);
+            fVmxAllowed    = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_VMX);
+            if (   fVmxAllowed
+                && (   !fSmxVmxHwSupport
+                    || fSmxVmxAllowed))
+            {
+                rc = VINF_SUCCESS;
+            }
+            else
+                rc = !fSmxVmxHwSupport ? VERR_VMX_MSR_VMX_ENABLE_FAILED : VERR_VMX_MSR_SMX_VMX_ENABLE_FAILED;
+        }
         else
             rc = VERR_VMX_MSR_LOCKING_FAILED;
@@ -3949 +3957 @@
  * @returns VBox status code.
  * @retval  VERR_VMX_NO_VMX
- * @retval  VERR_VMX_MSR_ALL_VMXON_DISABLED
- * @retval  VERR_VMX_MSR_VMXON_DISABLED
+ * @retval  VERR_VMX_MSR_ALL_VMX_DISABLED
+ * @retval  VERR_VMX_MSR_VMX_DISABLED
  * @retval  VERR_VMX_MSR_LOCKING_FAILED
+ * @retval  VERR_VMX_MSR_VMX_ENABLE_FAILED
+ * @retval  VERR_VMX_MSR_SMX_VMX_ENABLE_FAILED
  * @retval  VERR_SVM_NO_SVM
  * @retval  VERR_SVM_DISABLED
@@ -4055 +4065 @@
  * @returns VBox status code.
  * @retval  VERR_VMX_NO_VMX
- * @retval  VERR_VMX_MSR_ALL_VMXON_DISABLED
- * @retval  VERR_VMX_MSR_VMXON_DISABLED
+ * @retval  VERR_VMX_MSR_ALL_VMX_DISABLED
+ * @retval  VERR_VMX_MSR_VMX_DISABLED
  * @retval  VERR_VMX_MSR_LOCKING_FAILED
+ * @retval  VERR_VMX_MSR_VMX_ENABLE_FAILED
+ * @retval  VERR_VMX_MSR_SMX_VMX_ENABLE_FAILED
  * @retval  VERR_SVM_NO_SVM
  * @retval  VERR_SVM_DISABLED