Re: [PATCH 2/3] KVM: x86: consolidate "has lapic" checks into irq.c

[Radim KrÄmÃÅ]

2016-02-08 17:15+0100, Paolo Bonzini:
> Do for kvm_cpu_has_pending_timer and kvm_inject_pending_timer_irqs
> what the other irq.c routines have been doing.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> ---
> diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c
> @@ -33,7 +33,10 @@
>   */
>  int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)
>  {
> -	return apic_has_pending_timer(vcpu);
> +	if (lapic_in_kernel(vcpu))
> +		return apic_has_pending_timer(vcpu);
> +
> +	return true;

Apart from int/bool mismatch, it returned 0 before and that was correct.