Re: [PATCH 1/2] KVM: LAPIC: Return 0 when getting the tscdeadline timer if the lapic is hw disabled

From: Sean Christopherson
Date: Tue Aug 04 2020 - 17:19:18 EST


On Tue, Aug 04, 2020 at 02:10:47PM +0800, Wanpeng Li wrote:
> From: Wanpeng Li <wanpengli@xxxxxxxxxxx>
>
> Return 0 when getting the tscdeadline timer if the lapic is hw disabled
>
> Suggested-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> Signed-off-by: Wanpeng Li <wanpengli@xxxxxxxxxxx>
> ---
> arch/x86/kvm/lapic.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> index cfb8504..d89ab48 100644
> --- a/arch/x86/kvm/lapic.c
> +++ b/arch/x86/kvm/lapic.c
> @@ -2182,7 +2182,7 @@ u64 kvm_get_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu)
> {
> struct kvm_lapic *apic = vcpu->arch.apic;
>
> - if (!lapic_in_kernel(vcpu) ||
> + if (!kvm_apic_present(vcpu) ||
> !apic_lvtt_tscdeadline(apic))

Paolo, want want to fix up the indentation when applying?

if (!kvm_apic_present(vcpu) || !apic_lvtt_tscdeadline(apic)


> return 0;
>
> --
> 2.7.4
>