Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a10388e1 authored by Wanpeng Li's avatar Wanpeng Li Committed by Paolo Bonzini
Browse files

KVM: LAPIC: guarantee the timer is in tsc-deadline mode 



Check apic_lvtt_tscdeadline() mode directly instead of apic_lvtt_oneshot()
and apic_lvtt_period() to guarantee the timer is in tsc-deadline mode when
rdmsr MSR_IA32_TSCDEADLINE.

Suggested-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Yunhong Jiang <yunhong.jiang@intel.com>
Signed-off-by: default avatarWanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent 7d7f7da2

arch/x86/kvm/lapic.c

+2 −2
Original line number Diff line number Diff line
@@ -1711,8 +1711,8 @@ u64 kvm_get_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu) 
{

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



	if (!lapic_in_kernel(vcpu) || apic_lvtt_oneshot(apic) ||

			apic_lvtt_period(apic))

	if (!lapic_in_kernel(vcpu) ||

		!apic_lvtt_tscdeadline(apic))

		return 0;



	return apic->lapic_timer.tscdeadline;