mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-29 09:12:07 +00:00
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>
This commit is contained in:
parent
18cd029fd7
commit
b49503eaf9
@ -1099,7 +1099,7 @@ static const struct virtio_config_ops virtio_uml_config_ops = {
|
||||
.get_status = vu_get_status,
|
||||
.set_status = vu_set_status,
|
||||
.reset = vu_reset,
|
||||
.find_vqs_info = vu_find_vqs,
|
||||
.find_vqs = vu_find_vqs,
|
||||
.del_vqs = vu_del_vqs,
|
||||
.get_features = vu_get_features,
|
||||
.finalize_features = vu_finalize_features,
|
||||
|
@ -1175,7 +1175,7 @@ static void tmfifo_virtio_dev_release(struct device *device)
|
||||
static const struct virtio_config_ops mlxbf_tmfifo_virtio_config_ops = {
|
||||
.get_features = mlxbf_tmfifo_virtio_get_features,
|
||||
.finalize_features = mlxbf_tmfifo_virtio_finalize_features,
|
||||
.find_vqs_info = mlxbf_tmfifo_virtio_find_vqs,
|
||||
.find_vqs = mlxbf_tmfifo_virtio_find_vqs,
|
||||
.del_vqs = mlxbf_tmfifo_virtio_del_vqs,
|
||||
.reset = mlxbf_tmfifo_virtio_reset,
|
||||
.set_status = mlxbf_tmfifo_virtio_set_status,
|
||||
|
@ -327,7 +327,7 @@ static void rproc_virtio_set(struct virtio_device *vdev, unsigned int offset,
|
||||
static const struct virtio_config_ops rproc_virtio_config_ops = {
|
||||
.get_features = rproc_virtio_get_features,
|
||||
.finalize_features = rproc_virtio_finalize_features,
|
||||
.find_vqs_info = rproc_virtio_find_vqs,
|
||||
.find_vqs = rproc_virtio_find_vqs,
|
||||
.del_vqs = rproc_virtio_del_vqs,
|
||||
.reset = rproc_virtio_reset,
|
||||
.set_status = rproc_virtio_set_status,
|
||||
|
@ -1078,7 +1078,7 @@ static const struct virtio_config_ops virtio_ccw_config_ops = {
|
||||
.get_status = virtio_ccw_get_status,
|
||||
.set_status = virtio_ccw_set_status,
|
||||
.reset = virtio_ccw_reset,
|
||||
.find_vqs_info = virtio_ccw_find_vqs,
|
||||
.find_vqs = virtio_ccw_find_vqs,
|
||||
.del_vqs = virtio_ccw_del_vqs,
|
||||
.bus_name = virtio_ccw_bus_name,
|
||||
.synchronize_cbs = virtio_ccw_synchronize_cbs,
|
||||
|
@ -570,7 +570,7 @@ static const struct virtio_config_ops virtio_mmio_config_ops = {
|
||||
.get_status = vm_get_status,
|
||||
.set_status = vm_set_status,
|
||||
.reset = vm_reset,
|
||||
.find_vqs_info = vm_find_vqs,
|
||||
.find_vqs = vm_find_vqs,
|
||||
.del_vqs = vm_del_vqs,
|
||||
.get_features = vm_get_features,
|
||||
.finalize_features = vm_finalize_features,
|
||||
|
@ -192,7 +192,7 @@ static const struct virtio_config_ops virtio_pci_config_ops = {
|
||||
.get_status = vp_get_status,
|
||||
.set_status = vp_set_status,
|
||||
.reset = vp_reset,
|
||||
.find_vqs_info = vp_find_vqs,
|
||||
.find_vqs = vp_find_vqs,
|
||||
.del_vqs = vp_del_vqs,
|
||||
.synchronize_cbs = vp_synchronize_vectors,
|
||||
.get_features = vp_get_features,
|
||||
|
@ -781,7 +781,7 @@ static const struct virtio_config_ops virtio_pci_config_nodev_ops = {
|
||||
.get_status = vp_get_status,
|
||||
.set_status = vp_set_status,
|
||||
.reset = vp_reset,
|
||||
.find_vqs_info = vp_modern_find_vqs,
|
||||
.find_vqs = vp_modern_find_vqs,
|
||||
.del_vqs = vp_del_vqs,
|
||||
.synchronize_cbs = vp_synchronize_vectors,
|
||||
.get_features = vp_get_features,
|
||||
@ -803,7 +803,7 @@ static const struct virtio_config_ops virtio_pci_config_ops = {
|
||||
.get_status = vp_get_status,
|
||||
.set_status = vp_set_status,
|
||||
.reset = vp_reset,
|
||||
.find_vqs_info = vp_modern_find_vqs,
|
||||
.find_vqs = vp_modern_find_vqs,
|
||||
.del_vqs = vp_del_vqs,
|
||||
.synchronize_cbs = vp_synchronize_vectors,
|
||||
.get_features = vp_get_features,
|
||||
|
@ -469,7 +469,7 @@ static const struct virtio_config_ops virtio_vdpa_config_ops = {
|
||||
.get_status = virtio_vdpa_get_status,
|
||||
.set_status = virtio_vdpa_set_status,
|
||||
.reset = virtio_vdpa_reset,
|
||||
.find_vqs_info = virtio_vdpa_find_vqs,
|
||||
.find_vqs = virtio_vdpa_find_vqs,
|
||||
.del_vqs = virtio_vdpa_del_vqs,
|
||||
.get_features = virtio_vdpa_get_features,
|
||||
.finalize_features = virtio_vdpa_finalize_features,
|
||||
|
@ -63,7 +63,7 @@ struct virtqueue_info {
|
||||
* After this, status and feature negotiation must be done again
|
||||
* Device must not be reset from its vq/config callbacks, or in
|
||||
* parallel with being added/removed.
|
||||
* @find_vqs_info: find virtqueues and instantiate them.
|
||||
* @find_vqs: find virtqueues and instantiate them.
|
||||
* vdev: the virtio_device
|
||||
* nvqs: the number of virtqueues to find
|
||||
* vqs: on success, includes new virtqueues
|
||||
@ -116,7 +116,7 @@ struct virtio_config_ops {
|
||||
u8 (*get_status)(struct virtio_device *vdev);
|
||||
void (*set_status)(struct virtio_device *vdev, u8 status);
|
||||
void (*reset)(struct virtio_device *vdev);
|
||||
int (*find_vqs_info)(struct virtio_device *vdev, unsigned int nvqs,
|
||||
int (*find_vqs)(struct virtio_device *vdev, unsigned int nvqs,
|
||||
struct virtqueue *vqs[],
|
||||
struct virtqueue_info vqs_info[],
|
||||
struct irq_affinity *desc);
|
||||
@ -227,7 +227,7 @@ int virtio_find_vqs_info(struct virtio_device *vdev, unsigned int nvqs,
|
||||
struct virtqueue_info vqs_info[],
|
||||
struct irq_affinity *desc)
|
||||
{
|
||||
return vdev->config->find_vqs_info(vdev, nvqs, vqs, vqs_info, desc);
|
||||
return vdev->config->find_vqs(vdev, nvqs, vqs, vqs_info, desc);
|
||||
}
|
||||
|
||||
static inline
|
||||
|
Loading…
Reference in New Issue
Block a user