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

Timestamp:

Mar 18, 2011 3:49:23 PM (14 years ago)

Author:

vboxsync

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

70637

Message:

VMM: more correct MSR_IA32_MISC_ENABLE emulation

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllRegs.cpp (modified) (1 diff)
• EMAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -866 +866 @@
             *puValue = pVCpu->cpum.s.GuestMsr.msr.miscEnable;
 #else
-            *puValue = 0;
+            /* Currenty we don't allow guests to modify enable MSRs. */
+            *puValue = MSR_IA32_MISC_ENABLE_FAST_STRINGS  /* by default */;
+
+            if ((pVCpu->CTX_SUFF(pVM)->cpum.s.aGuestCpuIdStd[1].ecx & X86_CPUID_FEATURE_ECX_MONITOR) != 0)
+                
+                *puValue |= MSR_IA32_MISC_ENABLE_MONITOR /* if mwait/monitor available */;
+            /** @todo: add more cpuid-controlled features this way. */
 #endif
             break;

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -2666 +2666 @@
         return "MSR_IA32_TSC";
     case MSR_IA32_MISC_ENABLE:
-        return "Unsupported MSR_IA32_MISC_ENABLE";
+        return "MSR_IA32_MISC_ENABLE";
     case MSR_IA32_MTRR_CAP:
         return "Unsupported MSR_IA32_MTRR_CAP";