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

Commit 4d8e772b authored by Radim Krčmář's avatar Radim Krčmář Committed by Paolo Bonzini
Browse files

KVM: x86: reset lapic base in kvm_lapic_reset 



LAPIC is reset in xAPIC mode and the surrounding code expects that.
KVM never resets after initialization.  This patch is just for sanity.

Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c93de59d

arch/x86/kvm/lapic.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1763,8 +1763,11 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init_event) 
	/* Stop the timer in case it's a reset to an active apic */

	/* Stop the timer in case it's a reset to an active apic */

	hrtimer_cancel(&apic->lapic_timer.timer);

	hrtimer_cancel(&apic->lapic_timer.timer);





	if (!init_event)

	if (!init_event) {

		kvm_lapic_set_base(vcpu, APIC_DEFAULT_PHYS_BASE |

		                         MSR_IA32_APICBASE_ENABLE);

		kvm_apic_set_xapic_id(apic, vcpu->vcpu_id);

		kvm_apic_set_xapic_id(apic, vcpu->vcpu_id);

	}

	kvm_apic_set_version(apic->vcpu);

	kvm_apic_set_version(apic->vcpu);





	for (i = 0; i < KVM_APIC_LVT_NUM; i++)

	for (i = 0; i < KVM_APIC_LVT_NUM; i++)
@@ -1903,9 +1906,6 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu) 
	 * thinking that APIC satet has changed.

	 * thinking that APIC satet has changed.

	 */

	 */

	vcpu->arch.apic_base = MSR_IA32_APICBASE_ENABLE;

	vcpu->arch.apic_base = MSR_IA32_APICBASE_ENABLE;

	kvm_lapic_set_base(vcpu,

			APIC_DEFAULT_PHYS_BASE | MSR_IA32_APICBASE_ENABLE);



	static_key_slow_inc(&apic_sw_disabled.key); /* sw disabled at reset */

	static_key_slow_inc(&apic_sw_disabled.key); /* sw disabled at reset */

	kvm_lapic_reset(vcpu, false);

	kvm_lapic_reset(vcpu, false);

	kvm_iodevice_init(&apic->dev, &apic_mmio_ops);

	kvm_iodevice_init(&apic->dev, &apic_mmio_ops);