diff options
| author |   Miaohe Lin <linmiaohe@huawei.com> | 2020-01-18 10:50:37 +0800 |
|---|---|---|
| committer |   Paolo Bonzini <pbonzini@redhat.com> | 2020-01-27 19:59:45 +0100 |
| commit | 3ce4dc17e0c1e7280d53abeb85ce851a88868c63 (patch) | |
| tree | 3d5f354ad42add6e6933215c8b880eabdcfdc9e4 /arch/x86/kvm/lapic.c | |
| parent | KVM: x86: avoid clearing pending exception event twice (diff) | |
| download | linux-dev-3ce4dc17e0c1e7280d53abeb85ce851a88868c63.tar.xz linux-dev-3ce4dc17e0c1e7280d53abeb85ce851a88868c63.zip | |
KVM: apic: short-circuit kvm_apic_accept_pic_intr() when pic intr is accepted
Short-circuit kvm_apic_accept_pic_intr() when pic intr is accepted, there
is no need to proceed further. Also remove unnecessary var r.
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 865edce27a6a..286396c0aa7d 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -2375,14 +2375,13 @@ int kvm_apic_has_interrupt(struct kvm_vcpu *vcpu) int kvm_apic_accept_pic_intr(struct kvm_vcpu *vcpu) { u32 lvt0 = kvm_lapic_get_reg(vcpu->arch.apic, APIC_LVT0); - int r = 0; if (!kvm_apic_hw_enabled(vcpu->arch.apic)) - r = 1; + return 1; if ((lvt0 & APIC_LVT_MASKED) == 0 && GET_APIC_DELIVERY_MODE(lvt0) == APIC_MODE_EXTINT) - r = 1; - return r; + return 1; + return 0; } void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu) |