[Qemu-devel] [PATCH] target-i386: Disable CPUID_EXT_MONITOR when KVM is enabled

[Bandan Das]

By default, CPUID_EXT_MONITOR is enabled for some cpu models 
such as Opteron_G3. Disable it if kvm_enabled() is true since 
monitor/mwait aren't supported by KVM yet. 

Signed-off-by: Bandan Das <address@hidden>
---
There is no user visible side-effect to this behavior, the aim 
is to clean up the default flags that are not supported (yet).

 target-i386/cpu.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 1a501d9..c83ba1c 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1749,6 +1749,7 @@ static void cpu_x86_register(X86CPU *cpu, const char 
*name, Error **errp)
 
     if (kvm_enabled()) {
         def->features[FEAT_KVM] |= kvm_default_features;
+        def->features[FEAT_1_ECX] &= ~CPUID_EXT_MONITOR;
     }
     def->features[FEAT_1_ECX] |= CPUID_EXT_HYPERVISOR;
 
-- 
1.8.1.4