virtio_ring: switch to use vring_virtqueue for virtqueue resize variants

Those variants are used internally so let's switch to use
vring_virtqueue as parameter to be consistent with other internal
virtqueue helpers.

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-5-jasowang@redhat.com>

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index b25bb2f1e22c708a342435cf5f004f49af615e0a..6c444ff009e277cd4426187a1e187a770265bf34 100644 (file)
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -1220,11 +1220,10 @@ static struct virtqueue *vring_create_virtqueue_split(
        return vq;
 }
 
-static int virtqueue_resize_split(struct virtqueue *_vq, u32 num)
+static int virtqueue_resize_split(struct vring_virtqueue *vq, u32 num)
 {
        struct vring_virtqueue_split vring_split = {};
-       struct vring_virtqueue *vq = to_vvq(_vq);
-       struct virtio_device *vdev = _vq->vdev;
+       struct virtio_device *vdev = vq->vq.vdev;
        int err;
 
        err = vring_alloc_queue_split(&vring_split, vdev, num,
@@ -2181,11 +2180,10 @@ static struct virtqueue *vring_create_virtqueue_packed(
        return vq;
 }
 
-static int virtqueue_resize_packed(struct virtqueue *_vq, u32 num)
+static int virtqueue_resize_packed(struct vring_virtqueue *vq, u32 num)
 {
        struct vring_virtqueue_packed vring_packed = {};
-       struct vring_virtqueue *vq = to_vvq(_vq);
-       struct virtio_device *vdev = _vq->vdev;
+       struct virtio_device *vdev = vq->vq.vdev;
        int err;
 
        if (vring_alloc_queue_packed(&vring_packed, vdev, num, vq->map))
@@ -2808,9 +2806,9 @@ int virtqueue_resize(struct virtqueue *_vq, u32 num,
                recycle_done(_vq);
 
        if (vq->packed_ring)
-               err = virtqueue_resize_packed(_vq, num);
+               err = virtqueue_resize_packed(vq, num);
        else
-               err = virtqueue_resize_split(_vq, num);
+               err = virtqueue_resize_split(vq, num);
 
        err_reset = virtqueue_enable_after_reset(_vq);
        if (err_reset)