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

Timestamp:

Apr 17, 2009 12:13:30 PM (16 years ago)

Author:

vboxsync

Message:

Fixed virtual handler update regression.

Location:

trunk/src/VBox/VMM

Files:

• PGMHandler.cpp (modified) (2 diffs)
• PGMInternal.h (modified) (1 diff)
• VMMAll/PGMAllPool.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/PGMHandler.cpp

@@ -393 +393 @@
                 PVMCPU pVCpu = &pVM->aCpus[i];
 
-                pVCpu->pgm.s.fSyncFlags |= PGM_SYNC_UPDATE_PAGE_BIT_VIRTUAL | PGM_SYNC_CLEAR_PGM_POOL;
+                pVCpu->pgm.s.fSyncFlags |= PGM_SYNC_UPDATE_PAGE_BIT_VIRTUAL;
                 VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
             }
+            pVM->pgm.s.fGlobalSyncFlags |= PGM_GLOBAL_SYNC_CLEAR_PGM_POOL;
         }
         pgmUnlock(pVM);
@@ -478 +479 @@
             PVMCPU pVCpu = &pVM->aCpus[i];
 
-            pVCpu->pgm.s.fSyncFlags |= PGM_SYNC_UPDATE_PAGE_BIT_VIRTUAL | PGM_SYNC_CLEAR_PGM_POOL;
+            pVCpu->pgm.s.fSyncFlags |= PGM_SYNC_UPDATE_PAGE_BIT_VIRTUAL;
             VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
         }
+        pVM->pgm.s.fGlobalSyncFlags |= PGM_GLOBAL_SYNC_CLEAR_PGM_POOL;
     }
     else

trunk/src/VBox/VMM/PGMInternal.h

@@ -2870 +2870 @@
 #define PGM_SYNC_MAP_CR3                        RT_BIT(3)
 /** Clear the page pool (a light weight flush). */
-#define PGM_SYNC_CLEAR_PGM_POOL                 RT_BIT(8)
+#define PGM_GLOBAL_SYNC_CLEAR_PGM_POOL          RT_BIT(8)
 /** @} */
 

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

@@ -1722 +1722 @@
          * the heap size should suffice. */
         AssertFatalRC(rc);
-        Assert(!(pVM->pgm.s.fGlobalSyncFlags & PGM_SYNC_CLEAR_PGM_POOL) || VM_FF_ISSET(pVM, VM_FF_PGM_SYNC_CR3));
+        Assert(!(pVM->pgm.s.fGlobalSyncFlags & PGM_GLOBAL_SYNC_CLEAR_PGM_POOL) || VM_FF_ISSET(pVM, VM_FF_PGM_SYNC_CR3));
     }
     pPage->fMonitored = true;
@@ -1819 +1819 @@
         rc = PGMHandlerPhysicalDeregister(pVM, pPage->GCPhys & ~(RTGCPHYS)(PAGE_SIZE - 1));
         AssertFatalRC(rc);
-        AssertMsg(!(pVM->pgm.s.fGlobalSyncFlags & PGM_SYNC_CLEAR_PGM_POOL) || VM_FF_ISSET(pVM, VM_FF_PGM_SYNC_CR3),
+        AssertMsg(!(pVM->pgm.s.fGlobalSyncFlags & PGM_GLOBAL_SYNC_CLEAR_PGM_POOL) || VM_FF_ISSET(pVM, VM_FF_PGM_SYNC_CR3),
                   ("%#x %#x\n", pVM->pgm.s.fGlobalSyncFlags, pVM->fForcedActions));
     }
@@ -2070 +2070 @@
      * sometimes refered to as a 'lightweight flush'.
      */
-    if (!(pVM->pgm.s.fGlobalSyncFlags & PGM_SYNC_CLEAR_PGM_POOL))
+    if (!(pVM->pgm.s.fGlobalSyncFlags & PGM_GLOBAL_SYNC_CLEAR_PGM_POOL))
         pgmPoolMonitorModifiedClearAll(pVM);
     else
@@ -2077 +2077 @@
         /** @todo SMP support! */
         Assert(pVM->cCPUs == 1);
-        pVM->pgm.s.fGlobalSyncFlags &= ~PGM_SYNC_CLEAR_PGM_POOL;
+        pVM->pgm.s.fGlobalSyncFlags &= ~PGM_GLOBAL_SYNC_CLEAR_PGM_POOL;
         pgmPoolClearAll(pVM);
 # else  /* !IN_RING3 */
-        LogFlow(("SyncCR3: PGM_SYNC_CLEAR_PGM_POOL is set -> VINF_PGM_SYNC_CR3\n"));
+        LogFlow(("SyncCR3: PGM_GLOBAL_SYNC_CLEAR_PGM_POOL is set -> VINF_PGM_SYNC_CR3\n"));
         VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3); /** @todo no need to do global sync, right? */
         return VINF_PGM_SYNC_CR3;
@@ -2713 +2713 @@
     if (rc == VINF_PGM_GCPHYS_ALIASED)
     {
-        pVM->pgm.s.fGlobalSyncFlags |= PGM_SYNC_CLEAR_PGM_POOL;
+        pVM->pgm.s.fGlobalSyncFlags |= PGM_GLOBAL_SYNC_CLEAR_PGM_POOL;
         VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
         rc = VINF_PGM_SYNC_CR3;
@@ -4207 +4207 @@
     /** @todo CSAM/PGMPrefetchPage messes up here during CSAMR3CheckGates
      *  (TRPMR3SyncIDT) because of FF priority. Try fix that?
-     *  Assert(!(pVM->pgm.s.fGlobalSyncFlags & PGM_SYNC_CLEAR_PGM_POOL)); */
+     *  Assert(!(pVM->pgm.s.fGlobalSyncFlags & PGM_GLOBAL_SYNC_CLEAR_PGM_POOL)); */
 
 #ifdef PGMPOOL_WITH_CACHE