diff mbox series

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

Message ID 1596521448-4010-1-git-send-email-wanpengli@tencent.com (mailing list archive)
State New, archived
Headers show
Series [1/2] KVM: LAPIC: Return 0 when getting the tscdeadline timer if the lapic is hw disabled | expand

Commit Message

Wanpeng Li Aug. 4, 2020, 6:10 a.m. UTC 
From: Wanpeng Li <wanpengli@tencent.com>

Return 0 when getting the tscdeadline timer if the lapic is hw disabled

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
---
 arch/x86/kvm/lapic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Sean Christopherson Aug. 4, 2020, 9:19 p.m. UTC | #1 
On Tue, Aug 04, 2020 at 02:10:47PM +0800, Wanpeng Li wrote:
> From: Wanpeng Li <wanpengli@tencent.com>
> 
> Return 0 when getting the tscdeadline timer if the lapic is hw disabled
> 
> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
> ---
>  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
>
Wanpeng Li Aug. 10, 2020, 9:09 a.m. UTC | #2 
On Wed, 5 Aug 2020 at 05:19, Sean Christopherson
<sean.j.christopherson@intel.com> wrote:
>
> On Tue, Aug 04, 2020 at 02:10:47PM +0800, Wanpeng Li wrote:
> > From: Wanpeng Li <wanpengli@tencent.com>
> >
> > Return 0 when getting the tscdeadline timer if the lapic is hw disabled
> >
> > Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> > Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
> > ---
> >  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)

Agreed, Paolo do you need I send another version or you can fix up
when applying?

    Wanpeng
diff mbox series

Patch

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))
 		return 0;