[PATCH v1 04/22] KVM: x86: check against irqchip_mode in ioapic_in_kernel()

David Hildenbrand
2017-03-14T13:35:01Z

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: David Hildenbrand <david@redhat.com>
---
arch/x86/kvm/ioapic.h | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/x86/kvm/ioapic.h b/arch/x86/kvm/ioapic.h
index 1cc6e54..9a62fe1 100644
--- a/arch/x86/kvm/ioapic.h
+++ b/arch/x86/kvm/ioapic.h
@@ -112,10 +112,7 @@ static inline struct kvm_ioapic *ioapic_irqchip(struct kvm *kvm)

static inline int ioapic_in_kernel(struct kvm *kvm)
{
- int ret;
-
- ret = (ioapic_irqchip(kvm) != NULL);
- return ret;
+ return kvm->arch.irqchip_mode == KVM_IRQCHIP_KERNEL;
}

void kvm_rtc_eoi_tracking_restore_one(struct kvm_vcpu *vcpu);
--
2.9.3