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

Timestamp:

Nov 10, 2008 9:24:58 AM (16 years ago)

Author:

vboxsync

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

39037

Message:

Save and load the number of VMCPUs.

File:

• trunk/src/VBox/VMM/CPUM.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/CPUM.cpp

@@ -68 +68 @@
 *******************************************************************************/
 /** The saved state version. */
-#define CPUM_SAVED_STATE_VERSION            8
+#define CPUM_SAVED_STATE_VERSION            9
+/** The saved state version of 2.0, used for backwards compatibility. */
+#define CPUM_SAVED_STATE_VERSION_VER2_0     8
 /** The saved state version of 1.6, used for backwards compatability. */
 #define CPUM_SAVED_STATE_VERSION_VER1_6     6
@@ -774 +776 @@
     SSMR3PutMem(pSSM, &pVM->cpum.s.Hyper, sizeof(pVM->cpum.s.Hyper));
 
+    SSMR3PutU32(pSSM, pVM->cCPUs);
     for (unsigned i=0;i<pVM->cCPUs;i++)
     {
@@ -909 +912 @@
      */
     if (    u32Version != CPUM_SAVED_STATE_VERSION
+        &&  u32Version != CPUM_SAVED_STATE_VERSION_VER2_0
         &&  u32Version != CPUM_SAVED_STATE_VERSION_VER1_6)
     {
@@ -943 +947 @@
     else
     {
+        if (u32Version == CPUM_SAVED_STATE_VERSION)
+        {
+            int rc = SSMR3GetU32(pSSM, &pVM->cCPUs);
+            AssertRCReturn(rc, rc);
+        }
+
+        if (    !pVM->cCPUs
+            ||  pVM->cCPUs > VMCPU_MAX_CPU_COUNT
+            ||  (   u32Version == CPUM_SAVED_STATE_VERSION_VER2_0
+                 && pVM->cCPUs != 1))
+        {
+            AssertMsgFailed(("Unexpected number of VMCPUs (%d)\n", pVM->cCPUs));
+            return VERR_SSM_UNEXPECTED_DATA;
+        }
+        
         for (unsigned i=0;i<pVM->cCPUs;i++)
         {