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

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

KVM: lapic: don't recalculate apic map table twice when enabling LAPIC 



APIC map table is recalculated during reset APIC ID to the initial value
when enabling LAPIC. This patch move the recalculate_apic_map() to the
next branch since we don't need to recalculate apic map twice in current
codes.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarWanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ba913e4f

arch/x86/kvm/lapic.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -1761,10 +1761,11 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value) 
		if (value & MSR_IA32_APICBASE_ENABLE) {

		if (value & MSR_IA32_APICBASE_ENABLE) {

			kvm_apic_set_xapic_id(apic, vcpu->vcpu_id);

			kvm_apic_set_xapic_id(apic, vcpu->vcpu_id);

			static_key_slow_dec_deferred(&apic_hw_disabled);

			static_key_slow_dec_deferred(&apic_hw_disabled);

		} else

		} else {

			static_key_slow_inc(&apic_hw_disabled.key);

			static_key_slow_inc(&apic_hw_disabled.key);

			recalculate_apic_map(vcpu->kvm);

			recalculate_apic_map(vcpu->kvm);

		}

		}

	}





	if ((old_value ^ value) & X2APIC_ENABLE) {

	if ((old_value ^ value) & X2APIC_ENABLE) {

		if (value & X2APIC_ENABLE) {

		if (value & X2APIC_ENABLE) {