Received: from eggs.gnu.org ([208.118.235.92]:39177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ug32y-00063i-HK for qemu-devel@nongnu.org; Fri, 24 May 2013 21:13:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ug32w-0003nj-5c for qemu-devel@nongnu.org; Fri, 24 May 2013 21:13:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21402) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ug32v-0003ne-Tp for qemu-devel@nongnu.org; Fri, 24 May 2013 21:13:22 -0400 From: Bandan Das Date: Fri, 24 May 2013 21:13:18 -0400 Message-ID: MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH] target-i386: Disable CPUID_EXT_MONITOR when KVM is enabled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , Eduardo Habkost , Andreas =?utf-8?Q?F=C3=A4rber?= 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 --- 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