From 39853bbc497d4ca19c553a620afdc459e81d67ce Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Thu, 17 May 2012 10:32:36 -0300 Subject: [PATCH] kvm: Introduce kvm_irqchip_add/remove_irqfd Add services to associate an eventfd file descriptor as input with an IRQ line as output. Such a line can be an input pin of an in-kernel irqchip or a virtual line returned by kvm_irqchip_add_route. Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity --- kvm-all.c | 30 ++++++++++++++++++++++++++++++ kvm-stub.c | 10 ++++++++++ kvm.h | 3 +++ 3 files changed, 43 insertions(+) diff --git a/kvm-all.c b/kvm-all.c index e96f092842..489ee53ad2 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1108,6 +1108,21 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg) return virq; } +static int kvm_irqchip_assign_irqfd(KVMState *s, int fd, int virq, bool assign) +{ + struct kvm_irqfd irqfd = { + .fd = fd, + .gsi = virq, + .flags = assign ? 0 : KVM_IRQFD_FLAG_DEASSIGN, + }; + + if (!kvm_irqchip_in_kernel()) { + return -ENOSYS; + } + + return kvm_vm_ioctl(s, KVM_IRQFD, &irqfd); +} + #else /* !KVM_CAP_IRQ_ROUTING */ static void kvm_init_irq_routing(KVMState *s) @@ -1123,8 +1138,23 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg) { abort(); } + +static int kvm_irqchip_assign_irqfd(KVMState *s, int fd, int virq, bool assign) +{ + abort(); +} #endif /* !KVM_CAP_IRQ_ROUTING */ +int kvm_irqchip_add_irqfd(KVMState *s, int fd, int virq) +{ + return kvm_irqchip_assign_irqfd(s, fd, virq, true); +} + +int kvm_irqchip_remove_irqfd(KVMState *s, int fd, int virq) +{ + return kvm_irqchip_assign_irqfd(s, fd, virq, false); +} + static int kvm_irqchip_create(KVMState *s) { QemuOptsList *list = qemu_find_opts("machine"); diff --git a/kvm-stub.c b/kvm-stub.c index ec351d9067..b4cf03fb7f 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -140,3 +140,13 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg) void kvm_irqchip_release_virq(KVMState *s, int virq) { } + +int kvm_irqchip_add_irqfd(KVMState *s, int fd, int virq) +{ + return -ENOSYS; +} + +int kvm_irqchip_remove_irqfd(KVMState *s, int fd, int virq) +{ + return -ENOSYS; +} diff --git a/kvm.h b/kvm.h index f0d0c539c9..9c7b0ea6ae 100644 --- a/kvm.h +++ b/kvm.h @@ -215,4 +215,7 @@ int kvm_set_ioeventfd_pio_word(int fd, uint16_t adr, uint16_t val, bool assign); int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg); void kvm_irqchip_release_virq(KVMState *s, int virq); + +int kvm_irqchip_add_irqfd(KVMState *s, int fd, int virq); +int kvm_irqchip_remove_irqfd(KVMState *s, int fd, int virq); #endif -- GitLab