From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJTwq-0001mz-4R for qemu-devel@nongnu.org; Fri, 28 Feb 2014 15:22:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJTwk-0006L8-5g for qemu-devel@nongnu.org; Fri, 28 Feb 2014 15:22:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41632) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJTwj-0006L1-Ta for qemu-devel@nongnu.org; Fri, 28 Feb 2014 15:22:14 -0500 From: Eduardo Habkost Date: Fri, 28 Feb 2014 17:21:44 -0300 Message-Id: <1393618913-12411-2-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 01/10] target-i386: Simplify reporting of unavailable features 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 Instead of checking and calling unavailable_host_feature() once for each bit, simply call the function (now renamed to report_unavailable_features()) once for each feature word. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 9ff1062..d62be53 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1172,11 +1172,11 @@ static void kvm_cpu_fill_host(X86CPUDefinition *x86_cpu_def) } } -static int unavailable_host_feature(FeatureWordInfo *f, uint32_t mask) +static int report_unavailable_features(FeatureWordInfo *f, uint32_t mask) { int i; - for (i = 0; i < 32; ++i) + for (i = 0; i < 32; ++i) { if (1 << i & mask) { const char *reg = get_register_name_32(f->cpuid_reg); assert(reg); @@ -1185,8 +1185,8 @@ static int unavailable_host_feature(FeatureWordInfo *f, uint32_t mask) f->cpuid_eax, reg, f->feat_names[i] ? "." : "", f->feat_names[i] ? f->feat_names[i] : "", i); - break; } + } return 0; } @@ -1210,12 +1210,10 @@ static int kvm_check_features_against_host(KVMState *s, X86CPU *cpu) uint32_t host_feat = kvm_arch_get_supported_cpuid(s, wi->cpuid_eax, wi->cpuid_ecx, wi->cpuid_reg); - uint32_t mask; - for (mask = 1; mask; mask <<= 1) { - if (guest_feat & mask && !(host_feat & mask)) { - unavailable_host_feature(wi, mask); - rv = 1; - } + uint32_t unavailable_features = guest_feat & ~host_feat; + if (unavailable_features) { + report_unavailable_features(wi, unavailable_features); + rv = 1; } } return rv; -- 1.8.5.3