diff options
| author | Linus Torvalds | 2015-02-21 20:55:21 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2015-02-21 20:55:21 +0100 |
| commit | c189cb8ef62832f33b6cf757350a0270532a1ad8 (patch) | |
| tree | c8cd1f998f7ae98e0446a86a9efcc688841c289a /include/uapi | |
| parent | Merge tag 'sound-fix-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | vfio-pci: Add device request interface (diff) | |
| download | kernel-qcow2-linux-c189cb8ef62832f33b6cf757350a0270532a1ad8.tar.gz kernel-qcow2-linux-c189cb8ef62832f33b6cf757350a0270532a1ad8.tar.xz kernel-qcow2-linux-c189cb8ef62832f33b6cf757350a0270532a1ad8.zip | |
Merge tag 'vfio-v3.20-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- IOMMU updates based on trace analysis
- VFIO device request interface
* tag 'vfio-v3.20-rc1' of git://github.com/awilliam/linux-vfio:
vfio-pci: Add device request interface
vfio-pci: Generalize setup of simple eventfds
vfio: Add and use device request op for vfio bus drivers
vfio: Tie IOMMU group reference to vfio group
vfio: Add device tracking during unbind
vfio/type1: Add conditional rescheduling
vfio/type1: Chunk contiguous reserved/invalid page mappings
vfio/type1: DMA unmap chunking
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/vfio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index 29715d27548f..82889c30f4f5 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -333,6 +333,7 @@ enum { VFIO_PCI_MSI_IRQ_INDEX, VFIO_PCI_MSIX_IRQ_INDEX, VFIO_PCI_ERR_IRQ_INDEX, + VFIO_PCI_REQ_IRQ_INDEX, VFIO_PCI_NUM_IRQS }; |