From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPdUF-00040F-NC for qemu-devel@nongnu.org; Mon, 17 Mar 2014 15:46:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPdU9-0005YT-7Q for qemu-devel@nongnu.org; Mon, 17 Mar 2014 15:46:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38885) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPdU9-0005YP-0X for qemu-devel@nongnu.org; Mon, 17 Mar 2014 15:46:09 -0400 From: Eduardo Habkost Date: Mon, 17 Mar 2014 16:44:59 -0300 Message-Id: <1395085507-5544-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1395085507-5544-1-git-send-email-ehabkost@redhat.com> References: <1395085507-5544-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH qom-cpu v2 02/10] target-i386: Merge feature filtering/checking functions 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 , Paolo Bonzini , Aurelien Jarno , Richard Henderson Merge filter_features_for_kvm() and kvm_check_features_against_host(). Both functions made exactly the same calculations, the only difference was that filter_features_for_kvm() changed the bits on cpu->features[], and kvm_check_features_against_host() did error reporting. Signed-off-by: Eduardo Habkost Reviewed-by: Richard Henderson --- target-i386/cpu.c | 53 +++++++++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 239ab8c..a704541 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1248,35 +1248,6 @@ static int report_unavailable_features(FeatureWordInfo *f, uint32_t mask) return 0; } -/* Check if all requested cpu flags are making their way to the guest - * - * 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 kvm_check_features_against_host(KVMState *s, X86CPU *cpu) -{ - CPUX86State *env = &cpu->env; - int rv = 0; - FeatureWord w; - - assert(kvm_enabled()); - - for (w = 0; w < FEATURE_WORDS; w++) { - FeatureWordInfo *wi = &feature_word_info[w]; - uint32_t guest_feat = env->features[w]; - uint32_t host_feat = kvm_arch_get_supported_cpuid(s, wi->cpuid_eax, - wi->cpuid_ecx, - wi->cpuid_reg); - uint32_t unavailable_features = guest_feat & ~host_feat; - if (unavailable_features) { - report_unavailable_features(wi, unavailable_features); - rv = 1; - } - } - return rv; -} - static void x86_cpuid_version_get_family(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { @@ -1835,11 +1806,20 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp) return cpu_list; } -static void filter_features_for_kvm(X86CPU *cpu) +/* 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) { 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]; @@ -1849,7 +1829,15 @@ static void filter_features_for_kvm(X86CPU *cpu) uint32_t requested_features = env->features[w]; env->features[w] &= host_feat; cpu->filtered_features[w] = requested_features & ~env->features[w]; + if (cpu->filtered_features[w]) { + if (cpu->check_cpuid || cpu->enforce_cpuid) { + report_unavailable_features(wi, cpu->filtered_features[w]); + } + rv = 1; + } } + + return rv; } /* Load data from X86CPUDefinition @@ -2597,14 +2585,11 @@ 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 { - KVMState *s = kvm_state; - if ((cpu->check_cpuid || cpu->enforce_cpuid) - && kvm_check_features_against_host(s, cpu) && cpu->enforce_cpuid) { + if (filter_features_for_kvm(cpu) && cpu->enforce_cpuid) { error_setg(&local_err, "Host's CPU doesn't support requested features"); goto out; } - filter_features_for_kvm(cpu); } #ifndef CONFIG_USER_ONLY -- 1.8.5.3