From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Hildenbrand Subject: [PATCH RFC 03/21] KVM: x86: check against irqchip_mode in pic_in_kernel() Date: Mon, 6 Mar 2017 14:17:57 +0100 Message-ID: <20170306131815.12033-4-david@redhat.com> References: <20170306131815.12033-1-david@redhat.com> Cc: Paolo Bonzini , rkrcmar@redhat.com, david@redhat.com To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:43578 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753680AbdCFNZP (ORCPT ); Mon, 6 Mar 2017 08:25:15 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5AD4D883A6 for ; Mon, 6 Mar 2017 13:18:23 +0000 (UTC) In-Reply-To: <20170306131815.12033-1-david@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: 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 --- 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 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) -- 2.9.3