From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Hildenbrand Subject: [PATCH v1 04/22] KVM: x86: check against irqchip_mode in ioapic_in_kernel() Date: Tue, 14 Mar 2017 14:34:32 +0100 Message-ID: <20170314133450.13259-5-david@redhat.com> References: <20170314133450.13259-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]:33522 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751592AbdCNNfB (ORCPT ); Tue, 14 Mar 2017 09:35:01 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (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 289423D94E for ; Tue, 14 Mar 2017 13:35:01 +0000 (UTC) In-Reply-To: <20170314133450.13259-1-david@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: 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 --- 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