From patchwork Wed Apr 30 16:48:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 344225 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 66AC41400A5 for ; Thu, 1 May 2014 02:58:39 +1000 (EST) Received: from localhost ([::1]:57977 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfXq9-0003la-BX for incoming@patchwork.ozlabs.org; Wed, 30 Apr 2014 12:58:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfXmd-0005O4-QE for qemu-devel@nongnu.org; Wed, 30 Apr 2014 12:55:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WfXmY-0004mE-HH for qemu-devel@nongnu.org; Wed, 30 Apr 2014 12:54:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1653) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfXmY-0004m3-9k for qemu-devel@nongnu.org; Wed, 30 Apr 2014 12:54:54 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3UGn8GO013369 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 30 Apr 2014 12:49:08 -0400 Received: from localhost (ovpn-113-106.phx2.redhat.com [10.3.113.106]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s3UGn7wU014488; Wed, 30 Apr 2014 12:49:08 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Wed, 30 Apr 2014 13:48:30 -0300 Message-Id: <1398876525-28831-4-git-send-email-ehabkost@redhat.com> In-Reply-To: <1398876525-28831-1-git-send-email-ehabkost@redhat.com> References: <1398876525-28831-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Marcelo Tosatti , Paolo Bonzini , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno , Richard Henderson Subject: [Qemu-devel] [PATCH v4 03/18] target-i386: Merge feature filtering/checking functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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. Reviewed-by: Richard Henderson Signed-off-by: Eduardo Habkost --- Changes v1 -> v2: * Trivial rebase to latest qom-cpu (commit 90c5d39c) (Reviewed-by line kept) Changes v2 -> v3: * Trivial rebase after QEMU 2.0 (onto commit 2d03b49) (Reviewed-by line kept) --- 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 9cd0039..39ee1ce 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1254,35 +1254,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) { @@ -1841,11 +1812,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]; @@ -1855,7 +1835,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 @@ -2604,14 +2592,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