Changeset 42857 in vbox for trunk

Timestamp:

Aug 17, 2012 5:09:06 AM (13 years ago)

Author:

vboxsync

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

80122

Message:

VMM/HWVMXR0: Ignore EFER MSR auto store/load as we intercept all accesses to it.

File:

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

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

@@ -1348 +1348 @@
         unsigned idxMsr = 0;
 
-        /*
-         * Check if EFER MSR present.
-         */
         uint32_t u32HostExtFeatures = ASMCpuId_EDX(0x80000001);
         if (u32HostExtFeatures & (X86_CPUID_EXT_FEATURE_EDX_NX | X86_CPUID_EXT_FEATURE_EDX_LONG_MODE))
@@ -1362 +1359 @@
             }
 
+#if 0
             pMsr->u32IndexMSR = MSR_K6_EFER;
             pMsr->u32Reserved = 0;
@@ -1374 +1372 @@
                 pMsr->u64Value    = ASMRdMsr(MSR_K6_EFER);
             pMsr++; idxMsr++;
+#endif
         }
 
@@ -2153 +2152 @@
     CPUMGetGuestCpuId(pVCpu, 0x80000001, &u32Temp, &u32Temp, &u32Temp, &u32GstExtFeatures);
 
-    /*
-     * Check if EFER MSR present.
-     */
     if (u32GstExtFeatures & (X86_CPUID_EXT_FEATURE_EDX_NX | X86_CPUID_EXT_FEATURE_EDX_LONG_MODE))
     {
+#if 0
         pMsr->u32IndexMSR = MSR_K6_EFER;
         pMsr->u32Reserved = 0;
@@ -2165 +2162 @@
             pMsr->u64Value &= ~(MSR_K6_EFER_LMA | MSR_K6_EFER_LME);
         pMsr++; idxMsr++;
+#endif
 
         if (u32GstExtFeatures & X86_CPUID_EXT_FEATURE_EDX_LONG_MODE)
@@ -2425 +2423 @@
                 CPUMSetGuestMsr(pVCpu, MSR_K8_TSC_AUX, pMsr->u64Value);
                 break;
+#if 0
             case MSR_K6_EFER:
                 /* EFER can't be changed without causing a VM-exit. */
                 /* Assert(pCtx->msrEFER == pMsr->u64Value); */
                 break;
+#endif
             default:
                 AssertFailed();