diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-30 09:26:03 -0600 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-30 09:26:03 +1030 |
| commit | 87c7d57c17ade5024d95b6ca0da249da49b0672a (patch) | |
| tree | 2ffeaae5c2e5ed9a72efec6466678fb797c4cdfa /drivers/virtio | |
| parent | db40598863e8cbbd11053ad3c8bae89000f603f9 (diff) | |
| download | linux-3.10-87c7d57c17ade5024d95b6ca0da249da49b0672a.tar.gz linux-3.10-87c7d57c17ade5024d95b6ca0da249da49b0672a.tar.bz2 linux-3.10-87c7d57c17ade5024d95b6ca0da249da49b0672a.zip | |
virtio: hand virtio ring alignment as argument to vring_new_virtqueue
This allows each virtio user to hand in the alignment appropriate to
their virtio_ring structures.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'drivers/virtio')
| -rw-r--r-- | drivers/virtio/virtio_pci.c | 4 | ||||
| -rw-r--r-- | drivers/virtio/virtio_ring.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index f28643f3a4e..7462a51e820 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c @@ -249,8 +249,8 @@ static struct virtqueue *vp_find_vq(struct virtio_device *vdev, unsigned index, vp_dev->ioaddr + VIRTIO_PCI_QUEUE_PFN); /* create the vring */ - vq = vring_new_virtqueue(info->num, vdev, info->queue, - vp_notify, callback); + vq = vring_new_virtqueue(info->num, VIRTIO_PCI_VRING_ALIGN, + vdev, info->queue, vp_notify, callback); if (!vq) { err = -ENOMEM; goto out_activate_queue; diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 6eb5303fed1..5777196bf6c 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -274,6 +274,7 @@ static struct virtqueue_ops vring_vq_ops = { }; struct virtqueue *vring_new_virtqueue(unsigned int num, + unsigned int vring_align, struct virtio_device *vdev, void *pages, void (*notify)(struct virtqueue *), @@ -292,7 +293,7 @@ struct virtqueue *vring_new_virtqueue(unsigned int num, if (!vq) return NULL; - vring_init(&vq->vring, num, pages, PAGE_SIZE); + vring_init(&vq->vring, num, pages, vring_align); vq->vq.callback = callback; vq->vq.vdev = vdev; vq->vq.vq_ops = &vring_vq_ops; |