Changeset 27813 in vbox for trunk/src/VBox/VMM

Timestamp:

Mar 30, 2010 8:40:29 AM (15 years ago)

Author:

vboxsync

Message:

Backed out r59424

File:

• trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (5 diffs)

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

@@ -1815 +1815 @@
     int rc;
 
-    pgmLock(pVM);
-
 # ifdef PGMPOOL_WITH_OPTIMIZED_DIRTY_PT
     PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
@@ -1829 +1827 @@
     rc = pgmPoolSyncCR3(pVCpu);
     if (rc != VINF_SUCCESS)
-    {
-        pgmUnlock(pVM);
         return rc;
-    }
 
     /*
@@ -1847 +1842 @@
         VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_PGM_SYNC_CR3);
         VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL);
-        pgmUnlock(pVM);
         return VINF_SUCCESS;
     }
@@ -1897 +1891 @@
             if (rc == VINF_PGM_SYNC_CR3)
                 pVCpu->pgm.s.GCPhysCR3 = GCPhysCR3Old;
-            pgmUnlock(pVM);
             return VINF_PGM_SYNC_CR3;
 #endif
         }
-        if (rc != VINF_SUCCESS)
-        {
-            pgmUnlock(pVM);
-            AssertFailed();
-            return RT_FAILURE(rc) ? rc : VERR_INTERNAL_ERROR;
-        }
+        AssertRCReturn(rc, rc);
+        AssertRCSuccessReturn(rc, VERR_INTERNAL_ERROR);
     }
 
@@ -1939 +1928 @@
     if (rc == VINF_SUCCESS)
         PGM_INVL_VCPU_TLBS(pVCpu);
-
-    pgmUnlock(pVM);
     return rc;
 }