Changeset 72193 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

May 11, 2018 1:43:05 PM (7 years ago)

Author:

vboxsync

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

122628

Message:

VMM/GIM/HyperV: Include the debug UDP source and destination ports in the saved-state as the state may be obtained during
a debug read/write sequence. Bumps Hyper-V saved-state version.

File:

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

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

@@ -50 +50 @@
  * GIM Hyper-V saved-state version.
  */
-#define GIM_HV_SAVED_STATE_VERSION                UINT32_C(3)
+#define GIM_HV_SAVED_STATE_VERSION                      UINT32_C(4)
+/** Saved states, priot to saving debug UDP source/destination ports.  */
+#define GIM_HV_SAVED_STATE_VERSION_PRE_DEBUG_UDP_PORTS  UINT32_C(3)
 /** Saved states, prior to any synthetic interrupt controller support. */
-#define GIM_HV_SAVED_STATE_VERSION_PRE_SYNIC      UINT32_C(2)
+#define GIM_HV_SAVED_STATE_VERSION_PRE_SYNIC            UINT32_C(2)
 /** Vanilla saved states, prior to any debug support. */
-#define GIM_HV_SAVED_STATE_VERSION_PRE_DEBUG      UINT32_C(1)
+#define GIM_HV_SAVED_STATE_VERSION_PRE_DEBUG            UINT32_C(1)
 
 #ifdef VBOX_WITH_STATISTICS
@@ -863 +865 @@
     SSMR3PutU32(pSSM, pHv->uDbgBootpXId);
     SSMR3PutU32(pSSM, pHv->DbgGuestIp4Addr.u);
+    SSMR3PutU16(pSSM, pHv->uUdpGuestDstPort);
+    SSMR3PutU16(pSSM, pHv->uUdpGuestSrcPort);
 
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
@@ -892 +896 @@
     AssertRCReturn(rc, rc);
     if (   uHvSavedStateVersion != GIM_HV_SAVED_STATE_VERSION
+        && uHvSavedStateVersion != GIM_HV_SAVED_STATE_VERSION_PRE_DEBUG_UDP_PORTS
         && uHvSavedStateVersion != GIM_HV_SAVED_STATE_VERSION_PRE_SYNIC
         && uHvSavedStateVersion != GIM_HV_SAVED_STATE_VERSION_PRE_DEBUG)
@@ -994 +999 @@
         rc = SSMR3GetU32(pSSM, &pHv->DbgGuestIp4Addr.u);
         AssertRCReturn(rc, rc);
+        if (uHvSavedStateVersion > GIM_HV_SAVED_STATE_VERSION_PRE_DEBUG_UDP_PORTS)
+        {
+            rc = SSMR3GetU16(pSSM, &pHv->uUdpGuestDstPort);     AssertRCReturn(rc, rc);
+            rc = SSMR3GetU16(pSSM, &pHv->uUdpGuestSrcPort);     AssertRCReturn(rc, rc);
+        }
 
         for (VMCPUID i = 0; i < pVM->cCpus; i++)