Changeset 1997 in vbox

Timestamp:

Apr 9, 2007 2:01:18 PM (18 years ago)

Author:

vboxsync

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

20284

Message:

Better search for innocent conflicts

File:

• trunk/src/VBox/VMM/PGMHandler.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGMHandler.cpp

@@ -354 +354 @@
     {
         PPGMVIRTHANDLER pCur = (PPGMVIRTHANDLER)RTAvlroGCPtrGetBestFit(&pVM->pgm.s.CTXSUFF(pTrees)->VirtHandlers, pNew->Core.Key, true);
+        if (!pCur || GCPtr > pCur->GCPtrLast || GCPtrLast < pCur->GCPtr)
+            pCur = (PPGMVIRTHANDLER)RTAvlroGCPtrGetBestFit(&pVM->pgm.s.CTXSUFF(pTrees)->VirtHandlers, pNew->Core.Key, false);
         if (pCur && GCPtr <= pCur->GCPtrLast && GCPtrLast >= pCur->GCPtr)
         {