diff options
| author | Peter Maydell | 2015-03-04 15:37:31 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-03-04 15:37:31 +0100 |
| commit | 3539bbb93e944ffde31c61c369ea9eedcc5697a6 (patch) | |
| tree | 99a28fb6aabdfb38aa136259fa038e191cf096ef /linux-headers/linux/vfio.h | |
| parent | vl: take iothread lock very early (diff) | |
| parent | vfio-pci: Enable device request notification support (diff) | |
| download | qemu-3539bbb93e944ffde31c61c369ea9eedcc5697a6.tar.gz qemu-3539bbb93e944ffde31c61c369ea9eedcc5697a6.tar.xz qemu-3539bbb93e944ffde31c61c369ea9eedcc5697a6.zip | |
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150302.0' into staging
Updates for QEMU 2.3-rc0:
- Error reporting and static cleanup (Alexey Kardashevskiy)
- Runtime mmap disable for tracing (Samuel Pitoiset)
- Support for host directed device request (Alex Williamson)
# gpg: Signature made Mon Mar 2 18:42:50 2015 GMT using RSA key ID 3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>"
# gpg: aka "Alex Williamson <alex@shazbot.org>"
# gpg: aka "Alex Williamson <alwillia@redhat.com>"
# gpg: aka "Alex Williamson <alex.l.williamson@gmail.com>"
* remotes/awilliam/tags/vfio-update-20150302.0:
vfio-pci: Enable device request notification support
vfio: allow to disable MMAP per device with -x-mmap=off option
vfio: Make type1 listener symbols static
vfio: Add ioctl number to error report
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-headers/linux/vfio.h')
| -rw-r--r-- | linux-headers/linux/vfio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h index 0f21aa6266..95ba870302 100644 --- a/linux-headers/linux/vfio.h +++ b/linux-headers/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 }; |