Changeset 19724 in vbox

Timestamp:

May 15, 2009 9:39:02 AM (16 years ago)

Author:

vboxsync

Message:

Bugfix

File:

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

trunk/src/VBox/VMM/CPUM.cpp

@@ -318 +318 @@
     pCPUM->aGuestCpuIdStd[1].ecx      &= 0
                                        | 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)
                                        //| X86_CPUID_FEATURE_ECX_CPLDS - no CPL qualified debug store.
                                        //| X86_CPUID_FEATURE_ECX_VMX   - not virtualized.
@@ -332 +334 @@
                                        //| X86_CPUID_FEATURE_ECX_POPCOUNT
                                        | 0;
-
-    /* Can't properly emulate monitor & mwait with guest SMP; force the guest to use hlt for idling VCPUs. */
-    if (pVM->cCPUs == 1)
-        pCPUM->aGuestCpuIdStd[1].ecx |= X86_CPUID_FEATURE_ECX_MONITOR;
 
     /* ASSUMES that this is ALWAYS the AMD define feature set if present. */