@@ -423,6 +423,11 @@ int kvm_irqchip_add_irqfd_notifier(KVMState *s, EventNotifier *n,
int kvm_irqchip_remove_irqfd_notifier(KVMState *s, EventNotifier *n,
qemu_irq irq);
void kvm_irqchip_set_qemuirq_gsi(KVMState *s, qemu_irq irq, int gsi);
+struct kvm_vfio_dev_irq;
+int kvm_vfio_get_device_irq(KVMState *s, int fd, int index,
+ int start, int count, qemu_irq irq,
+ struct kvm_vfio_dev_irq **vfio_dev_irq);
+void kvm_vfio_put_device_irq(struct kvm_vfio_dev_irq *vfio_dev_irq);
void kvm_pc_gsi_handler(void *opaque, int n, int level);
void kvm_pc_setup_irq_routing(bool pci_enabled);
void kvm_init_irq_routing(KVMState *s);
@@ -1454,6 +1454,38 @@ static int kvm_irqchip_create(MachineState *machine, KVMState *s)
return 0;
}
+int kvm_vfio_get_device_irq(KVMState *s, int fd, int index,
+ int start, int count, qemu_irq irq,
+ struct kvm_vfio_dev_irq **vfio_dev_irq)
+{
+ gpointer key, gsi;
+ gboolean found = g_hash_table_lookup_extended(s->gsimap, irq, &key, &gsi);
+ struct kvm_vfio_dev_irq *pirq;
+ __u32 *pgsi;
+ int argsz;
+
+ if (!found) {
+ return -ENXIO;
+ }
+
+ argsz = sizeof(*pirq) + sizeof(*pgsi);
+ pirq = g_malloc0(argsz);
+ pirq->argsz = argsz;
+ pirq->fd = fd;
+ pirq->index = index;
+ pirq->start = start;
+ pirq->count = count;
+ pgsi = (__u32 *)&pirq->gsi;
+ *pgsi = GPOINTER_TO_INT(gsi);
+ *vfio_dev_irq = pirq;
+ return 0;
+}
+
+void kvm_vfio_put_device_irq(struct kvm_vfio_dev_irq *vfio_dev_irq)
+{
+ g_free(vfio_dev_irq);
+}
+
/* Find number of supported CPUs using the recommended
* procedure from the kernel API documentation to cope with
* older kernels that may be missing capabilities.
Since the introduction of the qemu_irq/gsi hash table in kvm, the gsi information is stored in kvm. New functions are introduced to allocate/populate a kvm_vfio_dev_irq struct pointer from a qemu_irq object and free it. Signed-off-by: Eric Auger <eric.auger@linaro.org> --- include/sysemu/kvm.h | 5 +++++ kvm-all.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+)