Changeset 17486 in vbox

Timestamp:

Mar 6, 2009 4:14:24 PM (16 years ago)

Author:

vboxsync

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

43913

Message:

Updates

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• PGMShw.h (modified) (2 diffs)
• VMMAll/PGMAllBth.h (modified) (1 diff)

trunk/src/VBox/VMM/PGMInternal.h

@@ -3526 +3526 @@
     }
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    AssertFatalMsg(("pgmPoolMapPageInlined invalid page index %x\n", pPage->idx));
+    AssertFatalMsgFailed(("pgmPoolMapPageInlined invalid page index %x\n", pPage->idx));
 #else
     return pgmPoolMapPageFallback(pPGM, pPage);

trunk/src/VBox/VMM/PGMShw.h

@@ -237 +237 @@
 PGM_SHW_DECL(int, Exit)(PVM pVM)
 {
-#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-#else
-# if PGM_SHW_TYPE == PGM_TYPE_NESTED
-    Assert(HWACCMIsNestedPagingActive(pVM));
+#if PGM_SHW_TYPE == PGM_TYPE_NESTED
+   Assert(HWACCMIsNestedPagingActive(pVM));
+# ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+    pVM->pgm.s.pShwPageCR3R3 = 0;
+    pVM->pgm.s.pShwPageCR3R0 = 0;
+    pVM->pgm.s.iShwUser      = 0;
+    pVM->pgm.s.iShwUserTable = 0;
+# else
     pVM->pgm.s.pShwRootR3 = 0;
 #  ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
@@ -247 +251 @@
     pVM->pgm.s.HCPhysShwCR3 = 0;
 # endif
-#endif
-
-#if PGM_SHW_TYPE == PGM_TYPE_NESTED
+
     Log(("Leave nested shadow paging mode\n"));
 #endif

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

@@ -4907 +4907 @@
         pVM->pgm.s.pShwPageCR3R3 = 0;
         pVM->pgm.s.pShwPageCR3R0 = 0;
+        pVM->pgm.s.pShwPageCR3RC = 0;
         pVM->pgm.s.iShwUser      = 0;
         pVM->pgm.s.iShwUserTable = 0;