Commit 7e810176 authored by Jason Wang's avatar Jason Wang Committed by Michael S. Tsirkin
Browse files

virtio_ring: switch to use vring_virtqueue for disable_cb 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: default avatarEugenio Pérez <eperezma@redhat.com>
Reviewed-by: default avatarXuan Zhuo <xuanzhuo@linux.alibaba.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Tested-by: default avatarLei Yang <leiyang@redhat.com>
Reviewed-by: default avatarEugenio Pérez <eperezma@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Message-Id: <20251230064649.55597-11-jasowang@redhat.com>
parent 62fa22cd

drivers/virtio/virtio_ring.c

+5 −9
Original line number Diff line number Diff line
@@ -873,10 +873,8 @@ static void *virtqueue_get_buf_ctx_split(struct vring_virtqueue *vq, 
	return ret;

}



static void virtqueue_disable_cb_split(struct virtqueue *_vq)

static void virtqueue_disable_cb_split(struct vring_virtqueue *vq)

{

	struct vring_virtqueue *vq = to_vvq(_vq);



	if (!(vq->split.avail_flags_shadow & VRING_AVAIL_F_NO_INTERRUPT)) {

		vq->split.avail_flags_shadow |= VRING_AVAIL_F_NO_INTERRUPT;
@@ -892,7 +890,7 @@ static void virtqueue_disable_cb_split(struct virtqueue *_vq) 
			vring_used_event(&vq->split.vring) = 0x0;

		else

			vq->split.vring.avail->flags =

				cpu_to_virtio16(_vq->vdev,

				cpu_to_virtio16(vq->vq.vdev,

						vq->split.avail_flags_shadow);

	}

}
@@ -1785,10 +1783,8 @@ static void *virtqueue_get_buf_ctx_packed(struct vring_virtqueue *vq, 
	return ret;

}



static void virtqueue_disable_cb_packed(struct virtqueue *_vq)

static void virtqueue_disable_cb_packed(struct vring_virtqueue *vq)

{

	struct vring_virtqueue *vq = to_vvq(_vq);



	if (vq->packed.event_flags_shadow != VRING_PACKED_EVENT_FLAG_DISABLE) {

		vq->packed.event_flags_shadow = VRING_PACKED_EVENT_FLAG_DISABLE;
@@ -2541,9 +2537,9 @@ void virtqueue_disable_cb(struct virtqueue *_vq) 
	struct vring_virtqueue *vq = to_vvq(_vq);



	if (vq->packed_ring)

		virtqueue_disable_cb_packed(_vq);

		virtqueue_disable_cb_packed(vq);

	else

		virtqueue_disable_cb_split(_vq);

		virtqueue_disable_cb_split(vq);

}

EXPORT_SYMBOL_GPL(virtqueue_disable_cb);