From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M6qea-0003h1-FY for qemu-devel@nongnu.org; Wed, 20 May 2009 14:36:36 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M6qeV-0003eZ-BM for qemu-devel@nongnu.org; Wed, 20 May 2009 14:36:35 -0400 Received: from [199.232.76.173] (port=40826 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M6qeV-0003eT-1t for qemu-devel@nongnu.org; Wed, 20 May 2009 14:36:31 -0400 Received: from mx2.redhat.com ([66.187.237.31]:44648) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M6qeU-0006Qu-Fd for qemu-devel@nongnu.org; Wed, 20 May 2009 14:36:30 -0400 From: Glauber Costa Date: Wed, 20 May 2009 15:36:16 -0300 Message-Id: <1242844578-2647-6-git-send-email-glommer@redhat.com> In-Reply-To: <1242844578-2647-5-git-send-email-glommer@redhat.com> References: <1242844578-2647-1-git-send-email-glommer@redhat.com> <1242844578-2647-2-git-send-email-glommer@redhat.com> <1242844578-2647-3-git-send-email-glommer@redhat.com> <1242844578-2647-4-git-send-email-glommer@redhat.com> <1242844578-2647-5-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH STABLE 5/7] kvm: Trim cpu features not supported by kvm List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, Avi Kivity From: Avi Kivity Remove cpu features that are not supported by kvm from the cpuid features reported to the guest. Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori Signed-off-by: Glauber Costa --- target-i386/helper.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/target-i386/helper.c b/target-i386/helper.c index 1433857..c98cdcc 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -93,6 +93,21 @@ static void add_flagname_to_bitmaps(char *flagname, uint32_t *features, } } +static void kvm_trim_features(uint32_t *features, uint32_t supported, + const char *names[]) +{ + int i; + uint32_t mask; + + for (i = 0; i < 32; ++i) { + mask = 1U << i; + if ((*features & mask) && !(supported & mask)) { + printf("Processor feature %s not supported by kvm\n", names[i]); + *features &= ~mask; + } + } +} + typedef struct x86_def_t { const char *name; uint32_t level; @@ -1674,5 +1689,20 @@ CPUX86State *cpu_x86_init(const char *cpu_model) #endif if (kvm_enabled()) kvm_init_vcpu(env); + if (kvm_enabled()) { + kvm_trim_features(&env->cpuid_features, + kvm_arch_get_supported_cpuid(env, 1, R_EDX), + feature_name); + kvm_trim_features(&env->cpuid_ext_features, + kvm_arch_get_supported_cpuid(env, 1, R_ECX), + ext_feature_name); + kvm_trim_features(&env->cpuid_ext2_features, + kvm_arch_get_supported_cpuid(env, 0x80000001, R_EDX), + ext2_feature_name); + kvm_trim_features(&env->cpuid_ext3_features, + kvm_arch_get_supported_cpuid(env, 0x80000001, R_ECX), + ext3_feature_name); + } + return env; } -- 1.6.2.2