Re: [PATCH v2 1/2] KVM: x86/xen: PV oneshot timer fixes

[Paolo Bonzini <pbonzini@xxxxxxxxxx>]

On 3/9/22 17:41, David Woodhouse wrote:
> diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c
> index af2d26fc5458..f371f1292ca3 100644
> --- a/arch/x86/kvm/irq.c
> +++ b/arch/x86/kvm/irq.c
> @@ -156,7 +156,6 @@ void __kvm_migrate_timers(struct kvm_vcpu *vcpu)
>   {
>   	__kvm_migrate_apic_timer(vcpu);
>   	__kvm_migrate_pit_timer(vcpu);
> -	__kvm_migrate_xen_timer(vcpu);
>   	static_call_cond(kvm_x86_migrate_timers)(vcpu);
>   }
> diff --git a/arch/x86/kvm/xen.h b/arch/x86/kvm/xen.h
> index ad0876a7c301..2bbbc1a3953e 100644
> --- a/arch/x86/kvm/xen.h
> +++ b/arch/x86/kvm/xen.h
> @@ -75,7 +75,6 @@ static inline int kvm_xen_has_pending_timer(struct kvm_vcpu *vcpu)
>   	return 0;
>   }
>   
> -void __kvm_migrate_xen_timer(struct kvm_vcpu *vcpu);
>   void kvm_xen_inject_timer_irqs(struct kvm_vcpu *vcpu);
>   #else
>   static inline int kvm_xen_write_hypercall_page(struct kvm_vcpu *vcpu, u64 data)
> -- 2.33.1

Squashed, thanks.  But---sure you want to get rid of timer migration?

Paolo