Changeset 22060 in vbox

Timestamp:

Aug 7, 2009 11:55:09 AM (16 years ago)

Author:

vboxsync

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

50801

Message:

More cleanup

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (3 diffs)

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

@@ -522 +522 @@
             vmxR0SetMSRPermission(pVCpu, MSR_IA32_SYSENTER_ESP, true, true);
             vmxR0SetMSRPermission(pVCpu, MSR_IA32_SYSENTER_EIP, true, true);
+
+            /* Long mode supported? */
+            if (CPUMGetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_LONG_MODE))
+            {
+                /* Allow the guest to directly modify these MSRs; they are restored and saved automatically. */
+                vmxR0SetMSRPermission(pVCpu, MSR_K8_LSTAR, true, true);
+                vmxR0SetMSRPermission(pVCpu, MSR_K6_STAR, true, true);
+                vmxR0SetMSRPermission(pVCpu, MSR_K8_SF_MASK, true, true);
+                vmxR0SetMSRPermission(pVCpu, MSR_K8_KERNEL_GS_BASE, true, true);
+                vmxR0SetMSRPermission(pVCpu, MSR_K8_GS_BASE, true, true);
+                vmxR0SetMSRPermission(pVCpu, MSR_K8_FS_BASE, true, true);
+            }
         }
 
@@ -532 +544 @@
 
         Assert(pVCpu->hwaccm.s.vmx.pHostMSRPhys);
-        rc = VMXWriteVMCS64(VMX_VMCS_CTRL_VMEXIT_MSR_LOAD_FULL, pVCpu->hwaccm.s.vmx.pHostMSRPhys);
+        rc = VMXWriteVMCS64(VMX_VMCS_CTRL_VMEXIT_MSR_LOAD_FULL,  pVCpu->hwaccm.s.vmx.pHostMSRPhys);
         AssertRC(rc);
         
@@ -1868 +1880 @@
             pMsr->u64Value    = pCtx->msrKERNELGSBASE;    /* swapgs exchange value */
             pMsr++; idxMsr++;
-
-            if (pVM->hwaccm.s.vmx.msr.vmx_proc_ctls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_USE_MSR_BITMAPS)
-            {
-                /* Allow the guest to directly modify these MSRs; they are restored and saved automatically. */
-                vmxR0SetMSRPermission(pVCpu, MSR_K8_LSTAR, true, true);
-                vmxR0SetMSRPermission(pVCpu, MSR_K6_STAR, true, true);
-                vmxR0SetMSRPermission(pVCpu, MSR_K8_SF_MASK, true, true);
-                vmxR0SetMSRPermission(pVCpu, MSR_K8_KERNEL_GS_BASE, true, true);
-                vmxR0SetMSRPermission(pVCpu, MSR_K8_GS_BASE, true, true);
-                vmxR0SetMSRPermission(pVCpu, MSR_K8_FS_BASE, true, true);
-            }
         }
     }