mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio_ring: split: stop __vring_new_virtqueue as export symbol

Browse Source 
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: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Message-Id: <20220801063902.129329-8-xuanzhuo@linux.alibaba.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Xuan Zhuo
2022-08-01 14:38:27 +08:00
committed by Michael S. Tsirkin
parent 3a897128d3
commit 07d9629d49
3 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/virtio/virtio_ring.c
View File

@@ -204,6 +204,14 @@ struct vring_virtqueue {
#endif #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. * Helpers.
@@ -2195,14 +2203,14 @@ irqreturn_t vring_interrupt(int irq, void *_vq)
EXPORT_SYMBOL_GPL(vring_interrupt); EXPORT_SYMBOL_GPL(vring_interrupt);
/* Only available for split ring */ /* 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 vring vring,
struct virtio_device *vdev, struct virtio_device *vdev,
bool weak_barriers, bool weak_barriers,
bool context, bool context,
bool (*notify)(struct virtqueue *), bool (*notify)(struct virtqueue *),
void (*callback)(struct virtqueue *), void (*callback)(struct virtqueue *),
const char *name) const char *name)
{ {
struct vring_virtqueue *vq; struct vring_virtqueue *vq;
@@ -2277,7 +2285,6 @@ err_state:
kfree(vq); kfree(vq);
return NULL; return NULL;
} }
EXPORT_SYMBOL_GPL(__vring_new_virtqueue);
struct virtqueue *vring_create_virtqueue( struct virtqueue *vring_create_virtqueue(
unsigned int index, unsigned int index,

10
include/linux/virtio_ring.h
View File

@@ -76,16 +76,6 @@ struct virtqueue *vring_create_virtqueue(unsigned int index,
void (*callback)(struct virtqueue *vq), void (*callback)(struct virtqueue *vq),
const char *name); 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 * Creates a virtqueue with a standard layout but a caller-allocated
* ring. * ring.

4
tools/virtio/virtio_test.c
View File

@@ -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)); memset(info->ring, 0, vring_size(num, 4096));
vring_init(&info->vring, num, info->ring, 4096); vring_init(&info->vring, num, info->ring, 4096);
info->vq = __vring_new_virtqueue(info->idx, info->vring, vdev, true, info->vq = vring_new_virtqueue(info->idx, num, 4096, vdev, true, false,
false, vq_notify, vq_callback, "test"); info->ring, vq_notify, vq_callback, "test");
assert(info->vq); assert(info->vq);
info->vq->priv = info; info->vq->priv = info;
} }