Changeset 17140 in vbox

Timestamp:

Feb 25, 2009 4:43:48 PM (16 years ago)

Author:

vboxsync

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

43391

Message:

VBOX_WITH_PGMPOOL_PAGING_ONLY: compile fixes

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• PGMPool.cpp (modified) (1 diff)
• VMMAll/PGMAllMap.cpp (modified) (2 diffs)
• VMMAll/PGMAllPool.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -4764 +4764 @@
  *
  * @returns VBox status code.
- * @param   pVM         VM Handle.
  * @param   pPage       PGM pool page
  */
-DECLINLINE(bool) pgmPoolIsPageLocked(PVM pVM, PPGMPOOLPAGE pPage)
+DECLINLINE(bool) pgmPoolIsPageLocked(PPGM pPGM, PPGMPOOLPAGE pPage)
 {
     if (pPage->fLocked)
     {
-        LogFlow(("pgmPoolIsPageLocked found root page %s\n", pgmPoolPoolKindToStr(pPage->enmKind)));
+        LogFlow(("pgmPoolIsPageLocked found root page %d\n", pPage->enmKind));
         if (pPage->cModifications)
             pPage->cModifications = 1; /* reset counter (can't use 0, or else it will be reinserted in the modified list) */
         return true;
     }
-    Assert(pPage != pVM->pgm.s.CTX_SUFF(pShwPageCR3));
     return false;
 }

trunk/src/VBox/VMM/PGMPool.cpp

@@ -587 +587 @@
     else if (    (   pPage->cModifications < 96 /* it's cheaper here. */
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-                  || pgmPoolIsPageLocked(pVM, pPage)
+                  || pgmPoolIsPageLocked(&pVM->pgm.s, pPage)
 #else
                   || pPage->fCR3Mix

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

@@ -306 +306 @@
 
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-                if (!pgmPoolIsPageLocked(pVM, pPoolPagePd))
+                if (!pgmPoolIsPageLocked(&pVM->pgm.s, pPoolPagePd))
                 {
                     /* Mark the page as locked; disallow flushing. */
@@ -420 +420 @@
                 AssertFatal(pPoolPagePd);
 
-                if (pgmPoolIsPageLocked(pVM, pPoolPagePd))
+                if (pgmPoolIsPageLocked(&pVM->pgm.s, pPoolPagePd))
                 {
                     /* Mark the page as unlocked; allow flushing again. */

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

@@ -1254 +1254 @@
     if (    (   pPage->cModifications < 48   /** @todo #define */ /** @todo need to check that it's not mapping EIP. */ /** @todo adjust this! */
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-             || pgmPoolIsPageLocked(pVM, pPage)
+             || pgmPoolIsPageLocked(&pVM->pgm.s, pPage)
 #else
              || pPage->fCR3Mix
@@ -1417 +1417 @@
      */
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    if (pgmPoolIsPageLocked(pPool->CTX_SUFF(pVM), pPage))
+    if (pgmPoolIsPageLocked(&pPool->CTX_SUFF(pVM)->pgm.s, pPage))
 #else
     if (PGMGetHyperCR3(pPool->CTX_SUFF(pVM)) == pPage->Core.Key)
@@ -3096 +3096 @@
     /* Safety precaution in case we change the paging for other modes too in the future. */
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    Assert(!pgmPoolIsPageLocked(pPool->CTX_SUFF(pVM), pPage));
+    Assert(!pgmPoolIsPageLocked(&pPool->CTX_SUFF(pVM)->pgm.s, pPage));
 #else
     Assert(PGMGetHyperCR3(pPool->CTX_SUFF(pVM)) != pPage->Core.Key);
@@ -4299 +4299 @@
      */
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    if (pgmPoolIsPageLocked(pPool->CTX_SUFF(pVM), pPage))
+    if (pgmPoolIsPageLocked(&pPool->CTX_SUFF(pVM)->pgm.s, pPage))
     {
         AssertMsg(   pPage->enmKind == PGMPOOLKIND_64BIT_PML4