virtio: switch to use vring_virtqueue for virtqueue_get 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>
Tested-by: Lei Yang <leiyang@redhat.com>
Reviewed-by: Eugenio Pérez <eperezma@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20251230064649.55597-8-jasowang@redhat.com>

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 5787cb42865226d9a6d058cf1c379aa88942d0f6..6225ecac3c19852db372b4b005b3db5b96d2fb64 100644 (file)
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -816,11 +816,10 @@ static bool more_used_split(const struct vring_virtqueue *vq)
        return virtqueue_poll_split(vq, vq->last_used_idx);
 }
 
-static void *virtqueue_get_buf_ctx_split(struct virtqueue *_vq,
+static void *virtqueue_get_buf_ctx_split(struct vring_virtqueue *vq,
                                         unsigned int *len,
                                         void **ctx)
 {
-       struct vring_virtqueue *vq = to_vvq(_vq);
        void *ret;
        unsigned int i;
        u16 last_used;
@@ -842,9 +841,9 @@ static void *virtqueue_get_buf_ctx_split(struct virtqueue *_vq,
        virtio_rmb(vq->weak_barriers);
 
        last_used = (vq->last_used_idx & (vq->split.vring.num - 1));
-       i = virtio32_to_cpu(_vq->vdev,
+       i = virtio32_to_cpu(vq->vq.vdev,
                        vq->split.vring.used->ring[last_used].id);
-       *len = virtio32_to_cpu(_vq->vdev,
+       *len = virtio32_to_cpu(vq->vq.vdev,
                        vq->split.vring.used->ring[last_used].len);
 
        if (unlikely(i >= vq->split.vring.num)) {
@@ -866,7 +865,7 @@ static void *virtqueue_get_buf_ctx_split(struct virtqueue *_vq,
        if (!(vq->split.avail_flags_shadow & VRING_AVAIL_F_NO_INTERRUPT))
                virtio_store_mb(vq->weak_barriers,
                                &vring_used_event(&vq->split.vring),
-                               cpu_to_virtio16(_vq->vdev, vq->last_used_idx));
+                               cpu_to_virtio16(vq->vq.vdev, vq->last_used_idx));
 
        LAST_ADD_TIME_INVALID(vq);
 
@@ -1720,11 +1719,10 @@ static bool more_used_packed(const struct vring_virtqueue *vq)
        return virtqueue_poll_packed(vq, READ_ONCE(vq->last_used_idx));
 }
 
-static void *virtqueue_get_buf_ctx_packed(struct virtqueue *_vq,
+static void *virtqueue_get_buf_ctx_packed(struct vring_virtqueue *vq,
                                          unsigned int *len,
                                          void **ctx)
 {
-       struct vring_virtqueue *vq = to_vvq(_vq);
        u16 last_used, id, last_used_idx;
        bool used_wrap_counter;
        void *ret;
@@ -2524,8 +2522,8 @@ void *virtqueue_get_buf_ctx(struct virtqueue *_vq, unsigned int *len,
 {
        struct vring_virtqueue *vq = to_vvq(_vq);
 
-       return vq->packed_ring ? virtqueue_get_buf_ctx_packed(_vq, len, ctx) :
-                                virtqueue_get_buf_ctx_split(_vq, len, ctx);
+       return vq->packed_ring ? virtqueue_get_buf_ctx_packed(vq, len, ctx) :
+                                virtqueue_get_buf_ctx_split(vq, len, ctx);
 }
 EXPORT_SYMBOL_GPL(virtqueue_get_buf_ctx);