Changeset 49849 in vbox

Timestamp:

Dec 9, 2013 4:51:05 PM (11 years ago)

Author:

vboxsync

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

91200

Message:

VMM: Use EFER.LMA in PAE-paging mode check rather than EFER.LME.

Location:

trunk

Files:

• include/VBox/vmm/cpum.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (1 diff)

trunk/include/VBox/vmm/cpum.h

@@ -289 +289 @@
 DECLINLINE(bool)    CPUMIsGuestInPAEModeEx(PCPUMCTX pCtx)
 {
+    /* Intel mentions EFER.LMA and EFER.LME in different parts of their spec. We shall use EFER.LMA rather
+       than EFER.LME as it reflects if the CPU has entered paging with EFER.LME set.  */
     return (   (pCtx->cr4 & X86_CR4_PAE)
             && CPUMIsGuestPagingEnabledEx(pCtx)
-            && !(pCtx->msrEFER & MSR_K6_EFER_LME));
+            && !(pCtx->msrEFER & MSR_K6_EFER_LMA));
 }
 

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -2798 +2798 @@
 VMMDECL(bool) CPUMIsGuestInPAEMode(PVMCPU pVCpu)
 {
+    /* Intel mentions EFER.LMA and EFER.LME in different parts of their spec. We shall use EFER.LMA rather
+       than EFER.LME as it reflects if the CPU has entered paging with EFER.LME set.  */
     return (pVCpu->cpum.s.Guest.cr4 & X86_CR4_PAE)
         && (pVCpu->cpum.s.Guest.cr0 & X86_CR0_PG)
-        && !(pVCpu->cpum.s.Guest.msrEFER & MSR_K6_EFER_LME);
+        && !(pVCpu->cpum.s.Guest.msrEFER & MSR_K6_EFER_LMA);
 }