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 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: 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-11-jasowang@redhat.com>

authored by

Jason Wang and committed by
Michael S. Tsirkin 7e810176 62fa22cd

+5 -9
+5 -9
drivers/virtio/virtio_ring.c
··· 873 873 return ret; 874 874 } 875 875 876 - static void virtqueue_disable_cb_split(struct virtqueue *_vq) 876 + static void virtqueue_disable_cb_split(struct vring_virtqueue *vq) 877 877 { 878 - struct vring_virtqueue *vq = to_vvq(_vq); 879 - 880 878 if (!(vq->split.avail_flags_shadow & VRING_AVAIL_F_NO_INTERRUPT)) { 881 879 vq->split.avail_flags_shadow |= VRING_AVAIL_F_NO_INTERRUPT; 882 880 ··· 890 892 vring_used_event(&vq->split.vring) = 0x0; 891 893 else 892 894 vq->split.vring.avail->flags = 893 - cpu_to_virtio16(_vq->vdev, 895 + cpu_to_virtio16(vq->vq.vdev, 894 896 vq->split.avail_flags_shadow); 895 897 } 896 898 } ··· 1783 1785 return ret; 1784 1786 } 1785 1787 1786 - static void virtqueue_disable_cb_packed(struct virtqueue *_vq) 1788 + static void virtqueue_disable_cb_packed(struct vring_virtqueue *vq) 1787 1789 { 1788 - struct vring_virtqueue *vq = to_vvq(_vq); 1789 - 1790 1790 if (vq->packed.event_flags_shadow != VRING_PACKED_EVENT_FLAG_DISABLE) { 1791 1791 vq->packed.event_flags_shadow = VRING_PACKED_EVENT_FLAG_DISABLE; 1792 1792 ··· 2537 2541 struct vring_virtqueue *vq = to_vvq(_vq); 2538 2542 2539 2543 if (vq->packed_ring) 2540 - virtqueue_disable_cb_packed(_vq); 2544 + virtqueue_disable_cb_packed(vq); 2541 2545 else 2542 - virtqueue_disable_cb_split(_vq); 2546 + virtqueue_disable_cb_split(vq); 2543 2547 } 2544 2548 EXPORT_SYMBOL_GPL(virtqueue_disable_cb); 2545 2549