virtio_pci: use priv for vq notification

slightly reduce the amount of pointer chasing this needs to do.
More importantly, this will easily generalize to virtio 1.0.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 6a7b8bff51e5d0685469e11e79e7ea22f6752a4b..7b82eb5c0c5ae06ebf55baf18c419d8f928b0ae1 100644 (file)
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -204,11 +204,9 @@ static void vp_reset(struct virtio_device *vdev)
 /* the notify function used when creating a virt queue */
 static bool vp_notify(struct virtqueue *vq)
 {
-       struct virtio_pci_device *vp_dev = to_vp_device(vq->vdev);
-
        /* we write the queue's selector into the notification register to
         * signal the other end */
-       iowrite16(vq->index, vp_dev->ioaddr + VIRTIO_PCI_QUEUE_NOTIFY);
+       iowrite16(vq->index, (void __iomem *)vq->priv);
        return true;
 }
 
@@ -437,6 +435,7 @@ static struct virtqueue *setup_vq(struct virtio_device *vdev, unsigned index,
                goto out_activate_queue;
        }
 
+       vq->priv = (void __force *)vp_dev->ioaddr + VIRTIO_PCI_QUEUE_NOTIFY;
        info->vq = vq;
 
        if (msix_vec != VIRTIO_MSI_NO_VECTOR) {