Changeset 20404 in vbox

Timestamp:

Jun 8, 2009 1:31:53 PM (16 years ago)

Author:

vboxsync

Message:

Inform REM outside of the pgm lock.

File:

• trunk/src/VBox/VMM/PGMPhys.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -1841 +1841 @@
         }
         GMMR3FreePagesCleanup(pReq);
+        pgmUnlock(pVM);
     }
     else
     {
+        RTGCPHYS cb = pCur->RamRange.cb;
+
         /* link in the ram range */
         pgmR3PhysLinkRamRange(pVM, &pCur->RamRange, pRamPrev);
-        REMR3NotifyPhysRamRegister(pVM, GCPhys, pCur->RamRange.cb, REM_NOTIFY_PHYS_RAM_FLAGS_MMIO2);
-    }
-    pgmUnlock(pVM);
+        pgmUnlock(pVM);
+
+        REMR3NotifyPhysRamRegister(pVM, GCPhys, cb, REM_NOTIFY_PHYS_RAM_FLAGS_MMIO2);
+    }
 
     return VINF_SUCCESS;
@@ -1863 +1867 @@
 VMMR3DECL(int) PGMR3PhysMMIO2Unmap(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS GCPhys)
 {
+    bool        fInformREM = false;
+    RTGCPHYS    GCPhysRangeREM;
+    RTGCPHYS    cbRangeREM;
+
     /*
      * Validate input
@@ -1911 +1919 @@
     else
     {
-        REMR3NotifyPhysRamDeregister(pVM, pCur->RamRange.GCPhys, pCur->RamRange.cb);
+        GCPhysRangeREM = pCur->RamRange.GCPhys;
+        cbRangeREM     = pCur->RamRange.cb;
+        fInformREM     = true;
+
         pgmR3PhysUnlinkRamRange(pVM, &pCur->RamRange);
     }
@@ -1921 +1932 @@
 
     pgmUnlock(pVM);
+
+    if (fInformREM)
+        REMR3NotifyPhysRamDeregister(pVM, GCPhysRangeREM, cbRangeREM);
 
     return VINF_SUCCESS;