On Mon, Mar 24, 2025 at 6:44 AM Jason Wang <jasow...@redhat.com> wrote:
>
> 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 <epere...@redhat.com>
> Signed-off-by: Jason Wang <jasow...@redhat.com>
> ---
> drivers/virtio/virtio_ring.c | 16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
> index a414e66915d9..af8ce6e9d892 100644
> --- a/drivers/virtio/virtio_ring.c
> +++ b/drivers/virtio/virtio_ring.c
> @@ -917,9 +917,8 @@ static unsigned int
> virtqueue_enable_cb_prepare_split(struct vring_virtqueue *vq
> return last_used_idx;
> }
>
> -static bool virtqueue_enable_cb_delayed_split(struct virtqueue *_vq)
> +static bool virtqueue_enable_cb_delayed_split(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> u16 bufs;
>
> START_USE(vq);
> @@ -933,7 +932,7 @@ static bool virtqueue_enable_cb_delayed_split(struct
> virtqueue *_vq)
> vq->split.avail_flags_shadow &= ~VRING_AVAIL_F_NO_INTERRUPT;
> if (!vq->event)
> vq->split.vring.avail->flags =
> - cpu_to_virtio16(_vq->vdev,
> + cpu_to_virtio16(vq->vq.vdev,
> vq->split.avail_flags_shadow);
> }
> /* TODO: tune this threshold */
> @@ -941,9 +940,9 @@ static bool virtqueue_enable_cb_delayed_split(struct
> virtqueue *_vq)
>
> virtio_store_mb(vq->weak_barriers,
> &vring_used_event(&vq->split.vring),
> - cpu_to_virtio16(_vq->vdev, vq->last_used_idx + bufs));
> + cpu_to_virtio16(vq->vq.vdev, vq->last_used_idx +
> bufs));
>
> - if (unlikely((u16)(virtio16_to_cpu(_vq->vdev,
> vq->split.vring.used->idx)
> + if (unlikely((u16)(virtio16_to_cpu(vq->vq.vdev,
> vq->split.vring.used->idx)
> - vq->last_used_idx) > bufs)) {
> END_USE(vq);
> return false;
> @@ -1837,9 +1836,8 @@ static unsigned int
> virtqueue_enable_cb_prepare_packed(struct vring_virtqueue *v
> return vq->last_used_idx;
> }
>
> -static bool virtqueue_enable_cb_delayed_packed(struct virtqueue *_vq)
> +static bool virtqueue_enable_cb_delayed_packed(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> u16 used_idx, wrap_counter, last_used_idx;
> u16 bufs;
>
> @@ -2631,8 +2629,8 @@ bool virtqueue_enable_cb_delayed(struct virtqueue *_vq)
> if (vq->event_triggered)
> vq->event_triggered = false;
>
> - return vq->packed_ring ? virtqueue_enable_cb_delayed_packed(_vq) :
> - virtqueue_enable_cb_delayed_split(_vq);
> + return vq->packed_ring ? virtqueue_enable_cb_delayed_packed(vq) :
> + virtqueue_enable_cb_delayed_split(vq);
> }
> EXPORT_SYMBOL_GPL(virtqueue_enable_cb_delayed);
>
> --
> 2.42.0
>
