Changeset 18165 in vbox

Timestamp:

Mar 23, 2009 11:07:37 PM (16 years ago)

Author:

vboxsync

Message:

PGM: Give up immediately on load failure.

File:

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

trunk/src/VBox/VMM/PGM.cpp

@@ -2338 +2338 @@
             }
             else
-            {    
+            {
                 SSMR3PutU8(pSSM, uType);
                 rc = pgmR3SavePage(pVM, pSSM, pPage, GCPhysPage, pRam);
@@ -2452 +2452 @@
     AssertLogRelMsgReturn(   PGM_PAGE_GET_TYPE(pPage) == uType
                           || uType == PGMPAGETYPE_INVALID,
-                          ("pPage=%R[pgmpage] GCPhys=%#x %s\n", pPage, GCPhys, pRam->pszDesc), 
+                          ("pPage=%R[pgmpage] GCPhys=%#x %s\n", pPage, GCPhys, pRam->pszDesc),
                           VERR_SSM_UNEXPECTED_DATA);
 
@@ -2490 +2490 @@
         rc = VERR_INTERNAL_ERROR;
     AssertLogRelMsgRCReturn(rc, ("pPage=%R[pgmpage] uState=%d uType=%d GCPhys=%RGp %s rc=%Rrc\n",
-                                 pPage, uState, uType, GCPhys, pRam->pszDesc),
+                                 pPage, uState, uType, GCPhys, pRam->pszDesc, rc),
                             rc);
     return VINF_SUCCESS;
@@ -2580 +2580 @@
         if (RT_FAILURE(rc))
             return rc;
-        AssertLogRelMsgReturn(cbRamSize == pPGM->cbRamSize, ("%#x != %#x\n", cbRamSize, pPGM->cbRamSize), 
+        AssertLogRelMsgReturn(cbRamSize == pPGM->cbRamSize, ("%#x != %#x\n", cbRamSize, pPGM->cbRamSize),
                               VERR_SSM_LOAD_MEMORY_SIZE_MISMATCH);
         SSMR3GetGCPhys(pSSM,    &pPGM->GCPhysA20Mask);
@@ -2776 +2776 @@
                 else
                     rc = pgmR3LoadPage(pVM, pSSM, uType, pPage, GCPhysPage, pRam);
+                AssertLogRelMsgRCReturn(rc, ("rc=%Rrc iPage=%#x GCPhys=%#x %s\n", rc, iPage, pRam->GCPhys, pRam->pszDesc), rc);
             }
         }
@@ -2797 +2798 @@
 
             /* Load the bits */
-            if (    !fHaveBits 
+            if (    !fHaveBits
                 &&  GCPhysLast < UINT32_C(0xe0000000))
             {