From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] qemu-kvm: Drop redundant cpuid filtering from cpu_x86_cpuid Date: Wed, 28 Sep 2011 16:53:30 +0200 Message-ID: <4E8334EA.4090004@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: kvm To: Avi Kivity , Marcelo Tosatti Return-path: Received: from thoth.sbs.de ([192.35.17.2]:33144 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751133Ab1I1Oxi (ORCPT ); Wed, 28 Sep 2011 10:53:38 -0400 Sender: kvm-owner@vger.kernel.org List-ID: This is already done in kvm_arch_init_vcpu based on the kernel-reported supported features. Signed-off-by: Jan Kiszka --- I'm not 100% sure, so please double-check. target-i386/cpuid.c | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index f179999..1e8bcff 100644 --- a/target-i386/cpuid.c +++ b/target-i386/cpuid.c @@ -1232,28 +1232,6 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, *ecx |= 1 << 1; /* CmpLegacy bit */ } } - if (kvm_enabled()) { - uint32_t h_eax, h_edx; - - host_cpuid(index, 0, &h_eax, NULL, NULL, &h_edx); - - /* disable CPU features that the host does not support */ - - /* long mode */ - if ((h_edx & 0x20000000) == 0 /* || !lm_capable_kernel */) - *edx &= ~0x20000000; - /* syscall */ - if ((h_edx & 0x00000800) == 0) - *edx &= ~0x00000800; - /* nx */ - if ((h_edx & 0x00100000) == 0) - *edx &= ~0x00100000; - - /* disable CPU features that KVM cannot support */ - - /* 3dnow */ - *edx &= ~0xc0000000; - } break; case 0x80000002: case 0x80000003: -- 1.7.3.4