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

KVM: x86: reset APIC ID when enabling LAPIC 



APIC ID should be set to the initial APIC ID when enabling LAPIC.
This only matters if the guest changes APIC ID.  No sane OS does that.

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

arch/x86/kvm/lapic.c

+3 −2
Original line number Diff line number Diff line
@@ -1720,9 +1720,10 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value) 


	/* update jump label if enable bit changes */

	if ((old_value ^ value) & MSR_IA32_APICBASE_ENABLE) {

		if (value & MSR_IA32_APICBASE_ENABLE)

		if (value & MSR_IA32_APICBASE_ENABLE) {

			kvm_apic_set_xapic_id(apic, vcpu->vcpu_id);

			static_key_slow_dec_deferred(&apic_hw_disabled);

		else

		} else

			static_key_slow_inc(&apic_hw_disabled.key);

		recalculate_apic_map(vcpu->kvm);

	}