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

virtio: rename find_vqs_info() op to find_vqs()

Since the original find_vqs() is no longer present, rename
find_vqs_info() back to find_vqs().

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Message-Id: <20240708074814.1739223-10-jiri@resnulli.us>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

authored by

Jiri Pirko and committed by
Michael S. Tsirkin
b49503ea 18cd029f

+15 -15
+1 -1
arch/um/drivers/virtio_uml.c
··· 1099 1099 .get_status = vu_get_status, 1100 1100 .set_status = vu_set_status, 1101 1101 .reset = vu_reset, 1102 - .find_vqs_info = vu_find_vqs, 1102 + .find_vqs = vu_find_vqs, 1103 1103 .del_vqs = vu_del_vqs, 1104 1104 .get_features = vu_get_features, 1105 1105 .finalize_features = vu_finalize_features,
+1 -1
drivers/platform/mellanox/mlxbf-tmfifo.c
··· 1175 1175 static const struct virtio_config_ops mlxbf_tmfifo_virtio_config_ops = { 1176 1176 .get_features = mlxbf_tmfifo_virtio_get_features, 1177 1177 .finalize_features = mlxbf_tmfifo_virtio_finalize_features, 1178 - .find_vqs_info = mlxbf_tmfifo_virtio_find_vqs, 1178 + .find_vqs = mlxbf_tmfifo_virtio_find_vqs, 1179 1179 .del_vqs = mlxbf_tmfifo_virtio_del_vqs, 1180 1180 .reset = mlxbf_tmfifo_virtio_reset, 1181 1181 .set_status = mlxbf_tmfifo_virtio_set_status,
+1 -1
drivers/remoteproc/remoteproc_virtio.c
··· 327 327 static const struct virtio_config_ops rproc_virtio_config_ops = { 328 328 .get_features = rproc_virtio_get_features, 329 329 .finalize_features = rproc_virtio_finalize_features, 330 - .find_vqs_info = rproc_virtio_find_vqs, 330 + .find_vqs = rproc_virtio_find_vqs, 331 331 .del_vqs = rproc_virtio_del_vqs, 332 332 .reset = rproc_virtio_reset, 333 333 .set_status = rproc_virtio_set_status,
+1 -1
drivers/s390/virtio/virtio_ccw.c
··· 1078 1078 .get_status = virtio_ccw_get_status, 1079 1079 .set_status = virtio_ccw_set_status, 1080 1080 .reset = virtio_ccw_reset, 1081 - .find_vqs_info = virtio_ccw_find_vqs, 1081 + .find_vqs = virtio_ccw_find_vqs, 1082 1082 .del_vqs = virtio_ccw_del_vqs, 1083 1083 .bus_name = virtio_ccw_bus_name, 1084 1084 .synchronize_cbs = virtio_ccw_synchronize_cbs,
+1 -1
drivers/virtio/virtio_mmio.c
··· 570 570 .get_status = vm_get_status, 571 571 .set_status = vm_set_status, 572 572 .reset = vm_reset, 573 - .find_vqs_info = vm_find_vqs, 573 + .find_vqs = vm_find_vqs, 574 574 .del_vqs = vm_del_vqs, 575 575 .get_features = vm_get_features, 576 576 .finalize_features = vm_finalize_features,
+1 -1
drivers/virtio/virtio_pci_legacy.c
··· 192 192 .get_status = vp_get_status, 193 193 .set_status = vp_set_status, 194 194 .reset = vp_reset, 195 - .find_vqs_info = vp_find_vqs, 195 + .find_vqs = vp_find_vqs, 196 196 .del_vqs = vp_del_vqs, 197 197 .synchronize_cbs = vp_synchronize_vectors, 198 198 .get_features = vp_get_features,
+2 -2
drivers/virtio/virtio_pci_modern.c
··· 781 781 .get_status = vp_get_status, 782 782 .set_status = vp_set_status, 783 783 .reset = vp_reset, 784 - .find_vqs_info = vp_modern_find_vqs, 784 + .find_vqs = vp_modern_find_vqs, 785 785 .del_vqs = vp_del_vqs, 786 786 .synchronize_cbs = vp_synchronize_vectors, 787 787 .get_features = vp_get_features, ··· 803 803 .get_status = vp_get_status, 804 804 .set_status = vp_set_status, 805 805 .reset = vp_reset, 806 - .find_vqs_info = vp_modern_find_vqs, 806 + .find_vqs = vp_modern_find_vqs, 807 807 .del_vqs = vp_del_vqs, 808 808 .synchronize_cbs = vp_synchronize_vectors, 809 809 .get_features = vp_get_features,
+1 -1
drivers/virtio/virtio_vdpa.c
··· 469 469 .get_status = virtio_vdpa_get_status, 470 470 .set_status = virtio_vdpa_set_status, 471 471 .reset = virtio_vdpa_reset, 472 - .find_vqs_info = virtio_vdpa_find_vqs, 472 + .find_vqs = virtio_vdpa_find_vqs, 473 473 .del_vqs = virtio_vdpa_del_vqs, 474 474 .get_features = virtio_vdpa_get_features, 475 475 .finalize_features = virtio_vdpa_finalize_features,
+6 -6
include/linux/virtio_config.h
··· 63 63 * After this, status and feature negotiation must be done again 64 64 * Device must not be reset from its vq/config callbacks, or in 65 65 * parallel with being added/removed. 66 - * @find_vqs_info: find virtqueues and instantiate them. 66 + * @find_vqs: find virtqueues and instantiate them. 67 67 * vdev: the virtio_device 68 68 * nvqs: the number of virtqueues to find 69 69 * vqs: on success, includes new virtqueues ··· 116 116 u8 (*get_status)(struct virtio_device *vdev); 117 117 void (*set_status)(struct virtio_device *vdev, u8 status); 118 118 void (*reset)(struct virtio_device *vdev); 119 - int (*find_vqs_info)(struct virtio_device *vdev, unsigned int nvqs, 120 - struct virtqueue *vqs[], 121 - struct virtqueue_info vqs_info[], 122 - struct irq_affinity *desc); 119 + int (*find_vqs)(struct virtio_device *vdev, unsigned int nvqs, 120 + struct virtqueue *vqs[], 121 + struct virtqueue_info vqs_info[], 122 + struct irq_affinity *desc); 123 123 void (*del_vqs)(struct virtio_device *); 124 124 void (*synchronize_cbs)(struct virtio_device *); 125 125 u64 (*get_features)(struct virtio_device *vdev); ··· 227 227 struct virtqueue_info vqs_info[], 228 228 struct irq_affinity *desc) 229 229 { 230 - return vdev->config->find_vqs_info(vdev, nvqs, vqs, vqs_info, desc); 230 + return vdev->config->find_vqs(vdev, nvqs, vqs, vqs_info, desc); 231 231 } 232 232 233 233 static inline