]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
virtio_ring: rename virtqueue_reinit_xxx to virtqueue_reset_xxx()
authorJason Wang <jasowang@redhat.com>
Tue, 30 Dec 2025 06:46:31 +0000 (14:46 +0800)
committerMichael S. Tsirkin <mst@redhat.com>
Wed, 31 Dec 2025 10:39:17 +0000 (05:39 -0500)
To be consistent with virtqueue_reset().

Acked-by: Eugenio Pérez <eperezma@redhat.com>
Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20251230064649.55597-2-jasowang@redhat.com>

drivers/virtio/virtio_ring.c

index 560e132f1f193832416664965f193546fb99315d..bcac7500c87499709db99e1d31041e4978a4190c 100644 (file)
@@ -1008,7 +1008,7 @@ static void virtqueue_vring_init_split(struct vring_virtqueue_split *vring_split
        }
 }
 
-static void virtqueue_reinit_split(struct vring_virtqueue *vq)
+static void virtqueue_reset_split(struct vring_virtqueue *vq)
 {
        int num;
 
@@ -1252,7 +1252,7 @@ static int virtqueue_resize_split(struct virtqueue *_vq, u32 num)
 err_state_extra:
        vring_free_split(&vring_split, vdev, vq->map);
 err:
-       virtqueue_reinit_split(vq);
+       virtqueue_reset_split(vq);
        return -ENOMEM;
 }
 
@@ -2090,7 +2090,7 @@ static void virtqueue_vring_attach_packed(struct vring_virtqueue *vq,
        vq->free_head = 0;
 }
 
-static void virtqueue_reinit_packed(struct vring_virtqueue *vq)
+static void virtqueue_reset_packed(struct vring_virtqueue *vq)
 {
        memset(vq->packed.vring.device, 0, vq->packed.event_size_in_bytes);
        memset(vq->packed.vring.driver, 0, vq->packed.event_size_in_bytes);
@@ -2217,7 +2217,7 @@ static int virtqueue_resize_packed(struct virtqueue *_vq, u32 num)
 err_state_extra:
        vring_free_packed(&vring_packed, vdev, vq->map);
 err_ring:
-       virtqueue_reinit_packed(vq);
+       virtqueue_reset_packed(vq);
        return -ENOMEM;
 }
 
@@ -2859,9 +2859,9 @@ int virtqueue_reset(struct virtqueue *_vq,
                recycle_done(_vq);
 
        if (vq->packed_ring)
-               virtqueue_reinit_packed(vq);
+               virtqueue_reset_packed(vq);
        else
-               virtqueue_reinit_split(vq);
+               virtqueue_reset_split(vq);
 
        return virtqueue_enable_after_reset(_vq);
 }