summaryrefslogtreecommitdiffstats
path: root/drivers/virtio
diff options
context:
space:
mode:
authorAlexander Gordeev <agordeev@redhat.com>2014-03-13 11:23:37 +1030
committerRusty Russell <rusty@rustcorp.com.au>2014-03-13 11:27:54 +1030
commit5e37f67063a14450f1fff3baee81efe7c146592a (patch)
tree4d9ad51c10ce1401cfa53810648361f1a96464b9 /drivers/virtio
parentd0190b7307624932fa9d0bdb9b1c7ad704523926 (diff)
downloadlinux-stable-5e37f67063a14450f1fff3baee81efe7c146592a.tar.gz
linux-stable-5e37f67063a14450f1fff3baee81efe7c146592a.tar.bz2
linux-stable-5e37f67063a14450f1fff3baee81efe7c146592a.zip
virtio: Use pci_enable_msix_exact() instead of pci_enable_msix()
As result of deprecation of MSI-X/MSI enablement functions pci_enable_msix() and pci_enable_msi_block() all drivers using these two interfaces need to be updated to use the new pci_enable_msi_range() or pci_enable_msi_exact() and pci_enable_msix_range() or pci_enable_msix_exact() interfaces. Signed-off-by: Alexander Gordeev <agordeev@redhat.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/virtio')
-rw-r--r--drivers/virtio/virtio_pci.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index a416f9b2a7f6..101db3faf5d4 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -333,10 +333,8 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
for (i = 0; i < nvectors; ++i)
vp_dev->msix_entries[i].entry = i;
- /* pci_enable_msix returns positive if we can't get this many. */
- err = pci_enable_msix(vp_dev->pci_dev, vp_dev->msix_entries, nvectors);
- if (err > 0)
- err = -ENOSPC;
+ err = pci_enable_msix_exact(vp_dev->pci_dev,
+ vp_dev->msix_entries, nvectors);
if (err)
goto error;
vp_dev->msix_enabled = 1;