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

Timestamp:

Jan 12, 2024 8:13:24 AM (12 months ago)

Author:

vboxsync

Message:

VMM/CPUM: bugref:10498 MTRR CFGM setting naming nit and comment.

File:

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

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

@@ -3541 +3541 @@
         {
             /** @cfgm{/CPUM/MtrrWrite, boolean, true}
-             * Whether to enable MTRR read+write support. When enabled, this automatically
-             * enables MTRR read support as well. */
-            bool fEnableMtrrWrite;
-            rc = CFGMR3QueryBoolDef(pCpumCfg, "MtrrWrite", &fEnableMtrrWrite,
+             * Whether to enable MTRR read-write support. This overrides the MTRR read-only CFGM
+             * setting. */
+            bool fEnableMtrrReadWrite;
+            rc = CFGMR3QueryBoolDef(pCpumCfg, "MtrrReadWrite", &fEnableMtrrReadWrite,
                                     true /** @todo true - 2023-12-12 bird: does not work yet, so disabled it */);
             AssertRCReturn(rc, rc);
-            if (fEnableMtrrWrite)
+            if (fEnableMtrrReadWrite)
             {
                 pVM->cpum.s.fMtrrRead  = true;
@@ -3555 +3555 @@
             else
             {
-                /** @cfgm{/CPUM/MtrrRead, boolean, false}
-                 * Whether to enable MTRR read support and to initialize mapping of guest memory via
-                 * MTRRs. When disabled, MTRRs are left blank, returns 0 on reads and ignores
-                 * writes. Some guests like GNU/Linux recognize a virtual system when MTRRs are left
-                 * blank but some guests may expect their RAM to be mapped via MTRRs similar to
-                 * real hardware. */
-                rc = CFGMR3QueryBoolDef(pCpumCfg, "MtrrRead", &pVM->cpum.s.fMtrrRead, false);
+                /** @cfgm{/CPUM/MtrrReadOnly, boolean, false}
+                 * Whether to enable MTRR read-only support and to initialize mapping of guest
+                 * memory via MTRRs. When disabled, MTRRs are left blank, returns 0 on reads and
+                 * ignores writes. Some guests like GNU/Linux recognize a virtual system when MTRRs
+                 * are left blank but some guests may expect their RAM to be mapped via MTRRs
+                 * similar to real hardware. */
+                rc = CFGMR3QueryBoolDef(pCpumCfg, "MtrrReadOnly", &pVM->cpum.s.fMtrrRead, false);
                 AssertRCReturn(rc, rc);
                 LogRel(("CPUM: Enabled MTRR read-only support\n"));
@@ -3573 +3573 @@
                  * When enabled, the number of variable-range MTRRs are virtualized. When disabled,
                  * the number of variable-range MTRRs are derived from the CPU profile. Unless
-                 * guests have problems with the virtualized variable-range MTRR count, it is
+                 * guests have problems with a virtualized number of variable-range MTRRs, it is
                  * recommended to keep this enabled so that there are sufficient MTRRs to fully
                  * describe all regions of the guest RAM. */