Changeset 52010 in vbox

Timestamp:

Jul 14, 2014 6:00:30 AM (11 years ago)

Author:

vboxsync

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

94974

Message:

VMM/GIM: Add Hyper-V SSM version to the saved-state.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/GIMHv.cpp (modified) (5 diffs)
• include/GIMHvInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/GIMHv.cpp

@@ -333 +333 @@
     PCGIMHV pcHv = &pVM->gim.s.u.Hv;
 
+    /*
+     * Save the Hyper-V SSM version.
+     */
+    int rc = SSMR3PutU32(pSSM, GIM_HV_SSM_VERSION);         AssertRCReturn(rc, rc);
+
     /** @todo Save per-VCPU data. */
 
@@ -338 +343 @@
      * Save per-VM MSRs.
      */
-    int rc = SSMR3PutU64(pSSM, pcHv->u64GuestOsIdMsr);      AssertRCReturn(rc, rc);
+    rc = SSMR3PutU64(pSSM, pcHv->u64GuestOsIdMsr);          AssertRCReturn(rc, rc);
     rc = SSMR3PutU64(pSSM, pcHv->u64HypercallMsr);          AssertRCReturn(rc, rc);
     rc = SSMR3PutU64(pSSM, pcHv->u64TscPageMsr);            AssertRCReturn(rc, rc);
@@ -391 +396 @@
  * @param   pVM             Pointer to the VM.
  * @param   pSSM            Pointer to the SSM handle.
- * @param   uSSMVersion     The saved-state version.
+ * @param   uSSMVersion     The GIM saved-state version.
  */
 VMMR3_INT_DECL(int) GIMR3HvLoad(PVM pVM, PSSMHANDLE pSSM, uint32_t uSSMVersion)
@@ -397 +402 @@
     PGIMHV pHv = &pVM->gim.s.u.Hv;
 
+    /*
+     * Load the Hyper-V SSM version first.
+     */
+    uint32_t uHvSSMVersion;
+    int rc = SSMR3GetU32(pSSM, &uHvSSMVersion);             AssertRCReturn(rc, rc);
+
     /** @todo Load per-VCPU data. */
 
@@ -402 +413 @@
      * Load per-VM MSRs.
      */
-    int rc = SSMR3GetU64(pSSM, &pHv->u64GuestOsIdMsr);      AssertRCReturn(rc, rc);
+    rc = SSMR3GetU64(pSSM, &pHv->u64GuestOsIdMsr);          AssertRCReturn(rc, rc);
     rc = SSMR3GetU64(pSSM, &pHv->u64HypercallMsr);          AssertRCReturn(rc, rc);
     rc = SSMR3GetU64(pSSM, &pHv->u64TscPageMsr);            AssertRCReturn(rc, rc);

trunk/src/VBox/VMM/include/GIMHvInternal.h

@@ -25 +25 @@
  * GIM Hyper-V saved-state version.
  */
-#define GIM_HV_SSM_VERSION                 0x1
+#define GIM_HV_SSM_VERSION                 UINT32_C(1)
 
 /** @name Hyper-V base feature identification.