From patchwork Thu Sep 10 22:20:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 33397 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 bilbo.ozlabs.org (Postfix) with ESMTPS id A8B79B6F56 for ; Fri, 11 Sep 2009 08:41:22 +1000 (EST) Received: from localhost ([127.0.0.1]:45631 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlsKN-0007aW-KB for incoming@patchwork.ozlabs.org; Thu, 10 Sep 2009 18:41:19 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mls41-0004fB-Dy for qemu-devel@nongnu.org; Thu, 10 Sep 2009 18:24:25 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mls3u-0004Z0-ED for qemu-devel@nongnu.org; Thu, 10 Sep 2009 18:24:22 -0400 Received: from [199.232.76.173] (port=40037 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mls3t-0004Yn-Nz for qemu-devel@nongnu.org; Thu, 10 Sep 2009 18:24:17 -0400 Received: from tx2ehsobe002.messaging.microsoft.com ([65.55.88.12]:30373 helo=TX2EHSOBE003.bigfish.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_MD5:16) (Exim 4.60) (envelope-from ) id 1Mls3t-0001Kb-AF for qemu-devel@nongnu.org; Thu, 10 Sep 2009 18:24:17 -0400 Received: from mail101-tx2-R.bigfish.com (10.9.14.244) by TX2EHSOBE003.bigfish.com (10.9.40.23) with Microsoft SMTP Server id 8.1.340.0; Thu, 10 Sep 2009 22:24:16 +0000 Received: from mail101-tx2 (localhost.localdomain [127.0.0.1]) by mail101-tx2-R.bigfish.com (Postfix) with ESMTP id 3DCF88303B5 for ; Thu, 10 Sep 2009 22:24:16 +0000 (UTC) Received: by mail101-tx2 (MessageSwitch) id 1252621455204318_8962; Thu, 10 Sep 2009 22:24:15 +0000 (UCT) Received: from TX2EHSMHS012.bigfish.com (unknown [10.9.14.250]) by mail101-tx2.bigfish.com (Postfix) with ESMTP id 2588B134004B for ; Thu, 10 Sep 2009 22:24:15 +0000 (UTC) Received: from ausb3extmailp02.amd.com (163.181.251.22) by TX2EHSMHS012.bigfish.com (10.9.99.112) with Microsoft SMTP Server (TLS) id 14.0.482.32; Thu, 10 Sep 2009 22:24:14 +0000 Received: from ausb3twp01.amd.com (ausb3twp01.amd.com [163.181.250.37]) by ausb3extmailp02.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id n8AMOAsc021755 for ; Thu, 10 Sep 2009 17:24:13 -0500 X-WSS-ID: 0KPS0W9-01-L7D-02 X-M-MSG: Received: from sausexbh2.amd.com (SAUSEXBH2.amd.com [163.181.22.102]) by ausb3twp01.amd.com (Tumbleweed MailGate 3.7.0) with ESMTP id 2161D10284DB for ; Thu, 10 Sep 2009 17:24:09 -0500 (CDT) Received: from sausexmb4.amd.com ([163.181.3.15]) by sausexbh2.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 10 Sep 2009 17:24:09 -0500 Received: from SDRSEXMB1.amd.com ([172.20.3.116]) by sausexmb4.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 10 Sep 2009 17:24:09 -0500 Received: from localhost.localdomain ([165.204.15.42]) by SDRSEXMB1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 11 Sep 2009 00:23:56 +0200 From: Andre Przywara To: qemu-devel@nongnu.org Date: Fri, 11 Sep 2009 00:20:53 +0200 Message-ID: <1252621257-26364-9-git-send-email-andre.przywara@amd.com> X-Mailer: git-send-email 1.6.1.3 In-Reply-To: <1252621257-26364-1-git-send-email-andre.przywara@amd.com> References: <1252621257-26364-1-git-send-email-andre.przywara@amd.com> X-OriginalArrivalTime: 10 Sep 2009 22:23:56.0418 (UTC) FILETIME=[62CD2E20:01CA3265] MIME-Version: 1.0 X-Reverse-DNS: ausb3extmailp02.amd.com X-detected-operating-system: by monty-python.gnu.org: Windows 2000 SP4, XP SP1+ Cc: Andre Przywara Subject: [Qemu-devel] [PATCH 08/12] 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. 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 cab9fcc..ebc6c5a 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -117,19 +117,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; - } - } -} - int kvm_arch_init_vcpu(CPUState *env) { struct { @@ -141,18 +128,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;