Changeset 4189 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 16, 2007 10:48:19 PM (17 years ago)

Author:

vboxsync

Message:

ignore cpuid mismatch if SSMAFTER_DEBUG_IT.

File:

• trunk/src/VBox/VMM/CPUM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/CPUM.cpp

@@ -608 +608 @@
         if (memcmp(au32CpuIdSaved, au32CpuId, sizeof(au32CpuIdSaved)))
         {
-            Log(("cpumR3Load: CpuId mismatch!\n"
-                 "Saved=%.*Vhxs\n"
-                 "Real =%.*Vhxs\n",
-                 sizeof(au32CpuIdSaved), au32CpuIdSaved,
-                 sizeof(au32CpuId), au32CpuId));
-            rc = VERR_SSM_LOAD_CPUID_MISMATCH;
+            if (SSMR3HandleGetAfter(pSSM) == SSMAFTER_DEBUG_IT)
+                LogRel(("cpumR3Load: CpuId mismatch! (ignored due to SSMAFTER_DEBUG_IT)\n"
+                        "Saved=%.*Vhxs\n"
+                        "Real =%.*Vhxs\n",
+                        sizeof(au32CpuIdSaved), au32CpuIdSaved,
+                        sizeof(au32CpuId), au32CpuId));
+            else
+            {
+                LogRel(("cpumR3Load: CpuId mismatch!\n"
+                        "Saved=%.*Vhxs\n"
+                        "Real =%.*Vhxs\n",
+                        sizeof(au32CpuIdSaved), au32CpuIdSaved,
+                        sizeof(au32CpuId), au32CpuId));
+                rc = VERR_SSM_LOAD_CPUID_MISMATCH;
+            }
         }
     }