Changeset 48268 in vbox

Timestamp:

Sep 4, 2013 2:33:51 PM (12 years ago)

Author:

vboxsync

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

88683

Message:

VMM: Fix wrong check for SMX.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/SUPDrv.c (modified) (2 diffs)
• VMM/VMMR0/HMR0.cpp (modified) (1 diff)

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

@@ -3413 +3413 @@
                 bool fSmxVmxAllowed;
                 bool fVmxAllowed;
+                bool fAllowed;
 
                 /*
@@ -3424 +3425 @@
                 fSmxVmxAllowed = fMsrLocked && !!(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_SMX_VMXON);
                 fVmxAllowed    = fMsrLocked && !!(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_VMXON);
-                if (   (fInSmxMode && fSmxVmxAllowed)
-                    || fVmxAllowed)
+                fAllowed       = fInSmxMode ? fSmxVmxAllowed : fVmxAllowed;
+                if (fAllowed)
                 {
                     VMX_CAPABILITY vtCaps;

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

@@ -845 +845 @@
         /* Verify. */
         fFC = ASMRdMsr(MSR_IA32_FEATURE_CONTROL);
-        fMsrLocked     = !!(fFC & MSR_IA32_FEATURE_CONTROL_LOCK);
-        fSmxVmxAllowed = fMsrLocked && !!(fFC & MSR_IA32_FEATURE_CONTROL_SMX_VMXON);
-        fVmxAllowed    = fMsrLocked && !!(fFC & MSR_IA32_FEATURE_CONTROL_VMXON);
-
-        if (   (fInSmxMode && fSmxVmxAllowed)
-            || fVmxAllowed)
-        {
+        fMsrLocked          = !!(fFC & MSR_IA32_FEATURE_CONTROL_LOCK);
+        fSmxVmxAllowed      = fMsrLocked && !!(fFC & MSR_IA32_FEATURE_CONTROL_SMX_VMXON);
+        fVmxAllowed         = fMsrLocked && !!(fFC & MSR_IA32_FEATURE_CONTROL_VMXON);
+        bool const fAllowed = fInSmxMode ? fSmxVmxAllowed : fVmxAllowed;
+        if (fAllowed)
             rc = VINF_SUCCESS;
-        }
         else
             rc = VERR_VMX_MSR_LOCKING_FAILED;