Changeset 54201 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Feb 13, 2015 5:13:28 PM (10 years ago)

Author:

vboxsync

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

98263

Message:

HostDrivers/Support, VMM: avoid code duplication.

File:

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

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

@@ -799 +799 @@
     NOREF(idCpu); NOREF(pvUser2);
 
-    uint64_t   u64FeatMsr     = ASMRdMsr(MSR_IA32_FEATURE_CONTROL);
-    bool const fMaybeSmxMode  = RT_BOOL(ASMGetCR4() & X86_CR4_SMXE);
-    bool       fMsrLocked     = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_LOCK);
-    bool       fSmxVmxAllowed = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_SMX_VMXON);
-    bool       fVmxAllowed    = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_VMXON);
-
-    /* Check if the LOCK bit is set but excludes the required VMXON bit. */
-    int rc = VERR_HM_IPE_1;
-    if (fMsrLocked)
-    {
-        if (fVmxAllowed && fSmxVmxAllowed)
-            rc = VINF_SUCCESS;
-        else if (!fVmxAllowed && !fSmxVmxAllowed)
-            rc = VERR_VMX_MSR_ALL_VMXON_DISABLED;
-        else if (!fMaybeSmxMode)
-        {
-            if (fVmxAllowed)
-                rc = VINF_SUCCESS;
-            else
-                rc = VERR_VMX_MSR_VMXON_DISABLED;
-        }
-        else
-        {
-            /*
-             * CR4.SMXE is set but this doesn't mean the CPU is necessarily in SMX mode. We shall assume
-             * that it is -not- and that it is a stupid BIOS/OS setting CR4.SMXE for no good reason.
-             * See @bugref{6873}.
-             */
-            Assert(fMaybeSmxMode == true);
-            rc = VINF_SUCCESS;
-        }
-    }
-    else
-    {
-        /*
-         * MSR is not yet locked; we can change it ourselves here.
-         * Once the lock bit is set, this MSR can no longer be modified.
-         *
-         * Set both the VMXON and SMX_VMXON bits as we can't determine SMX mode
-         * accurately. See @bugref{6873}.
-         */
-        u64FeatMsr |=   MSR_IA32_FEATURE_CONTROL_LOCK
-                      | MSR_IA32_FEATURE_CONTROL_SMX_VMXON
-                      | MSR_IA32_FEATURE_CONTROL_VMXON;
-        ASMWrMsr(MSR_IA32_FEATURE_CONTROL, u64FeatMsr);
-
-        /* Verify. */
-        u64FeatMsr     = ASMRdMsr(MSR_IA32_FEATURE_CONTROL);
-        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 (fSmxVmxAllowed && fVmxAllowed)
-            rc = VINF_SUCCESS;
-        else
-            rc = VERR_VMX_MSR_LOCKING_FAILED;
-    }
-
+    int rc = SUPR0GetVmxUsability(NULL /* pfIsSmxModeAmbiguous */);
     hmR0FirstRcSetStatus(pFirstRc, rc);
 }
@@ -875 +819 @@
     NOREF(idCpu); NOREF(pvUser2);
 
-    /* Check if SVM is disabled. */
-    int rc;
-    uint64_t fVmCr = ASMRdMsr(MSR_K8_VM_CR);
-    if (!(fVmCr & MSR_K8_VM_CR_SVM_DISABLE))
-    {
-        /* Turn on SVM in the EFER MSR. */
-        uint64_t fEfer = ASMRdMsr(MSR_K6_EFER);
-        if (fEfer & MSR_K6_EFER_SVME)
-            rc = VERR_SVM_IN_USE;
-        else
-        {
-            ASMWrMsr(MSR_K6_EFER, fEfer | MSR_K6_EFER_SVME);
-
-            /* Paranoia. */
-            fEfer = ASMRdMsr(MSR_K6_EFER);
-            if (fEfer & MSR_K6_EFER_SVME)
-            {
-                /* Restore previous value. */
-                ASMWrMsr(MSR_K6_EFER, fEfer & ~MSR_K6_EFER_SVME);
-                rc = VINF_SUCCESS;
-            }
-            else
-                rc = VERR_SVM_ILLEGAL_EFER_MSR;
-        }
-    }
-    else
-        rc = VERR_SVM_DISABLED;
-
+    int rc = SUPR0GetSvmUsability(true /* fInitSvm */);
     hmR0FirstRcSetStatus(pFirstRc, rc);
 }