Changeset 45291 in vbox for trunk/include/VBox/vmm

Timestamp:

Apr 2, 2013 3:31:42 PM (12 years ago)

Author:

vboxsync

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

84688

Message:

VMM: HM bits.

File:

• trunk/include/VBox/vmm/cpum.h (modified) (2 diffs)

trunk/include/VBox/vmm/cpum.h

@@ -271 +271 @@
 
 /**
+ * Tests if the guest has paging enabled or not.
+ *
+ * @returns true if paging is enabled, otherwise false.
+ * @param   pCtx    Current CPU context
+ */
+DECLINLINE(bool)    CPUMIsGuestPagingEnabledEx(PCPUMCTX pCtx)
+{
+    return !!(pCtx->cr0 & X86_CR0_PG);
+}
+
+/**
  * Tests if the guest is running in PAE mode or not.
  *
@@ -278 +289 @@
 DECLINLINE(bool)    CPUMIsGuestInPAEModeEx(PCPUMCTX pCtx)
 {
+#ifdef VBOX_WITH_OLD_VTX_CODE
     return (    (pCtx->cr4 & X86_CR4_PAE)
             &&  CPUMIsGuestInPagedProtectedModeEx(pCtx)
             &&  !CPUMIsGuestInLongModeEx(pCtx));
-}
-
-
-/**
- * Tests if the guest has paging enabled or not.
- *
- * @returns true if paging is enabled, otherwise false.
- * @param   pCtx    Current CPU context
- */
-DECLINLINE(bool)    CPUMIsGuestPagingEnabledEx(PCPUMCTX pCtx)
-{
-    return !!(pCtx->cr0 & X86_CR0_PG);
+#else
+    return (   (pCtx->cr4 & X86_CR4_PAE)
+            && CPUMIsGuestPagingEnabledEx(pCtx)
+            && !(pCtx->msrEFER & MSR_K6_EFER_LME));
+#endif
 }