[PATCH v1 03/22] KVM: x86: check against irqchip_mode in pic_in_kernel()

David Hildenbrand
2017-03-14T13:34:59Z

Let's avoid checking against kvm->arch.vpic. We have kvm->arch.irqchip_mode
for that now.

KVM_IRQCHIP_KERNEL implies a fully inititalized pic, while kvm->arch.vpic
might temporarily be set but invalidated again if e.g. kvm_ioapic_init()
fails when setting KVM_CREATE_IRQCHIP. Although current users seem to be
fine, this avoids future bugs.

Signed-off-by: David Hildenbrand <david@redhat.com>
---
arch/x86/kvm/irq.h | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h
index 7fa2480..184306e 100644
--- a/arch/x86/kvm/irq.h
+++ b/arch/x86/kvm/irq.h
@@ -85,10 +85,7 @@ static inline struct kvm_pic *pic_irqchip(struct kvm *kvm)

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

static inline int irqchip_split(struct kvm *kvm)
--
2.9.3