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

Timestamp:

Dec 4, 2012 7:17:49 AM (12 years ago)

Author:

vboxsync

Message:

VMM: allow to disable MONITOR by setting the CFG key "VBoxInternal/CPUM/MONITOR" to 0

File:

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

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

@@ -859 +859 @@
     bool fCmpXchg16b;
     rc = CFGMR3QueryBoolDef(pCpumCfg, "CMPXCHG16B", &fCmpXchg16b, false); AssertRCReturn(rc, rc);
+    
+    bool fMonitor;
+    rc = CFGMR3QueryBoolDef(pCpumCfg, "MONITOR", &fMonitor, true); AssertRCReturn(rc, rc);
 
     /* Cpuid 1 & 0x80000001:
@@ -900 +903 @@
                                   | X86_CPUID_FEATURE_ECX_SSE3
                                   /* Can't properly emulate monitor & mwait with guest SMP; force the guest to use hlt for idling VCPUs. */
-                                  | ((pVM->cCpus == 1) ? X86_CPUID_FEATURE_ECX_MONITOR : 0)
+                                  | ((fMonitor && pVM->cCpus == 1) ? X86_CPUID_FEATURE_ECX_MONITOR : 0)
                                   //| X86_CPUID_FEATURE_ECX_CPLDS - no CPL qualified debug store.
                                   //| X86_CPUID_FEATURE_ECX_VMX   - not virtualized.