From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43017) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJTwu-0001n6-R0 for qemu-devel@nongnu.org; Fri, 28 Feb 2014 15:22:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJTwo-0006Nn-SD for qemu-devel@nongnu.org; Fri, 28 Feb 2014 15:22:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6583) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJTwo-0006Mb-IZ for qemu-devel@nongnu.org; Fri, 28 Feb 2014 15:22:18 -0500 From: Eduardo Habkost Date: Fri, 28 Feb 2014 17:21:47 -0300 Message-Id: <1393618913-12411-5-git-send-email-ehabkost@redhat.com> In-Reply-To: <1393618913-12411-1-git-send-email-ehabkost@redhat.com> References: <1393618913-12411-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [qom-cpu PATCH 04/10] target-i386: Isolate KVM-specific code on CPU feature filtering logic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Cc: Igor Mammedov , Richard Henderson , Aurelien Jarno , Paolo Bonzini This will allow us to re-use the feature filtering logic (and the check/enforce flag logic) for TCG. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index af82289..7fc0539 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1770,26 +1770,29 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp) return cpu_list; } +static uint32_t x86_cpu_get_supported_feature_word(FeatureWord w) +{ + FeatureWordInfo *wi = &feature_word_info[w]; + assert(kvm_enabled()); + return kvm_arch_get_supported_cpuid(kvm_state, wi->cpuid_eax, + wi->cpuid_ecx, + wi->cpuid_reg); +} + /* Filters CPU feature words based on host availability of each feature * * Returns 0 if all flags are supported by the host, non-zero otherwise. * * This function may be called only if KVM is enabled. */ -static int filter_features_for_kvm(X86CPU *cpu) +static int x86_cpu_filter_features(X86CPU *cpu) { CPUX86State *env = &cpu->env; - KVMState *s = kvm_state; FeatureWord w; int rv = 0; - assert(kvm_enabled()); - for (w = 0; w < FEATURE_WORDS; w++) { - FeatureWordInfo *wi = &feature_word_info[w]; - uint32_t host_feat = kvm_arch_get_supported_cpuid(s, wi->cpuid_eax, - wi->cpuid_ecx, - wi->cpuid_reg); + uint32_t host_feat = x86_cpu_get_supported_feature_word(w); uint32_t requested_features = env->features[w]; env->features[w] &= host_feat; cpu->filtered_features[w] = requested_features & ~env->features[w]; @@ -2528,7 +2531,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) env->features[FEAT_8000_0001_ECX] &= TCG_EXT3_FEATURES; env->features[FEAT_SVM] &= TCG_SVM_FEATURES; } else { - if (filter_features_for_kvm(cpu) && cpu->enforce_cpuid) { + if (x86_cpu_filter_features(cpu) && cpu->enforce_cpuid) { error_setg(&local_err, "Host's CPU doesn't support requested features"); goto out; -- 1.8.5.3