diff options
| author | Peter Maydell | 2019-06-14 10:33:55 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-06-14 10:33:55 +0200 |
| commit | 5ec2eca83dc478ddf24077e02a8b34dd26cd3ff9 (patch) | |
| tree | af310ae59f9d697ba784c8b745df4575d54ec8ef /include/hw/vfio/vfio-common.h | |
| parent | Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-06-13' into st... (diff) | |
| parent | vfio/common: Introduce vfio_set_irq_signaling helper (diff) | |
| download | qemu-5ec2eca83dc478ddf24077e02a8b34dd26cd3ff9.tar.gz qemu-5ec2eca83dc478ddf24077e02a8b34dd26cd3ff9.tar.xz qemu-5ec2eca83dc478ddf24077e02a8b34dd26cd3ff9.zip | |
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-updates-20190613.0' into staging
VFIO updates 2019-06-13
- Hide resizable BAR capability to prevent false guest resizing
(Alex Williamson)
- Allow relocation to fix bogus MSI-X hardware (Alex Williamson)
- Condense IRQ setup into a common helper (Eric Auger)
# gpg: Signature made Thu 13 Jun 2019 18:24:43 BST
# gpg: using RSA key 239B9B6E3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>" [full]
# gpg: aka "Alex Williamson <alex@shazbot.org>" [full]
# gpg: aka "Alex Williamson <alwillia@redhat.com>" [full]
# gpg: aka "Alex Williamson <alex.l.williamson@gmail.com>" [full]
# Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B 8A90 239B 9B6E 3BB0 8B22
* remotes/awilliam/tags/vfio-updates-20190613.0:
vfio/common: Introduce vfio_set_irq_signaling helper
vfio/pci: Allow MSI-X relocation to fixup bogus PBA
vfio/pci: Hide Resizable BAR capability
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/vfio/vfio-common.h')
| -rw-r--r-- | include/hw/vfio/vfio-common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index e05bc09794..a88b69b675 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -166,6 +166,8 @@ void vfio_put_base_device(VFIODevice *vbasedev); void vfio_disable_irqindex(VFIODevice *vbasedev, int index); void vfio_unmask_single_irqindex(VFIODevice *vbasedev, int index); void vfio_mask_single_irqindex(VFIODevice *vbasedev, int index); +int vfio_set_irq_signaling(VFIODevice *vbasedev, int index, int subindex, + int action, int fd, Error **errp); void vfio_region_write(void *opaque, hwaddr addr, uint64_t data, unsigned size); uint64_t vfio_region_read(void *opaque, |