Changeset 81766 in vbox for trunk/src/VBox/VMM/VMMR3/HM.cpp

Timestamp:

Nov 11, 2019 4:10:19 PM (5 years ago)

Author:

vboxsync

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

134557

Message:

VMM: Added SSM_GET_ENUM32_RET and made the VMM code use it and the volatile getters. bugref:9218

File:

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

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

@@ -3081 +3081 @@
             {
                 PSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-                rc  = SSMR3GetBool(pSSM, &pVmcbNstGstCache->fCacheValid);
-                rc |= SSMR3GetU16(pSSM,  &pVmcbNstGstCache->u16InterceptRdCRx);
-                rc |= SSMR3GetU16(pSSM,  &pVmcbNstGstCache->u16InterceptWrCRx);
-                rc |= SSMR3GetU16(pSSM,  &pVmcbNstGstCache->u16InterceptRdDRx);
-                rc |= SSMR3GetU16(pSSM,  &pVmcbNstGstCache->u16InterceptWrDRx);
-                rc |= SSMR3GetU16(pSSM,  &pVmcbNstGstCache->u16PauseFilterThreshold);
-                rc |= SSMR3GetU16(pSSM,  &pVmcbNstGstCache->u16PauseFilterCount);
-                rc |= SSMR3GetU32(pSSM,  &pVmcbNstGstCache->u32InterceptXcpt);
-                rc |= SSMR3GetU64(pSSM,  &pVmcbNstGstCache->u64InterceptCtrl);
-                rc |= SSMR3GetU64(pSSM,  &pVmcbNstGstCache->u64TSCOffset);
-                rc |= SSMR3GetBool(pSSM, &pVmcbNstGstCache->fVIntrMasking);
-                rc |= SSMR3GetBool(pSSM, &pVmcbNstGstCache->fNestedPaging);
-                rc |= SSMR3GetBool(pSSM, &pVmcbNstGstCache->fLbrVirt);
+                SSMR3GetBool(pSSM, &pVmcbNstGstCache->fCacheValid);
+                SSMR3GetU16(pSSM,  &pVmcbNstGstCache->u16InterceptRdCRx);
+                SSMR3GetU16(pSSM,  &pVmcbNstGstCache->u16InterceptWrCRx);
+                SSMR3GetU16(pSSM,  &pVmcbNstGstCache->u16InterceptRdDRx);
+                SSMR3GetU16(pSSM,  &pVmcbNstGstCache->u16InterceptWrDRx);
+                SSMR3GetU16(pSSM,  &pVmcbNstGstCache->u16PauseFilterThreshold);
+                SSMR3GetU16(pSSM,  &pVmcbNstGstCache->u16PauseFilterCount);
+                SSMR3GetU32(pSSM,  &pVmcbNstGstCache->u32InterceptXcpt);
+                SSMR3GetU64(pSSM,  &pVmcbNstGstCache->u64InterceptCtrl);
+                SSMR3GetU64(pSSM,  &pVmcbNstGstCache->u64TSCOffset);
+                SSMR3GetBool(pSSM, &pVmcbNstGstCache->fVIntrMasking);
+                SSMR3GetBool(pSSM, &pVmcbNstGstCache->fNestedPaging);
+                rc = SSMR3GetBool(pSSM, &pVmcbNstGstCache->fLbrVirt);
                 AssertRCReturn(rc, rc);
             }
@@ -3100 +3100 @@
         {
             /* Pending HM event (obsolete for a long time since TPRM holds the info.) */
-            rc  = SSMR3GetU32(pSSM, &pVCpu->hm.s.Event.fPending);
-            rc |= SSMR3GetU32(pSSM, &pVCpu->hm.s.Event.u32ErrCode);
-            rc |= SSMR3GetU64(pSSM, &pVCpu->hm.s.Event.u64IntInfo);
+            SSMR3GetU32(pSSM, &pVCpu->hm.s.Event.fPending);
+            SSMR3GetU32(pSSM, &pVCpu->hm.s.Event.u32ErrCode);
+            SSMR3GetU64(pSSM, &pVCpu->hm.s.Event.u64IntInfo);
 
             /* VMX fWasInRealMode related data. */
             uint32_t uDummy;
-            rc |= SSMR3GetU32(pSSM, &uDummy);   AssertRCReturn(rc, rc);
-            rc |= SSMR3GetU32(pSSM, &uDummy);   AssertRCReturn(rc, rc);
-            rc |= SSMR3GetU32(pSSM, &uDummy);   AssertRCReturn(rc, rc);
+            SSMR3GetU32(pSSM, &uDummy);
+            SSMR3GetU32(pSSM, &uDummy);
+            rc = SSMR3GetU32(pSSM, &uDummy);
             AssertRCReturn(rc, rc);
         }
@@ -3118 +3118 @@
     if (uVersion >= HM_SAVED_STATE_VERSION_TPR_PATCHING)
     {
-        rc  = SSMR3GetGCPtr(pSSM, &pVM->hm.s.pGuestPatchMem);
-        rc |= SSMR3GetGCPtr(pSSM, &pVM->hm.s.pFreeGuestPatchMem);
-        rc |= SSMR3GetU32(pSSM, &pVM->hm.s.cbGuestPatchMem);
+        SSMR3GetGCPtr(pSSM, &pVM->hm.s.pGuestPatchMem);
+        SSMR3GetGCPtr(pSSM, &pVM->hm.s.pFreeGuestPatchMem);
+        SSMR3GetU32(pSSM, &pVM->hm.s.cbGuestPatchMem);
 
         /* Fetch all TPR patch records. */
-        rc |= SSMR3GetU32(pSSM, &pVM->hm.s.cPatches);
+        rc = SSMR3GetU32(pSSM, &pVM->hm.s.cPatches);
         AssertRCReturn(rc, rc);
         for (uint32_t i = 0; i < pVM->hm.s.cPatches; i++)
         {
             PHMTPRPATCH pPatch = &pVM->hm.s.aPatches[i];
-            rc  = SSMR3GetU32(pSSM, &pPatch->Core.Key);
-            rc |= SSMR3GetMem(pSSM, pPatch->aOpcode, sizeof(pPatch->aOpcode));
-            rc |= SSMR3GetU32(pSSM, &pPatch->cbOp);
-            rc |= SSMR3GetMem(pSSM, pPatch->aNewOpcode, sizeof(pPatch->aNewOpcode));
-            rc |= SSMR3GetU32(pSSM, &pPatch->cbNewOp);
-            rc |= SSMR3GetU32(pSSM, (uint32_t *)&pPatch->enmType);
+            SSMR3GetU32(pSSM, &pPatch->Core.Key);
+            SSMR3GetMem(pSSM, pPatch->aOpcode, sizeof(pPatch->aOpcode));
+            SSMR3GetU32(pSSM, &pPatch->cbOp);
+            SSMR3GetMem(pSSM, pPatch->aNewOpcode, sizeof(pPatch->aNewOpcode));
+            SSMR3GetU32(pSSM, &pPatch->cbNewOp);
+            SSM_GET_ENUM32_RET(pSSM, pPatch->enmType, HMTPRINSTR);
 
             if (pPatch->enmType == HMTPRINSTR_JUMP_REPLACEMENT)
@@ -3139 +3139 @@
             Assert(pPatch->enmType == HMTPRINSTR_JUMP_REPLACEMENT || pVM->hm.s.fTPRPatchingActive == false);
 
-            rc |= SSMR3GetU32(pSSM, &pPatch->uSrcOperand);
-            rc |= SSMR3GetU32(pSSM, &pPatch->uDstOperand);
-            rc |= SSMR3GetU32(pSSM, &pPatch->cFaults);
-            rc |= SSMR3GetU32(pSSM, &pPatch->pJumpTarget);
+            SSMR3GetU32(pSSM, &pPatch->uSrcOperand);
+            SSMR3GetU32(pSSM, &pPatch->uDstOperand);
+            SSMR3GetU32(pSSM, &pPatch->cFaults);
+            rc = SSMR3GetU32(pSSM, &pPatch->pJumpTarget);
             AssertRCReturn(rc, rc);