Commit 07d9629d authored by Xuan Zhuo's avatar Xuan Zhuo Committed by Michael S. Tsirkin
Browse files

virtio_ring: split: stop __vring_new_virtqueue as export symbol 



There is currently only one place to reference __vring_new_virtqueue()
directly from the outside of virtio core. And here vring_new_virtqueue()
can be used instead.

Subsequent patches will modify __vring_new_virtqueue, so stop it as an
export symbol for now.

Signed-off-by: default avatarXuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Message-Id: <20220801063902.129329-8-xuanzhuo@linux.alibaba.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 3a897128

drivers/virtio/virtio_ring.c

+16 −9
Original line number Diff line number Diff line
@@ -204,6 +204,14 @@ struct vring_virtqueue { 
#endif

};



static struct virtqueue *__vring_new_virtqueue(unsigned int index,

					       struct vring vring,

					       struct virtio_device *vdev,

					       bool weak_barriers,

					       bool context,

					       bool (*notify)(struct virtqueue *),

					       void (*callback)(struct virtqueue *),

					       const char *name);



/*

 * Helpers.
@@ -2195,7 +2203,7 @@ irqreturn_t vring_interrupt(int irq, void *_vq) 
EXPORT_SYMBOL_GPL(vring_interrupt);



/* Only available for split ring */

struct virtqueue *__vring_new_virtqueue(unsigned int index,

static struct virtqueue *__vring_new_virtqueue(unsigned int index,

					       struct vring vring,

					       struct virtio_device *vdev,

					       bool weak_barriers,
@@ -2277,7 +2285,6 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index, 
	kfree(vq);

	return NULL;

}

EXPORT_SYMBOL_GPL(__vring_new_virtqueue);



struct virtqueue *vring_create_virtqueue(

	unsigned int index,

include/linux/virtio_ring.h

+0 −10
Original line number Diff line number Diff line
@@ -76,16 +76,6 @@ struct virtqueue *vring_create_virtqueue(unsigned int index, 
					 void (*callback)(struct virtqueue *vq),

					 const char *name);



/* Creates a virtqueue with a custom layout. */

struct virtqueue *__vring_new_virtqueue(unsigned int index,

					struct vring vring,

					struct virtio_device *vdev,

					bool weak_barriers,

					bool ctx,

					bool (*notify)(struct virtqueue *),

					void (*callback)(struct virtqueue *),

					const char *name);



/*

 * Creates a virtqueue with a standard layout but a caller-allocated

 * ring.

tools/virtio/virtio_test.c

+2 −2
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ static void vq_reset(struct vq_info *info, int num, struct virtio_device *vdev) 


	memset(info->ring, 0, vring_size(num, 4096));

	vring_init(&info->vring, num, info->ring, 4096);

	info->vq = __vring_new_virtqueue(info->idx, info->vring, vdev, true,

					 false, vq_notify, vq_callback, "test");

	info->vq = vring_new_virtqueue(info->idx, num, 4096, vdev, true, false,

				       info->ring, vq_notify, vq_callback, "test");

	assert(info->vq);

	info->vq->priv = info;

}