Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 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>

authored by

Xuan Zhuo and committed by
Michael S. Tsirkin
07d9629d 3a897128

+18 -21
+16 -9
drivers/virtio/virtio_ring.c
··· 204 204 #endif 205 205 }; 206 206 207 + static struct virtqueue *__vring_new_virtqueue(unsigned int index, 208 + struct vring vring, 209 + struct virtio_device *vdev, 210 + bool weak_barriers, 211 + bool context, 212 + bool (*notify)(struct virtqueue *), 213 + void (*callback)(struct virtqueue *), 214 + const char *name); 207 215 208 216 /* 209 217 * Helpers. ··· 2203 2195 EXPORT_SYMBOL_GPL(vring_interrupt); 2204 2196 2205 2197 /* Only available for split ring */ 2206 - struct virtqueue *__vring_new_virtqueue(unsigned int index, 2207 - struct vring vring, 2208 - struct virtio_device *vdev, 2209 - bool weak_barriers, 2210 - bool context, 2211 - bool (*notify)(struct virtqueue *), 2212 - void (*callback)(struct virtqueue *), 2213 - const char *name) 2198 + static struct virtqueue *__vring_new_virtqueue(unsigned int index, 2199 + struct vring vring, 2200 + struct virtio_device *vdev, 2201 + bool weak_barriers, 2202 + bool context, 2203 + bool (*notify)(struct virtqueue *), 2204 + void (*callback)(struct virtqueue *), 2205 + const char *name) 2214 2206 { 2215 2207 struct vring_virtqueue *vq; 2216 2208 ··· 2285 2277 kfree(vq); 2286 2278 return NULL; 2287 2279 } 2288 - EXPORT_SYMBOL_GPL(__vring_new_virtqueue); 2289 2280 2290 2281 struct virtqueue *vring_create_virtqueue( 2291 2282 unsigned int index,
-10
include/linux/virtio_ring.h
··· 76 76 void (*callback)(struct virtqueue *vq), 77 77 const char *name); 78 78 79 - /* Creates a virtqueue with a custom layout. */ 80 - struct virtqueue *__vring_new_virtqueue(unsigned int index, 81 - struct vring vring, 82 - struct virtio_device *vdev, 83 - bool weak_barriers, 84 - bool ctx, 85 - bool (*notify)(struct virtqueue *), 86 - void (*callback)(struct virtqueue *), 87 - const char *name); 88 - 89 79 /* 90 80 * Creates a virtqueue with a standard layout but a caller-allocated 91 81 * ring.
+2 -2
tools/virtio/virtio_test.c
··· 102 102 103 103 memset(info->ring, 0, vring_size(num, 4096)); 104 104 vring_init(&info->vring, num, info->ring, 4096); 105 - info->vq = __vring_new_virtqueue(info->idx, info->vring, vdev, true, 106 - false, vq_notify, vq_callback, "test"); 105 + info->vq = vring_new_virtqueue(info->idx, num, 4096, vdev, true, false, 106 + info->ring, vq_notify, vq_callback, "test"); 107 107 assert(info->vq); 108 108 info->vq->priv = info; 109 109 }