Changeset 16916 in vbox for trunk

Timestamp:

Feb 18, 2009 3:44:47 PM (16 years ago)

Author:

vboxsync

Message:

Fixed VT-x assertion

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (1 diff)
• PGMAllMap.cpp (modified) (7 diffs)
• PGMAllPool.cpp (modified) (1 diff)

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

@@ -2246 +2246 @@
     STAM_PROFILE_STOP(&pVM->pgm.s.CTX_MID_Z(Stat,SyncCR3), a);
     return cErrors;
-    return 0;
 }
 

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

@@ -219 +219 @@
 void pgmMapSetShadowPDEs(PVM pVM, PPGMMAPPING pMap, unsigned iNewPDE)
 {
+    Log(("pgmMapSetShadowPDEs new pde %x (mappings enabled %d)\n", iNewPDE, pgmMapAreMappingsEnabled(&pVM->pgm.s)));
+
     if (!pgmMapAreMappingsEnabled(&pVM->pgm.s))
         return;
@@ -349 +351 @@
 void pgmMapClearShadowPDEs(PVM pVM, PPGMPOOLPAGE pShwPageCR3, PPGMMAPPING pMap, unsigned iOldPDE)
 {
-    Assert(pShwPageCR3);
+    Log(("pgmMapClearShadowPDEs old pde %x (mappings enabled %d)\n", iOldPDE, pgmMapAreMappingsEnabled(&pVM->pgm.s)));
 
     if (!pgmMapAreMappingsEnabled(&pVM->pgm.s))
@@ -355 +357 @@
 
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    if (!pVM->pgm.s.CTX_SUFF(pShwPageCR3))
-        return;    /* too early */
+    Assert(pShwPageCR3);
 #endif
 
@@ -426 +427 @@
 VMMDECL(int) PGMMapActivateAll(PVM pVM)
 {
+    Log(("PGMMapActivateAll fixed mappings=%d\n", pVM->pgm.s.fMappingsFixed));
+
     /*
      * Can skip this if mappings are safely fixed.
@@ -461 +464 @@
 VMMDECL(int) PGMMapDeactivateAll(PVM pVM)
 {
+    Log(("PGMMapDeactivateAll fixed mappings=%d\n", pVM->pgm.s.fMappingsFixed));
+
     /*
      * Can skip this if mappings are safely fixed.
@@ -604 +609 @@
 }
 
+# ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
 /**
  * Checks and resolves (ring 3 only) guest conflicts with VMM GC mappings.
@@ -712 +718 @@
     return VINF_SUCCESS;
 }
+# endif /* VBOX_WITH_PGMPOOL_PAGING_ONLY */
+
 #endif /* IN_RING0 */
 

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

@@ -488 +488 @@
                 uShw.pv = PGMPOOL_PAGE_2_PTR(pPool->CTX_SUFF(pVM), pPage);
                 const unsigned iShw = off / sizeof(X86PTE);         // ASSUMING 32-bit guest paging!
+
+#  ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+                LogFlow(("pgmPoolMonitorChainChanging: PGMPOOLKIND_32BIT_PD %x\n", iShw));
+#  endif
                 if (uShw.pPD->a[iShw].u & PGM_PDFLAGS_MAPPING)
                 {