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

Timestamp:

Sep 24, 2021 6:43:55 AM (3 years ago)

Author:

vboxsync

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

147024

Message:

VMM: Nested VMX: bugref:10092 Fix VMX preemption timer's default.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CPUM.cpp (modified) (1 diff)
• CPUMR3CpuId.cpp (modified) (1 diff)

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

@@ -1648 +1648 @@
     EmuFeat.fVmxNmiExit               = 1;
     EmuFeat.fVmxVirtNmi               = 1;
-    EmuFeat.fVmxPreemptTimer          = 0;  /* pVM->cpum.s.fNestedVmxPreemptTimer -- Currently disabled on purpose, see @bugref{9180#c108}. */
+    EmuFeat.fVmxPreemptTimer          = pVM->cpum.s.fNestedVmxPreemptTimer;
     EmuFeat.fVmxPostedInt             = 0;
     EmuFeat.fVmxIntWindowExit         = 1;

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

@@ -4217 +4217 @@
             /** @cfgm{/CPUM/NestedVmxPreemptTimer, bool, true}
              * Whether to expose the VMX-preemption timer feature to the guest (if also
-             * supported by the host hardware). The default is true, and when disabled will
-             * prevent exposing the VMX-preemption timer feature to the guest even if the host
-             * supports it.
+             * supported by the host hardware). When disabled will prevent exposing the
+             * VMX-preemption timer feature to the guest even if the host supports it.
+             *
+             * @todo Currently disabled, see @bugref{9180#c108}.
              */
-            rc = CFGMR3QueryBoolDef(pCpumCfg, "NestedVmxPreemptTimer", &pVM->cpum.s.fNestedVmxPreemptTimer, true);
+            rc = CFGMR3QueryBoolDef(pCpumCfg, "NestedVmxPreemptTimer", &pVM->cpum.s.fNestedVmxPreemptTimer, false);
             AssertLogRelRCReturn(rc, rc);