From patchwork Fri Mar 26 11:27:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zuoqilin1@163.com X-Patchwork-Id: 12166415 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3BCB3C433DB for ; Fri, 26 Mar 2021 11:29:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F01E061A36 for ; Fri, 26 Mar 2021 11:29:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229982AbhCZL2y (ORCPT ); Fri, 26 Mar 2021 07:28:54 -0400 Received: from m12-14.163.com ([220.181.12.14]:37540 "EHLO m12-14.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229738AbhCZL2f (ORCPT ); Fri, 26 Mar 2021 07:28:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=VqcQ3 QwxKEEaQnL4ibnWt3XJl6W8pH63gUjHJUgNVrA=; b=Kq6ECmXkpn9wM1Iy7VpGJ zzSFR4RDnUBZrQvPXR4jAOEQ1Cx78rJoz9dptuOwy2J/e5zsA+lrR9tEqPnGItMd rW2p2C77FpgM/6WJw0DU1ayhR4v+vVF2k29cKrmXTDQH+sq/pMhcHNspBR6MLa2m 38C5cnwRalQ5JQgy3zPcMo= Received: from COOL-20201210PM.ccdomain.com (unknown [218.94.48.178]) by smtp10 (Coremail) with SMTP id DsCowADHaXwexV1gLKxVAQ--.32339S2; Fri, 26 Mar 2021 19:27:31 +0800 (CST) From: zuoqilin1@163.com To: mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, zuoqilin Subject: [PATCH] x86: Simplify the return expression Date: Fri, 26 Mar 2021 19:27:24 +0800 Message-Id: <20210326112724.1563-1-zuoqilin1@163.com> X-Mailer: git-send-email 2.28.0.windows.1 MIME-Version: 1.0 X-CM-TRANSID: DsCowADHaXwexV1gLKxVAQ--.32339S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7JF1fXw4xCryUXw15XFyrJFb_yoW3Xrg_Ja 13Ww45KFZa93y7Aw17Aws5KF1S9w4kXry5Xa18Kay5trn0ya98Za1kKF4fXrW2grW3KFWf X3yDGry7Cr4UWjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUnhSdPUUUUU== X-Originating-IP: [218.94.48.178] X-CM-SenderInfo: 52xr1xpolqiqqrwthudrp/1tbiZQNhiV8ZNb3ALAAAss Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: zuoqilin Simplify the return expression of kvm_compute_tsc_offset(). Signed-off-by: zuoqilin --- arch/x86/kvm/x86.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index fe806e8..3906c1b 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2209,11 +2209,7 @@ u64 kvm_scale_tsc(struct kvm_vcpu *vcpu, u64 tsc) static u64 kvm_compute_tsc_offset(struct kvm_vcpu *vcpu, u64 target_tsc) { - u64 tsc; - - tsc = kvm_scale_tsc(vcpu, rdtsc()); - - return target_tsc - tsc; + return target_tsc - kvm_scale_tsc(vcpu, rdtsc()); } u64 kvm_read_l1_tsc(struct kvm_vcpu *vcpu, u64 host_tsc)