diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-19 09:02:05 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-19 09:02:05 +0100 |
| commit | 08b558f07bf67abf759e67266a83a8effdc34139 (patch) | |
| tree | 07630aeb54d281434f669771f3a5470b9a656f0c /hw | |
| parent | a098fbc025095a0d98156ada7eac59de97c16499 (diff) | |
| parent | 383a7af7ecd1f1b6587552b71b8bc517c6edea88 (diff) | |
| download | qemu-08b558f07bf67abf759e67266a83a8effdc34139.zip qemu-08b558f07bf67abf759e67266a83a8effdc34139.tar.gz qemu-08b558f07bf67abf759e67266a83a8effdc34139.tar.bz2 | |
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20160718.0' into staging
VFIO update 2016-07-18
One fix for 2.7-rc0 which hides the ARI extended capability, fixing
multifunction support in PCIe configurations where the assigned device
function topology does not match the host (Alex Williamson)
# gpg: Signature made Mon 18 Jul 2016 18:02:27 BST
# gpg: using RSA key 0x239B9B6E3BB08B22
# 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>"
# Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B 8A90 239B 9B6E 3BB0 8B22
* remotes/awilliam/tags/vfio-update-20160718.0:
vfio/pci: Hide ARI capability
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/vfio/pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 44783c5..c8436a1 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -1828,6 +1828,7 @@ static int vfio_add_ext_cap(VFIOPCIDevice *vdev) switch (cap_id) { case PCI_EXT_CAP_ID_SRIOV: /* Read-only VF BARs confuse OVMF */ + case PCI_EXT_CAP_ID_ARI: /* XXX Needs next function virtualization */ trace_vfio_add_ext_cap_dropped(vdev->vbasedev.name, cap_id, next); break; default: |