From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuQLg-0004iA-PC for qemu-devel@nongnu.org; Thu, 05 Nov 2015 14:37:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZuQLf-0005gy-UC for qemu-devel@nongnu.org; Thu, 05 Nov 2015 14:37:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54464) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuQLf-0005gm-PL for qemu-devel@nongnu.org; Thu, 05 Nov 2015 14:37:27 -0500 From: Eduardo Habkost Date: Thu, 5 Nov 2015 17:37:09 -0200 Message-Id: <1446752231-3715-4-git-send-email-ehabkost@redhat.com> In-Reply-To: <1446752231-3715-1-git-send-email-ehabkost@redhat.com> References: <1446752231-3715-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PULL 3/5] target-i386: Remove ABM from qemu64 CPU model List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Paolo Bonzini , Richard Henderson , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-devel@nongnu.org ABM is not available on Sandy Bridge and older, and we want to make the default CPU runnable in most hosts, so it won't be enabled by default in KVM mode. We should eventually have all features supported by TCG enabled by default in TCG mode, but as we don't have a good mechanism today to ensure we have different defaults in KVM and TCG mode, disable ABM in the qemu64 CPU model entirely. Reviewed-by: Paolo Bonzini Signed-off-by: Eduardo Habkost --- include/hw/i386/pc.h | 5 +++++ target-i386/cpu.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index bc82c14..8b54863 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -332,6 +332,11 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .driver = "qemu64" "-" TYPE_X86_CPU,\ .property = "sse4a",\ .value = "on",\ + },\ + {\ + .driver = "qemu64" "-" TYPE_X86_CPU,\ + .property = "abm",\ + .value = "on",\ }, #define PC_COMPAT_2_3 \ diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 5aa3ce7..90e4529 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -675,8 +675,7 @@ static X86CPUDefinition builtin_x86_defs[] = { .features[FEAT_8000_0001_EDX] = CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX, .features[FEAT_8000_0001_ECX] = - CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM | - CPUID_EXT3_ABM, + CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM, .xlevel = 0x8000000A, }, { -- 2.1.0