From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M6EZs-0007b8-BW for qemu-devel@nongnu.org; Mon, 18 May 2009 21:57:12 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M6EZn-0007aR-Ns for qemu-devel@nongnu.org; Mon, 18 May 2009 21:57:11 -0400 Received: from [199.232.76.173] (port=33554 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M6EZn-0007aD-GP for qemu-devel@nongnu.org; Mon, 18 May 2009 21:57:07 -0400 Received: from mx2.redhat.com ([66.187.237.31]:60239) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M6EZm-0001BN-1V for qemu-devel@nongnu.org; Mon, 18 May 2009 21:57:07 -0400 From: Glauber Costa Date: Mon, 18 May 2009 21:57:01 -0400 Message-Id: <1242698221-32463-4-git-send-email-glommer@redhat.com> In-Reply-To: <1242698221-32463-3-git-send-email-glommer@redhat.com> References: <1242698221-32463-1-git-send-email-glommer@redhat.com> <1242698221-32463-2-git-send-email-glommer@redhat.com> <1242698221-32463-3-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH STABLE 3/3] 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 | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/target-i386/helper.c b/target-i386/helper.c index 1433857..6af5d23 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; @@ -1672,7 +1687,21 @@ CPUX86State *cpu_x86_init(const char *cpu_model) #ifdef USE_KQEMU kqemu_init(env); #endif - if (kvm_enabled()) + if (kvm_enabled()) { kvm_init_vcpu(env); + 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.5.6.6