From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WketY-0000B8-LN for qemu-devel@nongnu.org; Wed, 14 May 2014 15:31:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WketT-0001CE-De for qemu-devel@nongnu.org; Wed, 14 May 2014 15:31:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52780) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WketT-0001C4-4E for qemu-devel@nongnu.org; Wed, 14 May 2014 15:31:11 -0400 From: Eduardo Habkost Date: Wed, 14 May 2014 16:30:00 -0300 Message-Id: <1400095810-27684-9-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 08/18] target-i386: Filter KVM and 0xC0000001 features on TCG List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= 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 --- 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 8d0ae12..0e9f3ea 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -587,7 +587,9 @@ struct X86CPUDefinition { 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: @@ -2608,6 +2610,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; } else { if (x86_cpu_filter_features(cpu) && cpu->enforce_cpuid) { error_setg(&local_err, -- 1.9.0