Changeset 92007 in vbox

Timestamp:

Oct 22, 2021 1:26:01 PM (3 years ago)

Author:

vboxsync

Message:

VMM/PGM: Fixed saved state regression from r147656. bugref:9517

File:

• trunk/src/VBox/VMM/VMMR3/PGMSavedState.cpp (modified) (3 diffs)

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

@@ -2038 +2038 @@
 static DECLCALLBACK(int) pgmR3SaveExec(PVM pVM, PSSMHANDLE pSSM)
 {
-    int     rc   = VINF_SUCCESS;
-    PPGM    pPGM = &pVM->pgm.s;
+    PPGM pPGM = &pVM->pgm.s;
 
     /*
@@ -2050 +2049 @@
      * Save basic data (required / unaffected by relocation).
      */
-    SSMR3PutStruct(pSSM, pPGM, &s_aPGMFields[0]);
-
-    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
+    int rc = SSMR3PutStructEx(pSSM, pPGM, sizeof(*pPGM), 0 /*fFlags*/, &s_aPGMFields[0], NULL /*pvUser*/);
+
+    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus && RT_SUCCESS(rc); idCpu++)
         rc = SSMR3PutStruct(pSSM, &pVM->apCpusR3[idCpu]->pgm.s, &s_aPGMCpuFields[0]);
 
@@ -2972 +2971 @@
     {
         if (uVersion > PGM_SAVED_STATE_VERSION_PRE_BALLOON)
-            rc = SSMR3GetStruct(pSSM, pPGM, &s_aPGMFields[0]);
+            rc = SSMR3GetStructEx(pSSM, pPGM, sizeof(*pPGM), 0 /*fFlags*/, &s_aPGMFields[0], NULL /*pvUser*/);
         else
-            rc = SSMR3GetStruct(pSSM, pPGM, &s_aPGMFieldsPreBalloon[0]);
+            rc = SSMR3GetStructEx(pSSM, pPGM, sizeof(*pPGM), 0 /*fFlags*/, &s_aPGMFieldsPreBalloon[0], NULL /*pvUser*/);
 
         AssertLogRelRCReturn(rc, rc);