From patchwork Thu Mar 11 13:39:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 47327 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 188F3B6EFF for ; Fri, 12 Mar 2010 01:07:27 +1100 (EST) Received: from localhost ([127.0.0.1]:49776 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Npj1o-0003a1-W3 for incoming@patchwork.ozlabs.org; Thu, 11 Mar 2010 09:06:21 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Npic7-0005ef-Io for qemu-devel@nongnu.org; Thu, 11 Mar 2010 08:39:47 -0500 Received: from [199.232.76.173] (port=45901 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Npic7-0005eV-6o for qemu-devel@nongnu.org; Thu, 11 Mar 2010 08:39:47 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Npic6-0001UZ-64 for qemu-devel@nongnu.org; Thu, 11 Mar 2010 08:39:47 -0500 Received: from va3ehsobe005.messaging.microsoft.com ([216.32.180.15]:26280 helo=VA3EHSOBE006.bigfish.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_MD5:16) (Exim 4.60) (envelope-from ) id 1Npic5-0001UL-Uc for qemu-devel@nongnu.org; Thu, 11 Mar 2010 08:39:46 -0500 Received: from mail144-va3-R.bigfish.com (10.7.14.235) by VA3EHSOBE006.bigfish.com (10.7.40.26) with Microsoft SMTP Server id 8.1.240.5; Thu, 11 Mar 2010 13:39:45 +0000 Received: from mail144-va3 (localhost [127.0.0.1]) by mail144-va3-R.bigfish.com (Postfix) with ESMTP id D8816F202C1; Thu, 11 Mar 2010 13:39:44 +0000 (UTC) X-SpamScore: -4 X-BigFish: VPS-4(zz936eMab9bhzz1202hzzz32i6bh2a8h43h62h) X-FB-SS: 5, Received: from mail144-va3 (localhost.localdomain [127.0.0.1]) by mail144-va3 (MessageSwitch) id 1268314770584904_29825; Thu, 11 Mar 2010 13:39:30 +0000 (UTC) Received: from VA3EHSMHS029.bigfish.com (unknown [10.7.14.252]) by mail144-va3.bigfish.com (Postfix) with ESMTP id 0EA97CB00A0; Thu, 11 Mar 2010 13:39:29 +0000 (UTC) Received: from ausb3extmailp01.amd.com (163.181.251.8) by VA3EHSMHS029.bigfish.com (10.7.99.39) with Microsoft SMTP Server (TLS) id 14.0.482.39; Thu, 11 Mar 2010 13:39:24 +0000 Received: from ausb3twp01.amd.com ([163.181.250.37]) by ausb3extmailp01.amd.com (Switch-3.2.7/Switch-3.2.7) with SMTP id o2BDh0ot027889; Thu, 11 Mar 2010 07:43:03 -0600 X-WSS-ID: 0KZ4DXH-01-7MO-02 X-M-MSG: Received: from sausexhtp02.amd.com (sausexhtp02.amd.com [163.181.3.152]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) by ausb3twp01.amd.com (Tumbleweed MailGate 3.7.2) with ESMTP id 230F210288B0; Thu, 11 Mar 2010 07:39:16 -0600 (CST) Received: from storexhtp01.amd.com (172.24.4.3) by sausexhtp02.amd.com (163.181.3.152) with Microsoft SMTP Server (TLS) id 8.2.234.1; Thu, 11 Mar 2010 07:39:19 -0600 Received: from storexmb1.amd.com (10.1.1.14) by storexhtp01.amd.com (172.24.4.3) with Microsoft SMTP Server id 8.2.234.1; Thu, 11 Mar 2010 05:39:18 -0800 Received: from sausexmb1.amd.com ([163.181.3.156]) by storexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 11 Mar 2010 08:39:14 -0500 Received: from seurexmb1.amd.com ([165.204.9.130]) by sausexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 11 Mar 2010 07:39:01 -0600 Received: from gwo.osrc.amd.com ([165.204.16.204]) by seurexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 11 Mar 2010 14:38:55 +0100 Received: from localhost.localdomain (tronje.osrc.amd.com [165.204.15.48]) by gwo.osrc.amd.com (Postfix) with ESMTP id B8D0C49C225; Thu, 11 Mar 2010 13:38:55 +0000 (GMT) From: Andre Przywara To: anthony@codemonkey.ws Date: Thu, 11 Mar 2010 14:39:01 +0100 Message-ID: <1268314747-11111-8-git-send-email-andre.przywara@amd.com> X-Mailer: git-send-email 1.6.4 In-Reply-To: <1268314747-11111-1-git-send-email-andre.przywara@amd.com> References: <1268314747-11111-1-git-send-email-andre.przywara@amd.com> X-OriginalArrivalTime: 11 Mar 2010 13:38:56.0012 (UTC) FILETIME=[32472CC0:01CAC120] MIME-Version: 1.0 X-Reverse-DNS: unknown X-detected-operating-system: by monty-python.gnu.org: Windows 2000 SP4, XP SP1+ Cc: Andre Przywara , qemu-devel@nongnu.org, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 07/13] x86/cpuid: remove unnecessary kvm_trim function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Correct me if I am wrong, but kvm_trim looks like a really bloated implementation of a bitwise AND. So remove this function and replace it with the real stuff(TM). Signed-off-by: Andre Przywara --- target-i386/kvm.c | 27 ++++++--------------------- 1 files changed, 6 insertions(+), 21 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 40f8303..f77e488 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -133,19 +133,6 @@ uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function, int reg) #endif -static void kvm_trim_features(uint32_t *features, uint32_t supported) -{ - int i; - uint32_t mask; - - for (i = 0; i < 32; ++i) { - mask = 1U << i; - if ((*features & mask) && !(supported & mask)) { - *features &= ~mask; - } - } -} - #ifdef CONFIG_KVM_PARA struct kvm_para_features { int cap; @@ -191,18 +178,16 @@ int kvm_arch_init_vcpu(CPUState *env) env->mp_state = KVM_MP_STATE_RUNNABLE; - kvm_trim_features(&env->cpuid_features, - kvm_arch_get_supported_cpuid(env, 1, R_EDX)); + env->cpuid_features &= kvm_arch_get_supported_cpuid(env, 1, R_EDX); i = env->cpuid_ext_features & CPUID_EXT_HYPERVISOR; - kvm_trim_features(&env->cpuid_ext_features, - kvm_arch_get_supported_cpuid(env, 1, R_ECX)); + env->cpuid_ext_features &= kvm_arch_get_supported_cpuid(env, 1, R_ECX); env->cpuid_ext_features |= i; - kvm_trim_features(&env->cpuid_ext2_features, - kvm_arch_get_supported_cpuid(env, 0x80000001, R_EDX)); - kvm_trim_features(&env->cpuid_ext3_features, - kvm_arch_get_supported_cpuid(env, 0x80000001, R_ECX)); + env->cpuid_ext2_features &= kvm_arch_get_supported_cpuid(env, 0x80000001, + R_EDX); + env->cpuid_ext3_features &= kvm_arch_get_supported_cpuid(env, 0x80000001, + R_ECX); cpuid_i = 0;