Changeset 4193 in vbox for trunk/src/VBox

Timestamp:

Aug 16, 2007 10:53:34 PM (18 years ago)

Author:

vboxsync

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

23685

Message:

SSMAFTER_DEBUG_IT hacks.

File:

• trunk/src/VBox/Devices/Bus/DevPCI.cpp (modified) (4 diffs)

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

@@ -1054 +1054 @@
         return rc;
     if (u32 != (uint32_t)~0)
-    {
-        AssertMsgFailed(("u32=%#x\n", u32));
-        return rc;
-    }
+        AssertMsgFailedReturn(("u32=%#x\n", u32), rc);
 
     /*
@@ -1085 +1082 @@
             if (pData->devices[i])
             {
-                LogRel(("New device in slot %#x, %s\n", i, pData->devices[i]->name));
-                AssertFailed();
-                return VERR_SSM_LOAD_CONFIG_MISMATCH;
+                LogRel(("New device in slot %#x, %s (vendor=%#06x device=%#06x)\n", i, pData->devices[i]->name, 
+                        PCIDevGetVendorId(pData->devices[i]), PCIDevGetDeviceId(pData->devices[i])));
+                if (SSMR3HandleGetAfter(pSSMHandle) != SSMAFTER_DEBUG_IT)
+                    AssertFailedReturn(VERR_SSM_LOAD_CONFIG_MISMATCH);
             }
         }
+
+        /* get the data */
+        SSMR3GetMem(pSSMHandle, DevTmp.config, sizeof(DevTmp.config));
+        rc = SSMR3GetS32(pSSMHandle, &DevTmp.Int.s.iIrq);
+        if (VBOX_FAILURE(rc))
+            return rc;
 
         /* check that it's still around. */
@@ -1095 +1099 @@
         if (!pDev)
         {
-            LogRel(("Device in slot %#x has been removed!\n", i, pDev->name));
-            AssertFailed();
-            return VERR_SSM_LOAD_CONFIG_MISMATCH;
-        }
-
-        /* restore it */
-        SSMR3GetMem(pSSMHandle, DevTmp.config, sizeof(DevTmp.config));
-        rc = SSMR3GetS32(pSSMHandle, &DevTmp.Int.s.iIrq);
-        if (VBOX_FAILURE(rc))
-            return rc;
+            LogRel(("Device in slot %#x has been removed! vendor=%#06x device=%#06x\n", i, 
+                    PCIDevGetVendorId(&DevTmp), PCIDevGetDeviceId(&DevTmp)));
+            if (SSMR3HandleGetAfter(pSSMHandle) != SSMAFTER_DEBUG_IT)
+                AssertFailedReturn(VERR_SSM_LOAD_CONFIG_MISMATCH);
+            continue;
+        }
 
         /* match the vendor id assuming that this will never be changed. */
@@ -1112 +1112 @@
             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;
+            AssertFailedReturn(VERR_SSM_LOAD_CONFIG_MISMATCH);
         }
 
         /* commit the loaded device config. */
         memcpy(pDev->config, DevTmp.config, sizeof(pDev->config));
-        if (DevTmp.Int.s.iIrq >= PCI_DEVICES_MAX) {
-            AssertMsgFailed (("Device %s: Too many devices %d (max=%d)\n",
-                              pDev->name, DevTmp.Int.s.iIrq, PCI_DEVICES_MAX));
-            return VERR_TOO_MUCH_DATA;
+        if (DevTmp.Int.s.iIrq >= PCI_DEVICES_MAX) 
+        {
+            LogRel(("Device %s: Too many devices %d (max=%d)\n", pDev->name, DevTmp.Int.s.iIrq, PCI_DEVICES_MAX));
+            AssertFailedReturn(VERR_TOO_MUCH_DATA);
         }