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

Timestamp:

Dec 21, 2023 12:27:31 PM (13 months ago)

Author:

vboxsync

Message:

VMM/CPUM: bugref:10498 MTRR mapping nits.

File:

• trunk/src/VBox/VMM/VMMR3/CPUM.cpp (modified) (6 diffs)

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

@@ -3370 +3370 @@
         pMtrrMap->aMtrrs[pMtrrMap->idxMtrr].MtrrPhysBase = GCPhysFirst | fType;
         pMtrrMap->aMtrrs[pMtrrMap->idxMtrr].MtrrPhysMask = cpumR3GetVarMtrrMask(pVM, GCPhysFirst, GCPhysLast)
-                                                          | MSR_IA32_MTRR_PHYSMASK_VALID;
+                                                         | MSR_IA32_MTRR_PHYSMASK_VALID;
         ++pMtrrMap->idxMtrr;
 
@@ -3463 +3463 @@
     uint64_t cbLeft    = cb;
     uint64_t offRegion = GCPhysRegionFirst;
-    int      rc        = VINF_SUCCESS;
     while (cbLeft > 0)
     {
@@ -3469 +3468 @@
 
         Log3(("CPUM: MTRR: Add[%u]: %' Rhcb (%RU64 bytes)\n", pMtrrMap->idxMtrr, cbRegion, cbRegion));
-        rc = cpumR3MtrrMapAddRegion(pVM, pMtrrMap, offRegion, offRegion + cbRegion - 1, X86_MTRR_MT_WB);
+        int const rc = cpumR3MtrrMapAddRegion(pVM, pMtrrMap, offRegion, offRegion + cbRegion - 1, X86_MTRR_MT_WB);
         if (RT_FAILURE(rc))
             return rc;
@@ -3634 +3633 @@
     if (   RT_SUCCESS(rc)
         && pMtrrMapOptimal->cbMapped == pMtrrMapOptimal->cbToMap)
-        return rc;
+        return VINF_SUCCESS;
     return VERR_OUT_OF_RESOURCES;
 }
@@ -3820 +3819 @@
         LogRel(("CPUM: WARNING! Could not map %' Rhcb (%RU64 bytes) of RAM using %u variable-range MTRRs\n", cbLost, cbLost,
                 MtrrMap.cMtrrs));
-        rc = VINF_SUCCESS;
     }
 
@@ -3833 +3831 @@
     }
 
-    return rc;
+    return VINF_SUCCESS;
 }