Changeset 100755 in vbox for trunk/src/VBox/VMM

Timestamp:

Jul 31, 2023 2:13:47 PM (18 months ago)

Author:

vboxsync

Message:

VMM/ARM: Some preliminary saved state handling and logging for the vCPU state, bugref:10387 [fixes]

File:

• trunk/src/VBox/VMM/VMMR3/CPUM-armv8.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/CPUM-armv8.cpp

@@ -546 +546 @@
     if (uPass == SSM_PASS_FINAL)
     {
+        uint32_t cCpus;
+        int rc = SSMR3GetU32(pSSM, &cCpus); AssertRCReturn(rc, rc);
+        AssertLogRelMsgReturn(cCpus == pVM->cCpus, ("Mismatching CPU counts: saved: %u; configured: %u \n", cCpus, pVM->cCpus),
+                              VERR_SSM_UNEXPECTED_DATA);
+
         /*
          * Do the per-CPU restoring.
@@ -555 +560 @@
 
             /*
-             * Start by restoring the CPUMCTX structure and the X86FXSAVE bits of the extended state.
+             * Restore the CPUMCTX structure.
              */
-            int rc = SSMR3GetStructEx(pSSM, pGstCtx,                  sizeof(*pGstCtx),                0, g_aCpumCtxFields, NULL);
+            rc = SSMR3GetStructEx(pSSM, pGstCtx, sizeof(*pGstCtx), 0, g_aCpumCtxFields, NULL);
             AssertRCReturn(rc, rc);