Changeset 45028 in vbox for trunk/src/VBox

Timestamp:

Mar 13, 2013 8:35:58 PM (12 years ago)

Author:

vboxsync

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

84272

Message:

Assert more in PGMR3Reset and PGMR3MemSetup.

File:

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

trunk/src/VBox/VMM/VMMR3/PGM.cpp

@@ -2505 +2505 @@
 VMMR3_INT_DECL(void) PGMR3Reset(PVM pVM)
 {
-    int rc = VINF_SUCCESS;
-
     LogFlow(("PGMR3Reset:\n"));
     VM_ASSERT_EMT(pVM);
@@ -2527 +2525 @@
     {
         PVMCPU  pVCpu = &pVM->aCpus[i];
-        rc = PGM_GST_PFN(Exit, pVCpu)(pVCpu);
-        AssertRC(rc);
+        int rc = PGM_GST_PFN(Exit, pVCpu)(pVCpu);
+        AssertReleaseRC(rc);
     }
 
@@ -2543 +2541 @@
         PVMCPU  pVCpu = &pVM->aCpus[i];
 
-        rc = PGMR3ChangeMode(pVM, pVCpu, PGMMODE_REAL);
-        AssertRC(rc);
+        int rc = PGMR3ChangeMode(pVM, pVCpu, PGMMODE_REAL);
+        AssertReleaseRC(rc);
 
         STAM_REL_COUNTER_RESET(&pVCpu->pgm.s.cGuestModeChanges);
@@ -2582 +2580 @@
 
     pgmUnlock(pVM);
-    AssertReleaseRC(rc);
 }
 
@@ -2599 +2596 @@
         pgmLock(pVM);
 
-        int rc = pgmR3PhysRamZeroAll(pVM); AssertLogRelRC(rc);
-        rc = pgmR3PhysRomReset(pVM); AssertLogRelRC(rc);
+        int rc = pgmR3PhysRamZeroAll(pVM);
+        AssertReleaseRC(rc);
+
+        rc = pgmR3PhysRomReset(pVM);
+        AssertReleaseRC(rc);
 
         pgmUnlock(pVM);