Commit 1e3161b4 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: consolidate "has lapic" checks into irq.c 



Do for kvm_cpu_has_pending_timer and kvm_inject_pending_timer_irqs
what the other irq.c routines have been doing.

Reviewed-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f8543d6a

arch/x86/kvm/irq.c

+6 −3
Original line number Diff line number Diff line
@@ -33,7 +33,10 @@ 
 */

int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)

{

	if (lapic_in_kernel(vcpu))

		return apic_has_pending_timer(vcpu);



	return 0;

}

EXPORT_SYMBOL(kvm_cpu_has_pending_timer);
@@ -137,8 +140,8 @@ EXPORT_SYMBOL_GPL(kvm_cpu_get_interrupt); 


void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu)

{

	if (lapic_in_kernel(vcpu))

		kvm_inject_apic_timer_irqs(vcpu);

	/* TODO: PIT, RTC etc. */

}

EXPORT_SYMBOL_GPL(kvm_inject_pending_timer_irqs);

arch/x86/kvm/lapic.c

+1 −5
Original line number Diff line number Diff line
@@ -1801,8 +1801,7 @@ int apic_has_pending_timer(struct kvm_vcpu *vcpu) 
{

	struct kvm_lapic *apic = vcpu->arch.apic;



	if (kvm_vcpu_has_lapic(vcpu) && apic_enabled(apic) &&

			apic_lvt_enabled(apic, APIC_LVTT))

	if (apic_enabled(apic) && apic_lvt_enabled(apic, APIC_LVTT))

		return atomic_read(&apic->lapic_timer.pending);



	return 0;
@@ -1927,9 +1926,6 @@ void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu) 
{

	struct kvm_lapic *apic = vcpu->arch.apic;



	if (!kvm_vcpu_has_lapic(vcpu))

		return;



	if (atomic_read(&apic->lapic_timer.pending) > 0) {

		kvm_apic_local_deliver(apic, APIC_LVTT);

		if (apic_lvtt_tscdeadline(apic))