From 2b13f79a51b0106170cd0b5d9996a3a553d8781e Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Wed, 9 Oct 2019 17:51:40 +0200 Subject: [PATCH 02/10] target-i386: Isolate KVM-specific code on CPU feature filtering logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Eduardo Habkost Message-id: <20191009175148.1361-3-ehabkost@redhat.com> Patchwork-id: 91358 O-Subject: [RHEL-7.7.z qemu-kvm PATCH 02/10] target-i386: Isolate KVM-specific code on CPU feature filtering logic Bugzilla: 1730606 RH-Acked-by: Miroslav Rezanina RH-Acked-by: Bandan Das RH-Acked-by: Igor Mammedov This will allow us to re-use the feature filtering logic (and the check/enforce flag logic) for TCG. Reviewed-by: Richard Henderson Signed-off-by: Eduardo Habkost Signed-off-by: Andreas Färber (cherry picked from commit 27418adf32b9cd164d464fffc4fc0505d6b2b15d) Signed-off-by: Paul Lai Signed-off-by: Eduardo Habkost Signed-off-by: Miroslav Rezanina --- target-i386/cpu.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index c9d7557..5cfed19 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2367,6 +2367,16 @@ 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. * @@ -2374,20 +2384,15 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp) * * Returns: 0 if all flags are supported by the host, non-zero otherwise. */ -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]; @@ -3070,7 +3075,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) env->features[w] &= feature_word_info[w].tcg_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.3.1