Changeset 8624 in vbox for trunk

Timestamp:

May 6, 2008 1:24:09 PM (17 years ago)

Author:

vboxsync

Message:

Fixed bug in PGMR3CheckIntegrity that would surface during reset in debug and strict builds.

File:

• trunk/src/VBox/VMM/PGM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PGM.cpp

@@ -3748 +3748 @@
     PPGMPHYSHANDLER         pPrevPhys;
     PPGMVIRTHANDLER         pPrevVirt;
-    PPGMPHYS2VIRTHANDLER   pPrevPhys2Virt;
+    PPGMPHYS2VIRTHANDLER    pPrevPhys2Virt;
     PVM                     pVM;
 } PGMCHECKINTARGS, *PPGMCHECKINTARGS;
@@ -3886 +3886 @@
      */
     int cErrors = 0;
-    PGMCHECKINTARGS Args = { true, NULL, NULL, NULL, pVM };
+    const static PGMCHECKINTARGS s_LeftToRight = { true, NULL, NULL, NULL, pVM };
+    const static PGMCHECKINTARGS s_RightToLeft = { false, NULL, NULL, NULL, pVM };
+    PGMCHECKINTARGS Args = s_LeftToRight;
     cErrors += RTAvlroGCPhysDoWithAll(&pVM->pgm.s.pTreesHC->PhysHandlers,       true,  pgmR3CheckIntegrityPhysHandlerNode, &Args);
-    Args.fLeftToRight = false;
+    Args = s_RightToLeft;
     cErrors += RTAvlroGCPhysDoWithAll(&pVM->pgm.s.pTreesHC->PhysHandlers,       false, pgmR3CheckIntegrityPhysHandlerNode, &Args);
-    Args.fLeftToRight = true;
+    Args = s_LeftToRight;
     cErrors += RTAvlroGCPtrDoWithAll( &pVM->pgm.s.pTreesHC->VirtHandlers,       true,  pgmR3CheckIntegrityVirtHandlerNode, &Args);
-    Args.fLeftToRight = false;
+    Args = s_RightToLeft;
     cErrors += RTAvlroGCPtrDoWithAll( &pVM->pgm.s.pTreesHC->VirtHandlers,       false, pgmR3CheckIntegrityVirtHandlerNode, &Args);
-    Args.fLeftToRight = true;
+    Args = s_LeftToRight;
     cErrors += RTAvlroGCPtrDoWithAll( &pVM->pgm.s.pTreesHC->HyperVirtHandlers,  true,  pgmR3CheckIntegrityVirtHandlerNode, &Args);
-    Args.fLeftToRight = false;
+    Args = s_RightToLeft;
     cErrors += RTAvlroGCPtrDoWithAll( &pVM->pgm.s.pTreesHC->HyperVirtHandlers,  false, pgmR3CheckIntegrityVirtHandlerNode, &Args);
-    Args.fLeftToRight = true;
+    Args = s_LeftToRight;
     cErrors += RTAvlroGCPhysDoWithAll(&pVM->pgm.s.pTreesHC->PhysToVirtHandlers, true,  pgmR3CheckIntegrityPhysToVirtHandlerNode, &Args);
-    Args.fLeftToRight = false;
+    Args = s_RightToLeft;
     cErrors += RTAvlroGCPhysDoWithAll(&pVM->pgm.s.pTreesHC->PhysToVirtHandlers, false, pgmR3CheckIntegrityPhysToVirtHandlerNode, &Args);