Commit 3ce4dc17 authored by Miaohe Lin's avatar Miaohe Lin Committed by Paolo Bonzini
Browse files

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: default avatarMiaohe Lin <linmiaohe@huawei.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 767b839a

arch/x86/kvm/lapic.c

+3 −4
Original line number Diff line number Diff line
@@ -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)