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

Timestamp:

Oct 20, 2015 11:25:21 AM (9 years ago)

Author:

vboxsync

Message:

VMM/GIM: Saved state bump for MSR based debugging support.

File:

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

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

@@ -45 +45 @@
  * GIM Hyper-V saved-state version.
  */
-#define GIM_HV_SAVED_STATE_VERSION          UINT32_C(1)
+#define GIM_HV_SAVED_STATE_VERSION                UINT32_C(2)
+/** Vanilla saved states, prior to any debug support. */
+#define GIM_HV_SAVED_STATE_VERSION_PRE_DEBUG      UINT32_C(1)
 
 #ifdef VBOX_WITH_STATISTICS
@@ -426 +428 @@
      */
     if (pHv->uMiscFeat & GIM_HV_MISC_FEAT_GUEST_CRASH_MSRS)
-        pHv->uCrashCtl = MSR_GIM_HV_CRASH_CTL_NOTIFY_BIT;
+        pHv->uCrashCtlMsr = MSR_GIM_HV_CRASH_CTL_NOTIFY_BIT;
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
         pVM->aCpus[i].gim.s.u.HvCpu.uSint2Msr = MSR_GIM_HV_SINT_MASKED_BIT;
@@ -560 +562 @@
     pHv->u64HypercallMsr        = 0;
     pHv->u64TscPageMsr          = 0;
-    pHv->uCrashP0               = 0;
-    pHv->uCrashP1               = 0;
-    pHv->uCrashP2               = 0;
-    pHv->uCrashP3               = 0;
-    pHv->uCrashP4               = 0;
+    pHv->uCrashP0Msr            = 0;
+    pHv->uCrashP1Msr            = 0;
+    pHv->uCrashP2Msr            = 0;
+    pHv->uCrashP3Msr            = 0;
+    pHv->uCrashP4Msr            = 0;
     pHv->uDebugStatusMsr        = 0;
     pHv->uDebugPendingBufferMsr = 0;
@@ -656 +658 @@
         uTscSequence = pcRefTsc->u32TscSequence;
     }
-
-    return SSMR3PutU32(pSSM, uTscSequence);
+    SSMR3PutU32(pSSM, uTscSequence);
+
+    /*
+     * Save debug support data.
+     */
+    SSMR3PutU64(pSSM, pcHv->uDebugPendingBufferMsr);
+    SSMR3PutU64(pSSM, pcHv->uDebugSendBufferMsr);
+    SSMR3PutU64(pSSM, pcHv->uDebugRecvBufferMsr);
+    SSMR3PutU64(pSSM, pcHv->uDebugStatusMsr);
+    SSMR3PutU32(pSSM, pcHv->enmDebugReply);
+    SSMR3PutU32(pSSM, pcHv->uBootpXId);
+    SSMR3PutU32(pSSM, pcHv->DbgGuestIp4Addr.u);
+
+    for (VMCPUID i = 0; i < pVM->cCpus; i++)
+    {
+        PGIMHVCPU pHvCpu = &pVM->aCpus[i].gim.s.u.HvCpu;
+        SSMR3PutU64(pSSM, pHvCpu->uSimpMsr);
+        SSMR3PutU64(pSSM, pHvCpu->uSint2Msr);
+    }
+
+    return SSMR3PutU8(pSSM, UINT8_MAX);;
 }
 
@@ -677 +698 @@
     int rc = SSMR3GetU32(pSSM, &uHvSavedStatVersion);
     AssertRCReturn(rc, rc);
-    if (uHvSavedStatVersion != GIM_HV_SAVED_STATE_VERSION)
+    if (   uHvSavedStatVersion != GIM_HV_SAVED_STATE_VERSION
+        && uHvSavedStatVersion != GIM_HV_SAVED_STATE_VERSION_PRE_DEBUG)
         return SSMR3SetLoadError(pSSM, VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION, RT_SRC_POS,
-                                 N_("Unsupported Hyper-V saved-state version %u (expected %u)."), uHvSavedStatVersion,
+                                 N_("Unsupported Hyper-V saved-state version %u (current %u)!"), uHvSavedStatVersion,
                                  GIM_HV_SAVED_STATE_VERSION);
 
@@ -765 +787 @@
     }
 
-    return rc;
+    /*
+     * Load the debug support data.
+     */
+    if (uHvSavedStatVersion > GIM_HV_SAVED_STATE_VERSION_PRE_DEBUG)
+    {
+        SSMR3GetU64(pSSM, &pHv->uDebugPendingBufferMsr);
+        SSMR3GetU64(pSSM, &pHv->uDebugSendBufferMsr);
+        SSMR3GetU64(pSSM, &pHv->uDebugRecvBufferMsr);
+        SSMR3GetU64(pSSM, &pHv->uDebugStatusMsr);
+        SSMR3GetU32(pSSM, (uint32_t *)&pHv->enmDebugReply);
+        SSMR3GetU32(pSSM, &pHv->uBootpXId);
+        rc = SSMR3GetU32(pSSM, &pHv->DbgGuestIp4Addr.u);
+        AssertRCReturn(rc, rc);
+
+        for (VMCPUID i = 0; i < pVM->cCpus; i++)
+        {
+            PGIMHVCPU pHvCpu = &pVM->aCpus[i].gim.s.u.HvCpu;
+            SSMR3GetU64(pSSM, &pHvCpu->uSimpMsr);
+            SSMR3GetU64(pSSM, &pHvCpu->uSint2Msr);
+        }
+    }
+
+    uint8_t bDelim;
+    return SSMR3GetU8(pSSM, &bDelim);
 }
 
@@ -1169 +1214 @@
                         pIpHdr->ip_sum     = 0;
                         pIpHdr->ip_src.u   = 0;
-                        pIpHdr->ip_dst.u   = pHv->DbgGuestAddr.u;
+                        pIpHdr->ip_dst.u   = pHv->DbgGuestIp4Addr.u;
                         pIpHdr->ip_sum     = RTNetIPv4HdrChecksum(pIpHdr);
                         /* UDP */
@@ -1379 +1424 @@
                                 pbData  += cbFrameHdr;
                                 cbWrite -= cbFrameHdr;
-                                pHv->DbgGuestAddr = pIp4Hdr->ip_src;
-                                pHv->enmDebugReply = GIMHVDEBUGREPLY_UDP;
+                                pHv->DbgGuestIp4Addr = pIp4Hdr->ip_src;
+                                pHv->enmDebugReply   = GIMHVDEBUGREPLY_UDP;
                             }
                             else