Changeset 4188 in vbox

Timestamp:

Aug 16, 2007 10:47:14 PM (18 years ago)

Author:

vboxsync

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

23680

Message:

SSMAFTER_DEBUG_IT hack.

File:

• trunk/src/VBox/VMM/PDM.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/PDM.cpp

@@ -539 +539 @@
             break;
         if (u32Sep != i)
-        {
-            AssertMsgFailed(("Out of seqence. u32Sep=%#x i=%#x\n", u32Sep, i));
-            return VERR_SSM_DATA_UNIT_FORMAT_CHANGED;
-        }
+            AssertMsgFailedReturn(("Out of seqence. u32Sep=%#x i=%#x\n", u32Sep, i), VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
 
         /* get the name and instance number. */
@@ -558 +555 @@
         {
             LogRel(("Device '%s'/%d not found in current config\n", szDeviceName, iInstance));
-            AssertFailed();
-            return VERR_SSM_LOAD_CONFIG_MISMATCH;
+            if (SSMR3HandleGetAfter(pSSM) != SSMAFTER_DEBUG_IT)
+                AssertFailedReturn(VERR_SSM_LOAD_CONFIG_MISMATCH);
+            break;
         }
         if (    strcmp(szDeviceName, pDevIns->pDevReg->szDeviceName)
-            ||  pDevIns->iInstance != iInstance
-            )
+            ||  pDevIns->iInstance != iInstance)
         {
             LogRel(("u32Sep=%d loaded '%s'/%d  configured '%s'/%d\n",
                     u32Sep, szDeviceName, iInstance, pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
-            AssertFailed();
-            return VERR_SSM_LOAD_CONFIG_MISMATCH;
+            if (SSMR3HandleGetAfter(pSSM) != SSMAFTER_DEBUG_IT)
+                AssertFailedReturn(VERR_SSM_LOAD_CONFIG_MISMATCH);
         }
     }
@@ -578 +575 @@
     {
         LogRel(("Device '%s'/%d not found in saved state\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
-        AssertFailed();
-        return VERR_SSM_LOAD_CONFIG_MISMATCH;
+        if (SSMR3HandleGetAfter(pSSM) != SSMAFTER_DEBUG_IT)
+            AssertFailedReturn(VERR_SSM_LOAD_CONFIG_MISMATCH);
     }