[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/19] kvm: Introduce kvm_irqchip_add/remove_irqfd
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 16/19] kvm: Introduce kvm_irqchip_add/remove_irqfd |
Date: |
Mon, 21 May 2012 19:37:44 +0300 |
From: Jan Kiszka <address@hidden>
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 <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
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 e96f092..489ee53 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 ec351d9..b4cf03f 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 f0d0c53..9c7b0ea 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
--
1.7.10.1
- [Qemu-devel] [PULL 00/20 1.2] kvm updates, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 10/19] msix: Invoke msix_handle_mask_update on msix_mask_all, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 17/19] kvm: Enable use of kvm_irqchip_in_kernel in hwlib code, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 08/19] kvm: Enable in-kernel irqchip support by default, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 01/19] kvm: Refactor KVMState::max_gsi to gsi_count, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 14/19] kvm: Publicize kvm_irqchip_release_virq, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 06/19] kvm: Update kernel headers, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 04/19] pc: Enable MSI support at APIC level, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 16/19] kvm: Introduce kvm_irqchip_add/remove_irqfd,
Avi Kivity <=
- [Qemu-devel] [PATCH 03/19] kvm: Introduce basic MSI support for in-kernel irqchips, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 13/19] kvm: Introduce kvm_irqchip_add_msi_route, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 02/19] Introduce MSIMessage structure, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 07/19] kvm: Add support for direct MSI injections, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 18/19] msix: Add msix_nr_vectors_allocated, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 19/19] virtio/vhost: Add support for KVM in-kernel MSI injection, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 09/19] msix: Factor out msix_get_message, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 12/19] kvm: Rename kvm_irqchip_add_route to kvm_irqchip_add_irq_route, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 05/19] kvm: x86: Wire up MSI support for in-kernel irqchip, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 15/19] kvm: Make kvm_irqchip_commit_routes an internal service, Avi Kivity, 2012/05/21