tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

virtio_ring: switch to use vring_virtqueue for enable_cb_prepare 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-9-jasowang@redhat.com>

authored by

Jason Wang and committed by
Michael S. Tsirkin 74847cb5 ceea1cd0

+6 -9
+6 -9
drivers/virtio/virtio_ring.c
··· 897 897 } 898 898 } 899 899 900 - static unsigned int virtqueue_enable_cb_prepare_split(struct virtqueue *_vq) 900 + static unsigned int virtqueue_enable_cb_prepare_split(struct vring_virtqueue *vq) 901 901 { 902 - struct vring_virtqueue *vq = to_vvq(_vq); 903 902 u16 last_used_idx; 904 903 905 904 START_USE(vq); ··· 912 913 vq->split.avail_flags_shadow &= ~VRING_AVAIL_F_NO_INTERRUPT; 913 914 if (!vq->event) 914 915 vq->split.vring.avail->flags = 915 - cpu_to_virtio16(_vq->vdev, 916 + cpu_to_virtio16(vq->vq.vdev, 916 917 vq->split.avail_flags_shadow); 917 918 } 918 - vring_used_event(&vq->split.vring) = cpu_to_virtio16(_vq->vdev, 919 + vring_used_event(&vq->split.vring) = cpu_to_virtio16(vq->vq.vdev, 919 920 last_used_idx = vq->last_used_idx); 920 921 END_USE(vq); 921 922 return last_used_idx; ··· 1805 1806 } 1806 1807 } 1807 1808 1808 - static unsigned int virtqueue_enable_cb_prepare_packed(struct virtqueue *_vq) 1809 + static unsigned int virtqueue_enable_cb_prepare_packed(struct vring_virtqueue *vq) 1809 1810 { 1810 - struct vring_virtqueue *vq = to_vvq(_vq); 1811 - 1812 1811 START_USE(vq); 1813 1812 1814 1813 /* ··· 2568 2571 if (vq->event_triggered) 2569 2572 vq->event_triggered = false; 2570 2573 2571 - return vq->packed_ring ? virtqueue_enable_cb_prepare_packed(_vq) : 2572 - virtqueue_enable_cb_prepare_split(_vq); 2574 + return vq->packed_ring ? virtqueue_enable_cb_prepare_packed(vq) : 2575 + virtqueue_enable_cb_prepare_split(vq); 2573 2576 } 2574 2577 EXPORT_SYMBOL_GPL(virtqueue_enable_cb_prepare); 2575 2578