Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-20 15:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio_balloon: convert to use virtio_find_vqs_info()

Browse Source 
Instead of passing separate names and callbacks arrays
to virtio_find_vqs(), have one of virtual_queue_info structs and
pass it to virtio_find_vqs_info().

Suggested-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Message-Id: <20240708074814.1739223-17-jiri@resnulli.us>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Jiri Pirko 2024-07-08 09:48:11 +02:00 committed by Michael S. Tsirkin
parent fc496dcd93
commit 7221922da2
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/virtio/virtio_balloon.c
View File

@ -560,9 +560,8 @@ static void update_balloon_size_func(struct work_struct *work)
static int init_vqs(struct virtio_balloon *vb) static int init_vqs(struct virtio_balloon *vb)
{ {
struct virtqueue_info vqs_info[VIRTIO_BALLOON_VQ_MAX] = {};
struct virtqueue *vqs[VIRTIO_BALLOON_VQ_MAX]; struct virtqueue *vqs[VIRTIO_BALLOON_VQ_MAX];
vq_callback_t *callbacks[VIRTIO_BALLOON_VQ_MAX];
const char *names[VIRTIO_BALLOON_VQ_MAX];
int err; int err;
/* /*
@ -570,33 +569,26 @@ static int init_vqs(struct virtio_balloon *vb)
* will be NULL if the related feature is not enabled, which will * will be NULL if the related feature is not enabled, which will
* cause no allocation for the corresponding virtqueue in find_vqs. * cause no allocation for the corresponding virtqueue in find_vqs.
*/ */
callbacks[VIRTIO_BALLOON_VQ_INFLATE] = balloon_ack; vqs_info[VIRTIO_BALLOON_VQ_INFLATE].callback = balloon_ack;
names[VIRTIO_BALLOON_VQ_INFLATE] = "inflate"; vqs_info[VIRTIO_BALLOON_VQ_INFLATE].name = "inflate";
callbacks[VIRTIO_BALLOON_VQ_DEFLATE] = balloon_ack; vqs_info[VIRTIO_BALLOON_VQ_DEFLATE].callback = balloon_ack;
names[VIRTIO_BALLOON_VQ_DEFLATE] = "deflate"; vqs_info[VIRTIO_BALLOON_VQ_DEFLATE].name = "deflate";
callbacks[VIRTIO_BALLOON_VQ_STATS] = NULL;
names[VIRTIO_BALLOON_VQ_STATS] = NULL;
callbacks[VIRTIO_BALLOON_VQ_FREE_PAGE] = NULL;
names[VIRTIO_BALLOON_VQ_FREE_PAGE] = NULL;
names[VIRTIO_BALLOON_VQ_REPORTING] = NULL;
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_STATS_VQ)) { if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_STATS_VQ)) {
names[VIRTIO_BALLOON_VQ_STATS] = "stats"; vqs_info[VIRTIO_BALLOON_VQ_STATS].name = "stats";
callbacks[VIRTIO_BALLOON_VQ_STATS] = stats_request; vqs_info[VIRTIO_BALLOON_VQ_STATS].callback = stats_request;
} }
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT)) { if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT))
names[VIRTIO_BALLOON_VQ_FREE_PAGE] = "free_page_vq"; vqs_info[VIRTIO_BALLOON_VQ_FREE_PAGE].name = "free_page_vq";
callbacks[VIRTIO_BALLOON_VQ_FREE_PAGE] = NULL;
}
if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_REPORTING)) { if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_REPORTING)) {
names[VIRTIO_BALLOON_VQ_REPORTING] = "reporting_vq"; vqs_info[VIRTIO_BALLOON_VQ_REPORTING].name = "reporting_vq";
callbacks[VIRTIO_BALLOON_VQ_REPORTING] = balloon_ack; vqs_info[VIRTIO_BALLOON_VQ_REPORTING].callback = balloon_ack;
} }
err = virtio_find_vqs(vb->vdev, VIRTIO_BALLOON_VQ_MAX, vqs, err = virtio_find_vqs_info(vb->vdev, VIRTIO_BALLOON_VQ_MAX, vqs,
callbacks, names, NULL); vqs_info, NULL);
if (err) if (err)
return err; return err;