Changeset 45467 in vbox

Timestamp:

Apr 10, 2013 4:57:41 PM (12 years ago)

Author:

vboxsync

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

84910

Message:

VMM/VMMR0/HM: bits.

File:

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

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

@@ -1542 +1542 @@
     }
 
-    val &= zap;
     int rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_PIN_EXEC_CONTROLS, val);
     AssertRCReturn(rc, rc);
@@ -1649 +1648 @@
     }
 
-    val &= zap;
     rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_PROC_EXEC_CONTROLS, val);
     AssertRCReturn(rc, rc);
@@ -1712 +1710 @@
         }
 
-        val &= zap;
         rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_PROC_EXEC_CONTROLS2, val);
         AssertRCReturn(rc, rc);
@@ -2227 +2224 @@
 
     /* Shouldn't ever happen but there -is- a number. We're well within the recommended 512. */
-    if (idxHostMsr > MSR_IA32_VMX_MISC_MAX_MSR(pVM->hm.s.vmx.msr.vmx_misc))
+    if (RT_UNLIKELY(idxHostMsr > MSR_IA32_VMX_MISC_MAX_MSR(pVM->hm.s.vmx.msr.vmx_misc)))
+    {
+        LogRel(("idxHostMsr=%u Cpu=%u\n", idxHostMsr, (unsigned)MSR_IA32_VMX_MISC_MAX_MSR(pVM->hm.s.vmx.msr.vmx_misc)));
         return VERR_HM_UNSUPPORTED_CPU_FEATURE_COMBO;
+    }
 
     int rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_EXIT_MSR_LOAD_COUNT, idxHostMsr);
@@ -2308 +2308 @@
         }
 
-        val &= zap;
         rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_ENTRY_CONTROLS, val);
         AssertRCReturn(rc, rc);
@@ -2375 +2374 @@
         }
 
-        val &= zap;
         rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_EXIT_CONTROLS, val);
+        AssertRCReturn(rc, rc);
 
         /* Update VCPU with the currently set VM-exit controls. */