Changeset 9032 in vbox for trunk/src/VBox/VMM

Timestamp:

May 21, 2008 4:06:09 PM (17 years ago)

Author:

vboxsync

Message:

Nested paging updates

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (2 diffs)
• PGMAllBth.h (modified) (2 diffs)

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

@@ -922 +922 @@
             return pVM->pgm.s.HCPhysPaePML4;
 
+        case PGMMODE_NESTED:
+            return PGMGetNestedCR3(pVM, PGMGetHostMode(pVM));
+
         default:
             AssertMsgFailed(("enmShadowMode=%d\n", enmShadowMode));
@@ -1039 +1042 @@
         case PGMMODE_AMD64_NX:
             return pVM->pgm.s.HCPhysInterPaePML4;
+
+        case PGMMODE_NESTED:
+            return 0; /* not relevant */
 
         default:

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -2523 +2523 @@
 PGM_BTH_DECL(int, PrefetchPage)(PVM pVM, RTGCUINTPTR GCPtrPage)
 {
-    Assert(!HWACCMIsNestedPagingActive(pVM));
 #if (PGM_GST_TYPE == PGM_TYPE_32BIT || PGM_GST_TYPE == PGM_TYPE_REAL || PGM_GST_TYPE == PGM_TYPE_PROT || PGM_GST_TYPE == PGM_TYPE_PAE) \
     && PGM_SHW_TYPE != PGM_TYPE_AMD64 && PGM_SHW_TYPE != PGM_TYPE_NESTED
@@ -2579 +2578 @@
     }
     return rc;
-
+#elif PGM_SHW_TYPE == PGM_TYPE_NESTED
+    return VINF_SUCCESS; /* ignore */
 #else /* PGM_GST_TYPE == PGM_TYPE_AMD64 */