diff mbox series

[v2] KVM: Adding 'else' to reduce checking.

Message ID abea81a5-266f-7e0d-558a-b4b7aa49d3d4@gmail.com (mailing list archive)
State New, archived
Headers show
Series [v2] KVM: Adding 'else' to reduce checking. | expand

Commit Message

Haiwei Li Jan. 16, 2020, 9:03 a.m. UTC 
From 009bfba9b6f6b41018708323d9ca651ae2075900 Mon Sep 17 00:00:00 2001
From: Haiwei Li <lihaiwei@tencent.com>
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 <lihaiwei@tencent.com>
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
---
  arch/x86/kvm/lapic.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

         }
--
1.8.3.1

Comments

Paolo Bonzini Jan. 21, 2020, 12:15 p.m. UTC | #1 
On 16/01/20 10:03, Haiwei Li wrote:
> From 009bfba9b6f6b41018708323d9ca651ae2075900 Mon Sep 17 00:00:00 2001
> From: Haiwei Li <lihaiwei@tencent.com>
> 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 <lihaiwei@tencent.com>
> Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
> ---
>  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
> 

Queued, thanks.

Paolo
diff mbox series

Patch

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;