Changeset 463 in vbox for trunk/src/VBox

Timestamp:

Jan 31, 2007 12:28:42 PM (18 years ago)

Author:

vboxsync

Message:

log causes for SSM load config mismatch to release log

Location:

trunk/src/VBox

Files:

• Devices/Bus/DevPCI.cpp (modified) (3 diffs)
• VMM/PDM.cpp (modified) (3 diffs)
• VMM/PGM.cpp (modified) (2 diffs)
• VMM/VMM.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Bus/DevPCI.cpp

@@ -1061 +1061 @@
             if (pData->devices[i])
             {
-                AssertMsgFailed(("New device in slot %#x, %s\n", i, pData->devices[i]->name));
+                LogRel(("New device in slot %#x, %s\n", i, pData->devices[i]->name));
+                AssertFailed();
                 return VERR_SSM_LOAD_CONFIG_MISMATCH;
             }
@@ -1070 +1071 @@
         if (!pDev)
         {
-            AssertMsgFailed(("Device in slot %#x have been removed!\n", i, pDev->name));
+            LogRel(("Device in slot %#x has been removed!\n", i, pDev->name));
+            AssertFailed();
             return VERR_SSM_LOAD_CONFIG_MISMATCH;
         }
@@ -1084 +1086 @@
             ||  DevTmp.config[1] != pDev->config[1])
         {
-            AssertMsgFailed(("Device in slot %#x (%s) vendor id mismatch! saved=%.4Vhxs current=%.4Vhxs\n",
-                             i, pDev->name, DevTmp.config, pDev->config));
+            LogRel(("Device in slot %#x (%s) vendor id mismatch! saved=%.4Vhxs current=%.4Vhxs\n",
+                    i, pDev->name, DevTmp.config, pDev->config));
+            AssertFailed();
             return VERR_SSM_LOAD_CONFIG_MISMATCH;
         }

trunk/src/VBox/VMM/PDM.cpp

@@ -540 +540 @@
         if (!pDevIns)
         {
-            AssertMsgFailed(("Device '%s'/%d not found in current config\n", szDeviceName, iInstance));
+            LogRel(("Device '%s'/%d not found in current config\n", szDeviceName, iInstance));
+            AssertFailed();
             return VERR_SSM_LOAD_CONFIG_MISMATCH;
         }
@@ -547 +548 @@
             )
         {
-            AssertMsgFailed(("u32Sep=%d loaded '%s'/%d  configured '%s'/%d\n",
-                             u32Sep, szDeviceName, iInstance, pDevIns->pDevReg->szDeviceName, pDevIns->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;
         }
@@ -558 +560 @@
     if (pDevIns)
     {
-        AssertMsgFailed(("Device '%s'/%d not found in saved state\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
+        LogRel(("Device '%s'/%d not found in saved state\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
+        AssertFailed();
         return VERR_SSM_LOAD_CONFIG_MISMATCH;
     }

trunk/src/VBox/VMM/PGM.cpp

@@ -1521 +1521 @@
         if (!pMapping)
         {
-            AssertMsgFailed(("Couldn't find mapping: cPTs=%#x szDesc=%s (GCPtr=%VGv)\n",
-                             cPTs, szDesc, GCPtr));
+            LogRel(("Couldn't find mapping: cPTs=%#x szDesc=%s (GCPtr=%VGv)\n",
+                    cPTs, szDesc, GCPtr));
+            AssertFailed();
             return VERR_SSM_LOAD_CONFIG_MISMATCH;
         }
@@ -1578 +1579 @@
             ||  fHaveBits != !!pRam->pvHC)
         {
-            AssertMsgFailed(("Ram range: %VGp-%VGp %VGp bytes %s\n"
-                             "State    : %VGp-%VGp %VGp bytes %s\n",
-                             pRam->GCPhys, pRam->GCPhysLast, pRam->cb, pRam->pvHC ? "bits" : "nobits",
-                             GCPhys, GCPhysLast, cb, fHaveBits ? "bits" : "nobits"));
+            LogRel(("Ram range: %VGp-%VGp %VGp bytes %s\n"
+                    "State    : %VGp-%VGp %VGp bytes %s\n",
+                    pRam->GCPhys, pRam->GCPhysLast, pRam->cb, pRam->pvHC ? "bits" : "nobits",
+                    GCPhys, GCPhysLast, cb, fHaveBits ? "bits" : "nobits"));
+            AssertFailed();
             return VERR_SSM_LOAD_CONFIG_MISMATCH;
         }

trunk/src/VBox/VMM/VMM.cpp

@@ -1583 +1583 @@
     }
 
-    AssertMsgFailed(("The stack is not in the same place and it's not empty! GCPtrStackBottom=%VGv pbGCStackBottom=%VGv ESP=%VGv\n",
-                     GCPtrStackBottom, pVM->vmm.s.pbGCStackBottom, GCPtrESP));
+    LogRel(("The stack is not in the same place and it's not empty! GCPtrStackBottom=%VGv pbGCStackBottom=%VGv ESP=%VGv\n",
+            GCPtrStackBottom, pVM->vmm.s.pbGCStackBottom, GCPtrESP));
+    AssertFailed();
     return VERR_SSM_LOAD_CONFIG_MISMATCH;
 }