diff options
| -rw-r--r-- | kvm-all.c | 3 | ||||
| -rw-r--r-- | kvm-stub.c | 1 | ||||
| -rw-r--r-- | kvm.h | 11 | ||||
| -rw-r--r-- | target-i386/kvm.c | 4 |
4 files changed, 18 insertions, 1 deletions
diff --git a/kvm-all.c b/kvm-all.c index f420dfa368..0704055ce4 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -101,6 +101,7 @@ struct KVMState KVMState *kvm_state; bool kvm_kernel_irqchip; bool kvm_async_interrupts_allowed; +bool kvm_irqfds_allowed; static const KVMCapabilityInfo kvm_required_capabilites[] = { KVM_CAP_INFO(USER_MEMORY), @@ -1126,7 +1127,7 @@ static int kvm_irqchip_assign_irqfd(KVMState *s, int fd, int virq, bool assign) .flags = assign ? 0 : KVM_IRQFD_FLAG_DEASSIGN, }; - if (!kvm_irqchip_in_kernel()) { + if (!kvm_irqfds_enabled()) { return -ENOSYS; } diff --git a/kvm-stub.c b/kvm-stub.c index f2b0c61983..02e7fe0507 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -20,6 +20,7 @@ KVMState *kvm_state; bool kvm_kernel_irqchip; bool kvm_async_interrupts_allowed; +bool kvm_irqfds_allowed; int kvm_init_vcpu(CPUArchState *env) { diff --git a/kvm.h b/kvm.h index 47bf5ba2ae..21436ef5d2 100644 --- a/kvm.h +++ b/kvm.h @@ -25,6 +25,7 @@ extern int kvm_allowed; extern bool kvm_kernel_irqchip; extern bool kvm_async_interrupts_allowed; +extern bool kvm_irqfds_allowed; #if defined CONFIG_KVM || !defined NEED_CPU_H #define kvm_enabled() (kvm_allowed) @@ -40,10 +41,20 @@ extern bool kvm_async_interrupts_allowed; */ #define kvm_async_interrupts_enabled() (kvm_async_interrupts_allowed) +/** + * kvm_irqfds_enabled: + * + * Returns: true if we can use irqfds to inject interrupts into + * a KVM CPU (ie the kernel supports irqfds and we are running + * with a configuration where it is meaningful to use them). + */ +#define kvm_irqfds_enabled() (kvm_irqfds_allowed) + #else #define kvm_enabled() (0) #define kvm_irqchip_in_kernel() (false) #define kvm_async_interrupts_enabled() (false) +#define kvm_irqfds_enabled() (false) #endif struct kvm_run; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index e5decf7fc6..8c28fca4b6 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -2047,4 +2047,8 @@ void kvm_arch_init_irq_routing(KVMState *s) */ no_hpet = 1; } + /* We know at this point that we're using the in-kernel + * irqchip, so we can use irqfds. + */ + kvm_irqfds_allowed = true; } |