Explorar o código

KVM: x86: check LAPIC presence when building apic_map

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

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Fixes: 173beedc1601f51dae9d579aa7a414c5aa8f700b
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Radim Krčmář %!s(int64=10) %!d(string=hai) anos
pai
achega
df04d1d191
Modificáronse 1 ficheiros con 3 adicións e 0 borrados
  1. 3 0
      arch/x86/kvm/lapic.c

+ 3 - 0
arch/x86/kvm/lapic.c

@@ -192,6 +192,9 @@ static void recalculate_apic_map(struct kvm *kvm)
 		u16 cid, lid;
 		u16 cid, lid;
 		u32 ldr, aid;
 		u32 ldr, aid;
 
 
+		if (!kvm_apic_present(vcpu))
+			continue;
+
 		aid = kvm_apic_id(apic);
 		aid = kvm_apic_id(apic);
 		ldr = kvm_apic_get_reg(apic, APIC_LDR);
 		ldr = kvm_apic_get_reg(apic, APIC_LDR);
 		cid = apic_cluster_id(new, ldr);
 		cid = apic_cluster_id(new, ldr);