From d037664335efca55df79abcde79f4f2733ca535b Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Thu, 23 Feb 2017 14:29:42 +0100 Subject: [PATCH 12/17] target-i386: Filter KVM and 0xC0000001 features on TCG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Eduardo Habkost Message-id: <20170223142945.17790-12-ehabkost@redhat.com> Patchwork-id: 74040 O-Subject: [RHEL-7.4 qemu-kvm PATCH v2 11/14] target-i386: Filter KVM and 0xC0000001 features on TCG Bugzilla: 1382122 RH-Acked-by: Paolo Bonzini RH-Acked-by: Igor Mammedov RH-Acked-by: Miroslav Rezanina TCG doesn't support any of the feature flags on FEAT_KVM and FEAT_C000_0001_EDX feature words, so clear all bits on those feature words. Reviewed-by: Richard Henderson Signed-off-by: Eduardo Habkost Signed-off-by: Andreas Färber (cherry picked from commit 84a6c6cd40687598c7e85d7de8095e08b5e636d7) Signed-off-by: Eduardo Habkost Signed-off-by: Miroslav Rezanina --- target-i386/cpu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index d424211..e6821b6 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -501,7 +501,9 @@ typedef struct x86_def_t { CPUID_EXT2_PDPE1GB */ #define TCG_EXT3_FEATURES (CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM | \ CPUID_EXT3_CR8LEG | CPUID_EXT3_ABM | CPUID_EXT3_SSE4A) +#define TCG_EXT4_FEATURES 0 #define TCG_SVM_FEATURES 0 +#define TCG_KVM_FEATURES 0 #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: @@ -2644,6 +2646,8 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) 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; + env->features[FEAT_KVM] &= TCG_KVM_FEATURES; + env->features[FEAT_C000_0001_EDX] &= TCG_EXT4_FEATURES; env->features[FEAT_XSAVE] = 0; env->features[FEAT_7_0_ECX] &= TCG_7_0_ECX_FEATURES; env->features[FEAT_7_0_EDX] &= TCG_7_0_EDX_FEATURES; -- 1.8.3.1