Commit f567080b authored by David Hildenbrand's avatar David Hildenbrand Committed by Radim Krčmář

KVM: x86: check against irqchip_mode in ioapic_in_kernel()

KVM_IRQCHIP_KERNEL implies a fully inititalized ioapic, while
kvm->arch.vioapic might temporarily be set but invalidated again if e.g.
setting of default routing fails when setting KVM_CREATE_IRQCHIP.
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent 19d25a0e
...@@ -112,10 +112,11 @@ static inline struct kvm_ioapic *ioapic_irqchip(struct kvm *kvm) ...@@ -112,10 +112,11 @@ static inline struct kvm_ioapic *ioapic_irqchip(struct kvm *kvm)
static inline int ioapic_in_kernel(struct kvm *kvm) static inline int ioapic_in_kernel(struct kvm *kvm)
{ {
int ret; int mode = kvm->arch.irqchip_mode;
ret = (ioapic_irqchip(kvm) != NULL); /* Matches smp_wmb() when setting irqchip_mode */
return ret; smp_rmb();
return mode == KVM_IRQCHIP_KERNEL;
} }
void kvm_rtc_eoi_tracking_restore_one(struct kvm_vcpu *vcpu); void kvm_rtc_eoi_tracking_restore_one(struct kvm_vcpu *vcpu);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment