Index: /trunk/src/VBox/VMM/VMMR3/GIMHv.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/GIMHv.cpp	(revision 52009)
+++ /trunk/src/VBox/VMM/VMMR3/GIMHv.cpp	(revision 52010)
@@ -333,4 +333,9 @@
     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,5 +343,5 @@
      * 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,5 +396,5 @@
  * @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,4 +402,10 @@
     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,5 +413,5 @@
      * 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);
Index: /trunk/src/VBox/VMM/include/GIMHvInternal.h
===================================================================
--- /trunk/src/VBox/VMM/include/GIMHvInternal.h	(revision 52009)
+++ /trunk/src/VBox/VMM/include/GIMHvInternal.h	(revision 52010)
@@ -25,5 +25,5 @@
  * 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.