Changeset 31383 in vbox for trunk

Timestamp:

Aug 5, 2010 8:22:44 AM (14 years ago)

Author:

vboxsync

Message:

Fixed incorrect global module unregistration in the win64 case.

File:

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

trunk/src/VBox/VMM/VMMR0/GMMR0.cpp

@@ -3765 +3765 @@
                                 RTMemFree(pRec->aRegions[i].paHCPhysPageID);
 
+                        Assert(pRec->Core.Key == GCBaseAddr || pRec->enmGuestOS == VBOXOSFAMILY_Windows64);                        
+                        Assert(pRec->cRegions == pRecVM->cRegions);
+#ifdef VBOX_STRICT
+                        for (unsigned i = 0; i < pRecVM->cRegions; i++)
+                        {
+                            Assert(pRecVM->aRegions[i].GCRegionAddr == pRec->aRegions[i].GCRegionAddr);
+                            Assert(pRecVM->aRegions[i].cbRegion == pRec->aRegions[i].cbRegion);
+                        }
+#endif
+
                         /* Remove from the tree and free memory. */
-                        RTAvlGCPtrRemove(&pGMM->pGlobalSharedModuleTree, GCBaseAddr);
+                        RTAvlGCPtrRemove(&pGMM->pGlobalSharedModuleTree, pRec->Core.Key);
                         RTMemFree(pRec);
                     }