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

Timestamp:

Oct 14, 2019 10:18:54 AM (5 years ago)

Author:

vboxsync

Message:

VMM/HM: hmR3Save better rc handling.

File:

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

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

@@ -2983 +2983 @@
 static DECLCALLBACK(int) hmR3Save(PVM pVM, PSSMHANDLE pSSM)
 {
-    int rc;
-
     Log(("hmR3Save:\n"));
 
@@ -2994 +2992 @@
         {
             PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-            rc  = SSMR3PutBool(pSSM, pVmcbNstGstCache->fCacheValid);
-            rc |= SSMR3PutU16(pSSM,  pVmcbNstGstCache->u16InterceptRdCRx);
-            rc |= SSMR3PutU16(pSSM,  pVmcbNstGstCache->u16InterceptWrCRx);
-            rc |= SSMR3PutU16(pSSM,  pVmcbNstGstCache->u16InterceptRdDRx);
-            rc |= SSMR3PutU16(pSSM,  pVmcbNstGstCache->u16InterceptWrDRx);
-            rc |= SSMR3PutU16(pSSM,  pVmcbNstGstCache->u16PauseFilterThreshold);
-            rc |= SSMR3PutU16(pSSM,  pVmcbNstGstCache->u16PauseFilterCount);
-            rc |= SSMR3PutU32(pSSM,  pVmcbNstGstCache->u32InterceptXcpt);
-            rc |= SSMR3PutU64(pSSM,  pVmcbNstGstCache->u64InterceptCtrl);
-            rc |= SSMR3PutU64(pSSM,  pVmcbNstGstCache->u64TSCOffset);
-            rc |= SSMR3PutBool(pSSM, pVmcbNstGstCache->fVIntrMasking);
-            rc |= SSMR3PutBool(pSSM, pVmcbNstGstCache->fNestedPaging);
-            rc |= SSMR3PutBool(pSSM, pVmcbNstGstCache->fLbrVirt);
-            AssertRCReturn(rc, rc);
+            SSMR3PutBool(pSSM, pVmcbNstGstCache->fCacheValid);
+            SSMR3PutU16(pSSM,  pVmcbNstGstCache->u16InterceptRdCRx);
+            SSMR3PutU16(pSSM,  pVmcbNstGstCache->u16InterceptWrCRx);
+            SSMR3PutU16(pSSM,  pVmcbNstGstCache->u16InterceptRdDRx);
+            SSMR3PutU16(pSSM,  pVmcbNstGstCache->u16InterceptWrDRx);
+            SSMR3PutU16(pSSM,  pVmcbNstGstCache->u16PauseFilterThreshold);
+            SSMR3PutU16(pSSM,  pVmcbNstGstCache->u16PauseFilterCount);
+            SSMR3PutU32(pSSM,  pVmcbNstGstCache->u32InterceptXcpt);
+            SSMR3PutU64(pSSM,  pVmcbNstGstCache->u64InterceptCtrl);
+            SSMR3PutU64(pSSM,  pVmcbNstGstCache->u64TSCOffset);
+            SSMR3PutBool(pSSM, pVmcbNstGstCache->fVIntrMasking);
+            SSMR3PutBool(pSSM, pVmcbNstGstCache->fNestedPaging);
+            SSMR3PutBool(pSSM, pVmcbNstGstCache->fLbrVirt);
         }
     }
 
     /* Save the guest patch data. */
-    rc  = SSMR3PutGCPtr(pSSM, pVM->hm.s.pGuestPatchMem);
-    rc |= SSMR3PutGCPtr(pSSM, pVM->hm.s.pFreeGuestPatchMem);
-    rc |= SSMR3PutU32(pSSM, pVM->hm.s.cbGuestPatchMem);
+    SSMR3PutGCPtr(pSSM, pVM->hm.s.pGuestPatchMem);
+    SSMR3PutGCPtr(pSSM, pVM->hm.s.pFreeGuestPatchMem);
+    SSMR3PutU32(pSSM, pVM->hm.s.cbGuestPatchMem);
 
     /* Store all the guest patch records too. */
-    rc |= SSMR3PutU32(pSSM, pVM->hm.s.cPatches);
-    AssertRCReturn(rc, rc);
+    int rc = SSMR3PutU32(pSSM, pVM->hm.s.cPatches);
+    if (RT_FAILURE(rc))
+        return rc;
 
     for (uint32_t i = 0; i < pVM->hm.s.cPatches; i++)
@@ -3024 +3022 @@
         AssertCompileSize(HMTPRINSTR, 4);
         PCHMTPRPATCH pPatch = &pVM->hm.s.aPatches[i];
-        rc  = SSMR3PutU32(pSSM, pPatch->Core.Key);
-        rc |= SSMR3PutMem(pSSM, pPatch->aOpcode, sizeof(pPatch->aOpcode));
-        rc |= SSMR3PutU32(pSSM, pPatch->cbOp);
-        rc |= SSMR3PutMem(pSSM, pPatch->aNewOpcode, sizeof(pPatch->aNewOpcode));
-        rc |= SSMR3PutU32(pSSM, pPatch->cbNewOp);
-        rc |= SSMR3PutU32(pSSM, (uint32_t)pPatch->enmType);
-        rc |= SSMR3PutU32(pSSM, pPatch->uSrcOperand);
-        rc |= SSMR3PutU32(pSSM, pPatch->uDstOperand);
-        rc |= SSMR3PutU32(pSSM, pPatch->pJumpTarget);
-        rc |= SSMR3PutU32(pSSM, pPatch->cFaults);
-        AssertRCReturn(rc, rc);
+        SSMR3PutU32(pSSM, pPatch->Core.Key);
+        SSMR3PutMem(pSSM, pPatch->aOpcode, sizeof(pPatch->aOpcode));
+        SSMR3PutU32(pSSM, pPatch->cbOp);
+        SSMR3PutMem(pSSM, pPatch->aNewOpcode, sizeof(pPatch->aNewOpcode));
+        SSMR3PutU32(pSSM, pPatch->cbNewOp);
+        SSMR3PutU32(pSSM, (uint32_t)pPatch->enmType);
+        SSMR3PutU32(pSSM, pPatch->uSrcOperand);
+        SSMR3PutU32(pSSM, pPatch->uDstOperand);
+        SSMR3PutU32(pSSM, pPatch->pJumpTarget);
+        rc = SSMR3PutU32(pSSM, pPatch->cFaults);
+        if (RT_FAILURE(rc))
+            return rc;
     }