From patchwork Tue Feb 2 10:08:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 44276 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 14C70B7D4E for ; Tue, 2 Feb 2010 21:52:01 +1100 (EST) Received: from localhost ([127.0.0.1]:36347 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NcGM6-0006Ci-In for incoming@patchwork.ozlabs.org; Tue, 02 Feb 2010 05:51:38 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NcFgm-0002qz-1K for qemu-devel@nongnu.org; Tue, 02 Feb 2010 05:08:56 -0500 Received: from [199.232.76.173] (port=38615 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NcFgk-0002pz-AM for qemu-devel@nongnu.org; Tue, 02 Feb 2010 05:08:54 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NcFgQ-0006uH-Df for qemu-devel@nongnu.org; Tue, 02 Feb 2010 05:08:54 -0500 Received: from va3ehsobe003.messaging.microsoft.com ([216.32.180.13]:34260 helo=VA3EHSOBE003.bigfish.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_MD5:16) (Exim 4.60) (envelope-from ) id 1NcFgQ-0006tT-4J for qemu-devel@nongnu.org; Tue, 02 Feb 2010 05:08:34 -0500 Received: from mail36-va3-R.bigfish.com (10.7.14.243) by VA3EHSOBE003.bigfish.com (10.7.40.23) with Microsoft SMTP Server id 8.1.240.5; Tue, 2 Feb 2010 10:08:31 +0000 Received: from mail36-va3 (localhost [127.0.0.1]) by mail36-va3-R.bigfish.com (Postfix) with ESMTP id B5824120674; Tue, 2 Feb 2010 10:08:30 +0000 (UTC) X-SpamScore: -2 X-BigFish: VPS-2(zzab9bh936eMzz1202hzzz32i6bh43j64h) Received: from mail36-va3 (localhost.localdomain [127.0.0.1]) by mail36-va3 (MessageSwitch) id 1265105310446949_11124; Tue, 2 Feb 2010 10:08:30 +0000 (UTC) Received: from VA3EHSMHS014.bigfish.com (unknown [10.7.14.249]) by mail36-va3.bigfish.com (Postfix) with ESMTP id 5F7AA1A5004E; Tue, 2 Feb 2010 10:08:30 +0000 (UTC) Received: from ausb3extmailp01.amd.com (163.181.251.8) by VA3EHSMHS014.bigfish.com (10.7.99.24) with Microsoft SMTP Server (TLS) id 14.0.482.39; Tue, 2 Feb 2010 10:08:29 +0000 Received: from ausb3twp02.amd.com ([163.181.250.38]) by ausb3extmailp01.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id o12AA90b015776; Tue, 2 Feb 2010 04:10:12 -0600 X-WSS-ID: 0KX7LHW-02-G1H-02 X-M-MSG: Received: from sausexbh1.amd.com (sausexbh1.amd.com [163.181.22.101]) by ausb3twp02.amd.com (Tumbleweed MailGate 3.7.2) with ESMTP id 22790C84E8; Tue, 2 Feb 2010 04:08:20 -0600 (CST) Received: from sausexmb1.amd.com ([163.181.3.156]) by sausexbh1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 2 Feb 2010 04:08:24 -0600 Received: from seurexmb1.amd.com ([165.204.9.130]) by sausexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 2 Feb 2010 04:08:24 -0600 Received: from gwo.osrc.amd.com ([165.204.16.204]) by seurexmb1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 2 Feb 2010 11:08:19 +0100 Received: from localhost.localdomain (tronje.osrc.amd.com [165.204.15.48]) by gwo.osrc.amd.com (Postfix) with ESMTP id 8C8FA49C206; Tue, 2 Feb 2010 10:08:38 +0000 (GMT) From: Andre Przywara To: qemu-devel@nongnu.org Date: Tue, 2 Feb 2010 11:08:15 +0100 Message-ID: <1265105301-3455-8-git-send-email-andre.przywara@amd.com> X-Mailer: git-send-email 1.6.4 In-Reply-To: <1265105301-3455-1-git-send-email-andre.przywara@amd.com> References: <1265105301-3455-1-git-send-email-andre.przywara@amd.com> X-OriginalArrivalTime: 02 Feb 2010 10:08:19.0712 (UTC) FILETIME=[A52C1000:01CAA3EF] MIME-Version: 1.0 X-Reverse-DNS: unknown X-detected-operating-system: by monty-python.gnu.org: Windows 2000 SP4, XP SP1+ Cc: john.cooper@redhat.com, Andre Przywara Subject: [Qemu-devel] [PATCH 07/13] 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 5b093ce..daa65c1 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -125,19 +125,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; @@ -186,18 +173,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;