Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87c7d57c authored by Rusty Russell's avatar Rusty Russell
Browse files

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: default avatarRusty Russell <rusty@rustcorp.com.au>
Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent db405988

drivers/lguest/lguest_device.c

+2 −2
Original line number Diff line number Diff line
@@ -259,8 +259,8 @@ static struct virtqueue *lg_find_vq(struct virtio_device *vdev, 


	/* OK, tell virtio_ring.c to set up a virtqueue now we know its size

	 * and we've got a pointer to its pages. */

	vq = vring_new_virtqueue(lvq->config.num, vdev, lvq->pages,

				 lg_notify, callback);

	vq = vring_new_virtqueue(lvq->config.num, LGUEST_VRING_ALIGN,

				 vdev, lvq->pages, lg_notify, callback);

	if (!vq) {

		err = -ENOMEM;

		goto unmap;

drivers/s390/kvm/kvm_virtio.c

+2 −1
Original line number Diff line number Diff line
@@ -193,7 +193,8 @@ static struct virtqueue *kvm_find_vq(struct virtio_device *vdev, 
	if (err)

		goto out;



	vq = vring_new_virtqueue(config->num, vdev, (void *) config->address,

	vq = vring_new_virtqueue(config->num, KVM_S390_VIRTIO_RING_ALIGN,

				 vdev, (void *) config->address,

				 kvm_notify, callback);

	if (!vq) {

		err = -ENOMEM;

drivers/virtio/virtio_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/virtio/virtio_ring.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/virtio_ring.h

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ struct virtio_device; 
struct virtqueue;



struct virtqueue *vring_new_virtqueue(unsigned int num,

				      unsigned int vring_align,

				      struct virtio_device *vdev,

				      void *pages,

				      void (*notify)(struct virtqueue *vq),