From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Hildenbrand Subject: [PATCH v1 22/22] KVM: x86: use irqchip_kernel() to check for pic+ioapic Date: Tue, 14 Mar 2017 14:34:50 +0100 Message-ID: <20170314133450.13259-23-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]:38918 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751978AbdCNNff (ORCPT ); Tue, 14 Mar 2017 09:35:35 -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 8CAA380464 for ; Tue, 14 Mar 2017 13:35:35 +0000 (UTC) In-Reply-To: <20170314133450.13259-1-david@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Although the current check is not wrong, this check explicitly includes the pic. Signed-off-by: David Hildenbrand --- arch/x86/kvm/irq_comm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c index 1728ff1..5494395 100644 --- a/arch/x86/kvm/irq_comm.c +++ b/arch/x86/kvm/irq_comm.c @@ -232,7 +232,7 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id) goto unlock; } clear_bit(irq_source_id, &kvm->arch.irq_sources_bitmap); - if (!ioapic_in_kernel(kvm)) + if (!irqchip_kernel(kvm)) goto unlock; kvm_ioapic_clear_all(kvm->arch.vioapic, irq_source_id); -- 2.9.3