From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WketX-0000AL-Kg for qemu-devel@nongnu.org; Wed, 14 May 2014 15:31:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WketR-0001BY-CW for qemu-devel@nongnu.org; Wed, 14 May 2014 15:31:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47315) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WketR-0001Ax-4e for qemu-devel@nongnu.org; Wed, 14 May 2014 15:31:09 -0400 From: Eduardo Habkost Date: Wed, 14 May 2014 16:29:59 -0300 Message-Id: <1400095810-27684-8-git-send-email-ehabkost@redhat.com> In-Reply-To: <1400095810-27684-1-git-send-email-ehabkost@redhat.com> References: <1400095810-27684-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH RESEND v4 07/18] target-i386: Filter FEAT_7_0_EBX TCG features too List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= The TCG_7_0_EBX_FEATURES macro was defined but never used (it even had a typo that was never noticed). Make the existing TCG feature filtering code use it. Reviewed-by: Richard Henderson Signed-off-by: Eduardo Habkost --- Changes v1 -> v2: * Trivial rebase to latest qom-cpu (commit 90c5d39c) (Reviewed-by line kept) Changes v2 -> v3: * Trivial rebase after QEMU 2.0 (onto commit 2d03b49) (Reviewed-by line kept) --- target-i386/cpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 1a1e390..8d0ae12 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -588,7 +588,7 @@ struct X86CPUDefinition { #define TCG_EXT3_FEATURES (CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM | \ CPUID_EXT3_CR8LEG | CPUID_EXT3_ABM | CPUID_EXT3_SSE4A) #define TCG_SVM_FEATURES 0 -#define TCG_7_0_EBX_FEATURES (CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_SMAP \ +#define TCG_7_0_EBX_FEATURES (CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_SMAP | \ CPUID_7_0_EBX_BMI1 | CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ADX) /* missing: CPUID_7_0_EBX_FSGSBASE, CPUID_7_0_EBX_HLE, CPUID_7_0_EBX_AVX2, @@ -2604,6 +2604,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) if (!kvm_enabled()) { env->features[FEAT_1_EDX] &= TCG_FEATURES; env->features[FEAT_1_ECX] &= TCG_EXT_FEATURES; + env->features[FEAT_7_0_EBX] &= TCG_7_0_EBX_FEATURES; env->features[FEAT_8000_0001_EDX] &= TCG_EXT2_FEATURES; env->features[FEAT_8000_0001_ECX] &= TCG_EXT3_FEATURES; env->features[FEAT_SVM] &= TCG_SVM_FEATURES; -- 1.9.0