Commit df04d1d1 authored Jan 29, 2015 by Radim Krčmář Committed by Paolo Bonzini Jan 30, 2015

KVM: x86: check LAPIC presence when building apic_map



We forgot to re-check LAPIC after splitting the loop in commit
173beedc (KVM: x86: Software disabled APIC should still deliver
NMIs, 2014-11-02).

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Fixes: 173beedc
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 02512b2b

arch/x86/kvm/lapic.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -192,6 +192,9 @@ static void recalculate_apic_map(struct kvm *kvm)
		u16 cid, lid;
		u32 ldr, aid;

		if (!kvm_apic_present(vcpu))
		continue;

		aid = kvm_apic_id(apic);
		ldr = kvm_apic_get_reg(apic, APIC_LDR);
		cid = apic_cluster_id(new, ldr);