Changeset 20764 in vbox

Timestamp:

Jun 22, 2009 11:13:45 AM (15 years ago)

Author:

vboxsync

Message:

More checks

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (3 diffs)
• PGMPool.cpp (modified) (1 diff)
• VMMAll/PGMAllPool.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGMInternal.h

@@ -2977 +2977 @@
 int             pgmR0DynMapHCPageCommon(PVM pVM, PPGMMAPSET pSet, RTHCPHYS HCPhys, void **ppv);
 #endif
-int             pgmPoolAllocEx(PVM pVM, RTGCPHYS GCPhys, PGMPOOLKIND enmKind, PGMPOOLACCESS enmAccess, uint16_t iUser, uint32_t iUserTable, PPPGMPOOLPAGE ppPage);
-
-DECLINLINE(int) pgmPoolAlloc(PVM pVM, RTGCPHYS GCPhys, PGMPOOLKIND enmKind, uint16_t iUser, uint32_t iUserTable, PPPGMPOOLPAGE ppPage)
-{
-    return pgmPoolAllocEx(pVM, GCPhys, enmKind, PGMPOOLACCESS_DONTCARE, iUser, iUserTable, ppPage);
+int             pgmPoolAllocEx(PVM pVM, RTGCPHYS GCPhys, PGMPOOLKIND enmKind, PGMPOOLACCESS enmAccess, uint16_t iUser, uint32_t iUserTable, PPPGMPOOLPAGE ppPage, bool fLockPage = false);
+
+DECLINLINE(int) pgmPoolAlloc(PVM pVM, RTGCPHYS GCPhys, PGMPOOLKIND enmKind, uint16_t iUser, uint32_t iUserTable, PPPGMPOOLPAGE ppPage, bool fLockPage = false)
+{
+    return pgmPoolAllocEx(pVM, GCPhys, enmKind, PGMPOOLACCESS_DONTCARE, iUser, iUserTable, ppPage, fLockPage);
 }
 
@@ -4473 +4473 @@
 DECLINLINE(void) pgmPoolLockPage(PPGMPOOL pPool, PPGMPOOLPAGE pPage)
 {
+    Assert(PGMIsLockOwner(pPool->CTX_SUFF(pVM)));
     ASMAtomicIncU32(&pPage->cLocked);
 }
@@ -4485 +4486 @@
 DECLINLINE(void) pgmPoolUnlockPage(PPGMPOOL pPool, PPGMPOOLPAGE pPage)
 {
+    Assert(PGMIsLockOwner(pPool->CTX_SUFF(pVM)));
     Assert(pPage->cLocked);
     ASMAtomicDecU32(&pPage->cLocked);

trunk/src/VBox/VMM/PGMPool.cpp

@@ -529 +529 @@
     }
 
+    Assert(pPage->enmKind != PGMPOOLKIND_FREE);
+
     if (!pVCpu) /** @todo This shouldn't happen any longer, all access handlers will be called on an EMT. All ring-3 handlers, except MMIO, already own the PGM lock. @bugref{3170} */
     {

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

@@ -1120 +1120 @@
     }
 
+    Assert(pPage->enmKind != PGMPOOLKIND_FREE);
+
     /*
      * We should ALWAYS have the list head as user parameter. This