From patchwork Thu Jul 26 14:35:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 173444 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 386CE2C0098 for ; Fri, 27 Jul 2012 00:36:04 +1000 (EST) Received: from localhost ([::1]:45423 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SuPAX-0001FE-SU for incoming@patchwork.ozlabs.org; Thu, 26 Jul 2012 10:36:01 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SuPA9-0000os-B0 for qemu-devel@nongnu.org; Thu, 26 Jul 2012 10:35:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SuPA1-0005FY-2u for qemu-devel@nongnu.org; Thu, 26 Jul 2012 10:35:37 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:35648) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SuPA0-0005EA-Qr for qemu-devel@nongnu.org; Thu, 26 Jul 2012 10:35:28 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1SuP9q-00073W-7M; Thu, 26 Jul 2012 15:35:18 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 26 Jul 2012 15:35:16 +0100 Message-Id: <1343313317-27087-7-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1343313317-27087-1-git-send-email-peter.maydell@linaro.org> References: <1343313317-27087-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: Alexander Graf , Marcelo Tosatti , Jan Kiszka , Avi Kivity , patches@linaro.org Subject: [Qemu-devel] [PATCH v2 6/7] kvm: Decouple 'GSI routing' from 'kernel irqchip' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Don't assume having an in-kernel irqchip means that GSI routing is enabled. Signed-off-by: Peter Maydell --- kvm-all.c | 3 ++- kvm-stub.c | 1 + kvm.h | 10 ++++++++++ target-i386/kvm.c | 3 ++- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index cdacd74..6def6c9 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -103,6 +103,7 @@ bool kvm_kernel_irqchip; bool kvm_async_interrupts_allowed; bool kvm_irqfds_allowed; bool kvm_msi_via_irqfd_allowed; +bool kvm_gsi_routing_allowed; static const KVMCapabilityInfo kvm_required_capabilites[] = { KVM_CAP_INFO(USER_MEMORY), @@ -1099,7 +1100,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg) struct kvm_irq_routing_entry kroute; int virq; - if (!kvm_irqchip_in_kernel()) { + if (!kvm_gsi_routing_enabled()) { return -ENOSYS; } diff --git a/kvm-stub.c b/kvm-stub.c index 158bb7b..94c9ea1 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -22,6 +22,7 @@ bool kvm_kernel_irqchip; bool kvm_async_interrupts_allowed; bool kvm_irqfds_allowed; bool kvm_msi_via_irqfd_allowed; +bool kvm_gsi_routing_allowed; int kvm_init_vcpu(CPUArchState *env) { diff --git a/kvm.h b/kvm.h index 34d32c7..444ed2e 100644 --- a/kvm.h +++ b/kvm.h @@ -27,6 +27,7 @@ extern bool kvm_kernel_irqchip; extern bool kvm_async_interrupts_allowed; extern bool kvm_irqfds_allowed; extern bool kvm_msi_via_irqfd_allowed; +extern bool kvm_gsi_routing_allowed; #if defined CONFIG_KVM || !defined NEED_CPU_H #define kvm_enabled() (kvm_allowed) @@ -60,12 +61,21 @@ extern bool kvm_msi_via_irqfd_allowed; */ #define kvm_msi_via_irqfd_enabled() (kvm_msi_via_irqfd_allowed) +/** + * kvm_gsi_routing_enabled: + * + * Returns: true if GSI routing is enabled (ie the kernel supports + * it and we're running in a configuration that permits it). + */ +#define kvm_gsi_routing_enabled() (kvm_gsi_routing_allowed) + #else #define kvm_enabled() (0) #define kvm_irqchip_in_kernel() (false) #define kvm_async_interrupts_enabled() (false) #define kvm_irqfds_enabled() (false) #define kvm_msi_via_irqfd_enabled() (false) +#define kvm_gsi_routing_allowed() (false) #endif struct kvm_run; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 46ee906..e58460f 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -2047,8 +2047,9 @@ void kvm_arch_init_irq_routing(KVMState *s) } /* We know at this point that we're using the in-kernel * irqchip, so we can use irqfds, and on x86 we know - * we can use msi via irqfd. + * we can use msi via irqfd and GSI routing. */ kvm_irqfds_allowed = true; kvm_msi_via_irqfd_allowed = true; + kvm_gsi_routing_allowed = true; }