Changeset 16890 in vbox

Timestamp:

Feb 18, 2009 10:57:21 AM (16 years ago)

Author:

vboxsync

Message:

Removed obsolete parameter for PGMMapHasConflicts.

Location:

trunk

Files:

• include/VBox/pgm.h (modified) (1 diff)
• src/VBox/VMM/EM.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/PGMAllMap.cpp (modified) (2 diffs)

trunk/include/VBox/pgm.h

@@ -331 +331 @@
 VMMDECL(int)        PGMMapActivateAll(PVM pVM);
 VMMDECL(int)        PGMMapDeactivateAll(PVM pVM);
-VMMDECL(bool)       PGMMapHasConflicts(PVM pVM, uint64_t cr3, bool fResolveConflicts);
+VMMDECL(bool)       PGMMapHasConflicts(PVM pVM, bool fResolveConflicts);
 
 VMMDECL(int)        PGMShwGetPage(PVM pVM, RTGCPTR GCPtr, uint64_t *pfFlags, PRTHCPHYS pHCPhys);

trunk/src/VBox/VMM/EM.cpp

@@ -2607 +2607 @@
                   ("Tried to execute code with IF at EIP=%08x!\n", pCtx->eip));
         if (    !VM_FF_ISPENDING(pVM, VM_FF_PGM_SYNC_CR3 | VM_FF_PGM_SYNC_CR3_NON_GLOBAL)
-            &&  PGMMapHasConflicts(pVM, pCtx->cr3, false))
+            &&  PGMMapHasConflicts(pVM, false))
         {
             AssertMsgFailed(("We should not get conflicts any longer!!!\n"));
@@ -2720 +2720 @@
          */
         if (    !VM_FF_ISPENDING(pVM, VM_FF_PGM_SYNC_CR3 | VM_FF_PGM_SYNC_CR3_NON_GLOBAL)
-            &&  PGMMapHasConflicts(pVM, pCtx->cr3, false))
+            &&  PGMMapHasConflicts(pVM, false))
         {
             AssertMsgFailed(("We should not get conflicts any longer!!!\n"));

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

@@ -531 +531 @@
  * @returns false if not.
  * @param   pVM                 The virtual machine.
- * @param   cr3                 Guest context CR3 register.
  * @param   fResolveConflicts   Whether to resolve found conflicts or not (only valid in ring 3)
  */
-VMMDECL(bool) PGMMapHasConflicts(PVM pVM, uint64_t cr3, bool fResolveConflicts)
+VMMDECL(bool) PGMMapHasConflicts(PVM pVM, bool fResolveConflicts)
 {
     /*
@@ -555 +554 @@
         PX86PD pPD = pVM->pgm.s.CTX_SUFF(pGst32BitPd);
         Assert(pPD);
-        Assert(pPD == (PX86PD)PGMPhysGCPhys2R3PtrAssert(pVM, cr3 & X86_CR3_PAGE_MASK, sizeof(*pPD)));
 
         for (PPGMMAPPING pCur = pVM->pgm.s.CTX_SUFF(pMappings); pCur; pCur = pCur->CTX_SUFF(pNext))