mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-04-02 17:34:24 -04:00
virtio_ring: switch to use vring_virtqueue in virtqueue_poll 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-3-jasowang@redhat.com>
This commit is contained in:
committed by
Michael S. Tsirkin
parent
8ce8e3e558
commit
79f6d68293
@@ -918,11 +918,10 @@ static unsigned int virtqueue_enable_cb_prepare_split(struct virtqueue *_vq)
|
||||
return last_used_idx;
|
||||
}
|
||||
|
||||
static bool virtqueue_poll_split(struct virtqueue *_vq, unsigned int last_used_idx)
|
||||
static bool virtqueue_poll_split(struct vring_virtqueue *vq,
|
||||
unsigned int last_used_idx)
|
||||
{
|
||||
struct vring_virtqueue *vq = to_vvq(_vq);
|
||||
|
||||
return (u16)last_used_idx != virtio16_to_cpu(_vq->vdev,
|
||||
return (u16)last_used_idx != virtio16_to_cpu(vq->vq.vdev,
|
||||
vq->split.vring.used->idx);
|
||||
}
|
||||
|
||||
@@ -1843,9 +1842,8 @@ static unsigned int virtqueue_enable_cb_prepare_packed(struct virtqueue *_vq)
|
||||
return vq->last_used_idx;
|
||||
}
|
||||
|
||||
static bool virtqueue_poll_packed(struct virtqueue *_vq, u16 off_wrap)
|
||||
static bool virtqueue_poll_packed(struct vring_virtqueue *vq, u16 off_wrap)
|
||||
{
|
||||
struct vring_virtqueue *vq = to_vvq(_vq);
|
||||
bool wrap_counter;
|
||||
u16 used_idx;
|
||||
|
||||
@@ -2610,8 +2608,8 @@ bool virtqueue_poll(struct virtqueue *_vq, unsigned int last_used_idx)
|
||||
return false;
|
||||
|
||||
virtio_mb(vq->weak_barriers);
|
||||
return vq->packed_ring ? virtqueue_poll_packed(_vq, last_used_idx) :
|
||||
virtqueue_poll_split(_vq, last_used_idx);
|
||||
return vq->packed_ring ? virtqueue_poll_packed(vq, last_used_idx) :
|
||||
virtqueue_poll_split(vq, last_used_idx);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(virtqueue_poll);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user