[RFC,03/21] KVM: x86: check against irqchip_mode in pic_in_kernel()
diff mbox

Message ID 20170306131815.12033-4-david@redhat.com
State New
Headers show

Commit Message

David Hildenbrand March 6, 2017, 1:17 p.m. UTC
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 mbox

diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h
index 9ebb6f5..150c3b3 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)