Changeset 24463 in vbox

Timestamp:

Nov 6, 2009 4:22:42 PM (15 years ago)

Author:

vboxsync

Message:

CPUM: Enabled the last bit of live migration code.

File:

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

trunk/src/VBox/VMM/CPUM.cpp

@@ -68 +68 @@
 *******************************************************************************/
 /** The current saved state version. */
-#ifdef VBOX_WITH_LIVE_MIGRATION
 #define CPUM_SAVED_STATE_VERSION                11
-#else
-#define CPUM_SAVED_STATE_VERSION                10
-#endif
 /** The saved state version of 3.0 and 3.1 trunk before the teleportation
  * changes. */
@@ -106 +102 @@
 static CPUMCPUVENDOR cpumR3DetectVendor(uint32_t uEAX, uint32_t uEBX, uint32_t uECX, uint32_t uEDX);
 static int cpumR3CpuIdInit(PVM pVM);
-#ifdef VBOX_WITH_LIVE_MIGRATION
 static DECLCALLBACK(int)  cpumR3LiveExec(PVM pVM, PSSMHANDLE pSSM, uint32_t uPass);
-#endif
 static DECLCALLBACK(int)  cpumR3SaveExec(PVM pVM, PSSMHANDLE pSSM);
 static DECLCALLBACK(int)  cpumR3LoadExec(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
@@ -217 +211 @@
      * Register saved state data item.
      */
-#ifdef VBOX_WITH_LIVE_MIGRATION
     int rc = SSMR3RegisterInternal(pVM, "cpum", 1, CPUM_SAVED_STATE_VERSION, sizeof(CPUM),
                                    NULL, cpumR3LiveExec, NULL,
                                    NULL, cpumR3SaveExec, NULL,
                                    NULL, cpumR3LoadExec, NULL);
-#else
-    int rc = SSMR3RegisterInternal(pVM, "cpum", 1, CPUM_SAVED_STATE_VERSION, sizeof(CPUM),
-                                   NULL, NULL, NULL,
-                                   NULL, cpumR3SaveExec, NULL,
-                                   NULL, cpumR3LoadExec, NULL);
-#endif
     if (RT_FAILURE(rc))
         return rc;
@@ -984 +971 @@
 }
 
-#ifdef VBOX_WITH_LIVE_MIGRATION
 
 /**
@@ -1749 +1735 @@
 }
 
-#endif /* VBOX_WITH_LIVE_MIGRATION */
 
 /**
@@ -1781 +1766 @@
     }
 
-#ifdef VBOX_WITH_LIVE_MIGRATION
     cpumR3SaveCpuId(pVM, pSSM);
     return VINF_SUCCESS;
-#else
-
-    SSMR3PutU32(pSSM, RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdStd));
-    SSMR3PutMem(pSSM, &pVM->cpum.s.aGuestCpuIdStd[0], sizeof(pVM->cpum.s.aGuestCpuIdStd));
-
-    SSMR3PutU32(pSSM, RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdExt));
-    SSMR3PutMem(pSSM, &pVM->cpum.s.aGuestCpuIdExt[0], sizeof(pVM->cpum.s.aGuestCpuIdExt));
-
-    SSMR3PutU32(pSSM, RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdCentaur));
-    SSMR3PutMem(pSSM, &pVM->cpum.s.aGuestCpuIdCentaur[0], sizeof(pVM->cpum.s.aGuestCpuIdCentaur));
-
-    SSMR3PutMem(pSSM, &pVM->cpum.s.GuestCpuIdDef, sizeof(pVM->cpum.s.GuestCpuIdDef));
-
-    /* Add the cpuid for checking that the cpu is unchanged. */
-    uint32_t au32CpuId[8] = {0};
-    ASMCpuId(0, &au32CpuId[0], &au32CpuId[1], &au32CpuId[2], &au32CpuId[3]);
-    ASMCpuId(1, &au32CpuId[4], &au32CpuId[5], &au32CpuId[6], &au32CpuId[7]);
-    return SSMR3PutMem(pSSM, &au32CpuId[0], sizeof(au32CpuId));
-#endif
 }
 
@@ -1987 +1952 @@
     }
 
-#ifdef VBOX_WITH_LIVE_MIGRATION
     /*
      * Guest CPUIDs.
@@ -1996 +1960 @@
     /** @todo Merge the code below into cpumR3LoadCpuId when we've found out what is
      *        actually required. */
-#endif
 
     /*