Changeset 15159 in vbox

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.

Location:

trunk

Files:

• include/VBox/hwaccm.h (modified) (1 diff)
• src/VBox/VMM/PGM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/HWACCMAll.cpp (modified) (1 diff)

trunk/include/VBox/hwaccm.h

@@ -73 +73 @@
 VMMDECL(int)     HWACCMInvalidatePhysPage(PVM pVM, RTGCPHYS GCPhys);
 VMMDECL(bool)    HWACCMIsNestedPagingActive(PVM pVM);
-VMMDECL(PGMMODE) HWACCMGetPagingMode(PVM pVM);
+VMMDECL(PGMMODE) HWACCMGetShwPagingMode(PVM pVM);
 VMMDECL(RTCPUID) HWACCMGetVMCPUId(PVM pVM);
 #else

trunk/src/VBox/VMM/PGM.cpp

@@ -3263 +3263 @@
     /* Override the shadow mode is nested paging is active. */
     if (HWACCMIsNestedPagingActive(pVM))
-        enmShadowMode = HWACCMGetPagingMode(pVM);
+        enmShadowMode = HWACCMGetShwPagingMode(pVM);
 
     *penmSwitcher = enmSwitcher;

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;