[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 6/7] kvm: Decouple 'GSI routing' from 'kernel irq
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH v2 6/7] kvm: Decouple 'GSI routing' from 'kernel irqchip' |
Date: |
Thu, 26 Jul 2012 15:35:16 +0100 |
Don't assume having an in-kernel irqchip means that GSI
routing is enabled.
Signed-off-by: Peter Maydell <address@hidden>
---
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;
}
--
1.7.5.4
- [Qemu-devel] [PATCH v2 0/7] split out uses of kvm_irqchip_in_kernel(), Peter Maydell, 2012/07/26
- [Qemu-devel] [PATCH v2 3/7] kvm: Move kvm_allows_irq0_override() to target-i386, fix return type, Peter Maydell, 2012/07/26
- [Qemu-devel] [PATCH v2 7/7] kvm: Add documentation comment for kvm_irqchip_in_kernel(), Peter Maydell, 2012/07/26
- [Qemu-devel] [PATCH v2 2/7] kvm: Rename kvm_irqchip_set_irq() to kvm_set_irq(), Peter Maydell, 2012/07/26
- [Qemu-devel] [PATCH v2 6/7] kvm: Decouple 'GSI routing' from 'kernel irqchip',
Peter Maydell <=
- [Qemu-devel] [PATCH v2 4/7] kvm: Decouple 'irqfds usable' from 'kernel irqchip', Peter Maydell, 2012/07/26
- [Qemu-devel] [PATCH v2 5/7] kvm: Decouple 'MSI routing via irqfds' from 'kernel irqchip', Peter Maydell, 2012/07/26
- [Qemu-devel] [PATCH v2 1/7] kvm: Decouple 'async interrupt delivery' from 'kernel irqchip', Peter Maydell, 2012/07/26