Changeset 15159 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Dec 9, 2008 1:01:55 PM (16 years ago)

Author:

vboxsync

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

40566

Message:

Set the correct shadow paging mode for AMD-V nested paging.

File:

• trunk/src/VBox/VMM/VMMAll/HWACCMAll.cpp (modified) (1 diff)

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

@@ -99 +99 @@
  * @param   pVM         The VM to operate on.
  */
-VMMDECL(PGMMODE) HWACCMGetPagingMode(PVM pVM)
+VMMDECL(PGMMODE) HWACCMGetShwPagingMode(PVM pVM)
 {
     Assert(HWACCMIsNestedPagingActive(pVM));
     if (pVM->hwaccm.s.svm.fSupported)
-        return PGMMODE_NESTED;
+    {
+        PGMMODE enmShwPagingMode;
+
+#if HC_ARCH_BITS == 32 
+        if (CPUMIsGuestInLongModeEx(pCtx))
+            enmShwPagingMode = PGMMODE_AMD64_NX;
+        else
+#endif
+            enmShwPagingMode = PGMGetHostMode(pVM);
+
+        return enmShwPagingMode;
+    }
     Assert(pVM->hwaccm.s.vmx.fSupported);
     return PGMMODE_EPT;