From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M0cIl-0000YX-RP for qemu-devel@nongnu.org; Sun, 03 May 2009 10:04:19 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M0cIg-0000XZ-SH for qemu-devel@nongnu.org; Sun, 03 May 2009 10:04:19 -0400 Received: from [199.232.76.173] (port=49136 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M0cIg-0000X7-AY for qemu-devel@nongnu.org; Sun, 03 May 2009 10:04:14 -0400 Received: from mx2.redhat.com ([66.187.237.31]:58437) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M0cIf-00029n-Eb for qemu-devel@nongnu.org; Sun, 03 May 2009 10:04:13 -0400 From: Avi Kivity Date: Sun, 3 May 2009 17:04:04 +0300 Message-Id: <1241359444-8538-5-git-send-email-avi@redhat.com> In-Reply-To: <1241359444-8538-1-git-send-email-avi@redhat.com> References: <1241359444-8538-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] 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: Anthony Liguori Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Remove cpu features that are not supported by kvm from the cpuid features reported to the guest. Signed-off-by: Avi Kivity --- 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 0c91133..bdf242b 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; @@ -1699,5 +1714,20 @@ CPUX86State *cpu_x86_init(const char *cpu_model) qemu_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.1.1