From mboxrd@z Thu Jan 1 00:00:00 1970 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=-8.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 0D5B6C33CB1 for ; Thu, 16 Jan 2020 09:04:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CA1A72087E for ; Thu, 16 Jan 2020 09:04:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="umn+IqrA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730613AbgAPJEH (ORCPT ); Thu, 16 Jan 2020 04:04:07 -0500 Received: from mail-pj1-f67.google.com ([209.85.216.67]:35320 "EHLO mail-pj1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725973AbgAPJEH (ORCPT ); Thu, 16 Jan 2020 04:04:07 -0500 Received: by mail-pj1-f67.google.com with SMTP id s7so1281783pjc.0; Thu, 16 Jan 2020 01:04:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=U+3BCSnWn4TsegpodIg+CCuuc8hYDYmEd54pNj+hQe8=; b=umn+IqrAkUg8Lczfv/av+jmNOPAaBCCOriIQM0WcqEyLpzjtkocNVLbEa7HftEDRCp ZXrgkUD/Q8sbt85K9wh9BNGjWywMrU348smx5dZlr7zow7tbxh81IZg9j6v3yfsbWOab r6o+KuBm8NxqDy3DaRLejhSGZ5oR9PGwbL3n5sY5WG0g7DnpcE6hxt1YdENgv5vsQopZ kC5zM/ktRUwjGnmlKrT4/zl87zRwnno7CzLsYApMSABEJYU9o1glLtqbYhAKssFDYJk8 OrD7gC9jgvYm6xZLBRn96UidFDSwYaCjiUnXuUeHE4261LVOm1JiyWYfnUbuIpnve7fr AOQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=U+3BCSnWn4TsegpodIg+CCuuc8hYDYmEd54pNj+hQe8=; b=ge7tcrX56Da29lm7zsrVSlvS6o6jutM3CBVSfu0U1uUUokGGvS64ihWdS/oXvRqDpP v9OorUlPNLbDj8vT+NOyHY0k9io4jRC5+t/Ug37uv83Y6oWu9AajHKXjuTHjvHQogixE TWeMi+wUkB+nHWK76hn+bAFjP0XS8zwXKg+eQu7aSt8zIfdjh9S32HB62a0XHox00Zeb WbamovQw4blHKkWZeWRvfW25Gy2QhCj2hbd6FdP+JeK/O2lgdGXu1+z/Qoqp5OtPFC8m /pMq5Mvj2XwAxhyY7UvNw8fVuosskWQba8aD2ScbsdtWMhLb6vieJf6GlDUPXlhzNKsJ VPTA== X-Gm-Message-State: APjAAAWq+szGLfqqrmxWu+Qlxk03glccqwqA4r/T2SSeP4hmX/taB0Kw bUdNGd8t/WEsV44XmcW0/Q== X-Google-Smtp-Source: APXvYqzw0XcAtZanZ7artcVDGxxVLV/xsH+qbe+U725HIgRi07bmtp2XMXD8Wos42K2GvIsNfJAESA== X-Received: by 2002:a17:90b:2286:: with SMTP id kx6mr5562347pjb.95.1579165446729; Thu, 16 Jan 2020 01:04:06 -0800 (PST) Received: from [127.0.0.1] ([103.7.29.6]) by smtp.gmail.com with ESMTPSA id 3sm2646801pjg.27.2020.01.16.01.04.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 16 Jan 2020 01:04:06 -0800 (PST) To: "linux-kernel@vger.kernel.org" , "kvm@vger.kernel.org" , "x86@kernel.org" Cc: "pbonzini@redhat.com" , Sean Christopherson , "vkuznets@redhat.com" , "wanpengli@tencent.com" , "jmattson@google.com" , "joro@8bytes.org" , "tglx@linutronix.de" , "mingo@redhat.com" , "bp@alien8.de" , "hpa@zytor.com" From: Haiwei Li Subject: [PATCH v2] KVM: Adding 'else' to reduce checking. Message-ID: Date: Thu, 16 Jan 2020 17:03:56 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:68.0) Gecko/20100101 Thunderbird/68.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From 009bfba9b6f6b41018708323d9ca651ae2075900 Mon Sep 17 00:00:00 2001 From: Haiwei Li Date: Thu, 16 Jan 2020 16:50:21 +0800 Subject: [PATCH] Adding 'else' to reduce checking. These two conditions are in conflict, adding 'else' to reduce checking. Signed-off-by: Haiwei Li Reviewed-by: Vitaly Kuznetsov Reviewed-by: Miaohe Lin --- arch/x86/kvm/lapic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 679692b..f1cfb94 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1571,9 +1571,9 @@ static void kvm_apic_inject_pending_timer_irqs(struct kvm_lapic *apic) struct kvm_timer *ktimer = &apic->lapic_timer; kvm_apic_local_deliver(apic, APIC_LVTT); - if (apic_lvtt_tscdeadline(apic)) + if (apic_lvtt_tscdeadline(apic)) { ktimer->tscdeadline = 0; - if (apic_lvtt_oneshot(apic)) { + } else if (apic_lvtt_oneshot(apic)) { ktimer->tscdeadline = 0; ktimer->target_expiration = 0; } -- 1.8.3.1