Re: [PATCH] virtio: Use pci_enable_msix_range() instead of pci_enable_msix()

From: Michael S. Tsirkin
Date: Thu Feb 20 2014 - 00:13:10 EST


On Wed, Feb 19, 2014 at 11:15:29AM +0100, Alexander Gordeev wrote:
> As result 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() and pci_enable_msix_range()
> interfaces.
>
> Signed-off-by: Alexander Gordeev <agordeev@xxxxxxxxxx>
> Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
> Cc: "Michael S. Tsirkin" <mst@xxxxxxxxxx>
> Cc: virtio-dev@xxxxxxxxxxxxxxxxxxxx
> Cc: virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
> Cc: linux-pci@xxxxxxxxxxxxxxx

Acked-by: Michael S. Tsirkin <mst@xxxxxxxxxx>

> ---
> drivers/virtio/virtio_pci.c | 8 +++-----
> 1 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
> index a416f9b..dea042c 100644
> --- a/drivers/virtio/virtio_pci.c
> +++ b/drivers/virtio/virtio_pci.c
> @@ -333,11 +333,9 @@ 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;
> - if (err)
> + err = pci_enable_msix_range(vp_dev->pci_dev,
> + vp_dev->msix_entries, nvectors, nvectors);
> + if (err < 0)
> goto error;
> vp_dev->msix_enabled = 1;
>
> --
> 1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/