From f0ed36a64f1750a0ebc5d2a5437f4740985461d7 Mon Sep 17 00:00:00 2001 From: Stefano Garzarella Date: Tue, 27 Jul 2021 16:59:35 +0200 Subject: [PATCH 1/2] iothread: rename PollParamInfo to IOThreadParamInfo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 1793ad0247 ("iothread: add aio-max-batch parameter") added a new parameter (aio-max-batch) to IOThread and used PollParamInfo structure to handle it. Since it is not a parameter of the polling mechanism, we rename the structure to a more generic IOThreadParamInfo. Suggested-by: Kevin Wolf Signed-off-by: Stefano Garzarella Reviewed-by: Philippe Mathieu-Daudé Message-id: 20210727145936.147032-2-sgarzare@redhat.com Signed-off-by: Stefan Hajnoczi --- iothread.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/iothread.c b/iothread.c index ddbbde61f7..a73e560ba0 100644 --- a/iothread.c +++ b/iothread.c @@ -215,18 +215,18 @@ static void iothread_complete(UserCreatable *obj, Error **errp) typedef struct { const char *name; ptrdiff_t offset; /* field's byte offset in IOThread struct */ -} PollParamInfo; +} IOThreadParamInfo; -static PollParamInfo poll_max_ns_info = { +static IOThreadParamInfo poll_max_ns_info = { "poll-max-ns", offsetof(IOThread, poll_max_ns), }; -static PollParamInfo poll_grow_info = { +static IOThreadParamInfo poll_grow_info = { "poll-grow", offsetof(IOThread, poll_grow), }; -static PollParamInfo poll_shrink_info = { +static IOThreadParamInfo poll_shrink_info = { "poll-shrink", offsetof(IOThread, poll_shrink), }; -static PollParamInfo aio_max_batch_info = { +static IOThreadParamInfo aio_max_batch_info = { "aio-max-batch", offsetof(IOThread, aio_max_batch), }; @@ -234,7 +234,7 @@ static void iothread_get_param(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { IOThread *iothread = IOTHREAD(obj); - PollParamInfo *info = opaque; + IOThreadParamInfo *info = opaque; int64_t *field = (void *)iothread + info->offset; visit_type_int64(v, name, field, errp); @@ -244,7 +244,7 @@ static bool iothread_set_param(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { IOThread *iothread = IOTHREAD(obj); - PollParamInfo *info = opaque; + IOThreadParamInfo *info = opaque; int64_t *field = (void *)iothread + info->offset; int64_t value; From 1cc7eada97914f090125e588497986f6f7900514 Mon Sep 17 00:00:00 2001 From: Stefano Garzarella Date: Tue, 27 Jul 2021 16:59:36 +0200 Subject: [PATCH 2/2] iothread: use IOThreadParamInfo in iothread_[set|get]_param() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 0445409d74 ("iothread: generalize iothread_set_param/iothread_get_param") moved common code to set and get IOThread parameters in two new functions. These functions are called inside callbacks, so we don't need to use an opaque pointer. Let's replace `void *opaque` parameter with `IOThreadParamInfo *info`. Suggested-by: Kevin Wolf Signed-off-by: Stefano Garzarella Reviewed-by: Philippe Mathieu-Daudé Message-id: 20210727145936.147032-3-sgarzare@redhat.com Signed-off-by: Stefan Hajnoczi --- iothread.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/iothread.c b/iothread.c index a73e560ba0..0f98af0f2a 100644 --- a/iothread.c +++ b/iothread.c @@ -231,20 +231,18 @@ static IOThreadParamInfo aio_max_batch_info = { }; static void iothread_get_param(Object *obj, Visitor *v, - const char *name, void *opaque, Error **errp) + const char *name, IOThreadParamInfo *info, Error **errp) { IOThread *iothread = IOTHREAD(obj); - IOThreadParamInfo *info = opaque; int64_t *field = (void *)iothread + info->offset; visit_type_int64(v, name, field, errp); } static bool iothread_set_param(Object *obj, Visitor *v, - const char *name, void *opaque, Error **errp) + const char *name, IOThreadParamInfo *info, Error **errp) { IOThread *iothread = IOTHREAD(obj); - IOThreadParamInfo *info = opaque; int64_t *field = (void *)iothread + info->offset; int64_t value; @@ -266,16 +264,18 @@ static bool iothread_set_param(Object *obj, Visitor *v, static void iothread_get_poll_param(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { + IOThreadParamInfo *info = opaque; - iothread_get_param(obj, v, name, opaque, errp); + iothread_get_param(obj, v, name, info, errp); } static void iothread_set_poll_param(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { IOThread *iothread = IOTHREAD(obj); + IOThreadParamInfo *info = opaque; - if (!iothread_set_param(obj, v, name, opaque, errp)) { + if (!iothread_set_param(obj, v, name, info, errp)) { return; } @@ -291,16 +291,18 @@ static void iothread_set_poll_param(Object *obj, Visitor *v, static void iothread_get_aio_param(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { + IOThreadParamInfo *info = opaque; - iothread_get_param(obj, v, name, opaque, errp); + iothread_get_param(obj, v, name, info, errp); } static void iothread_set_aio_param(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { IOThread *iothread = IOTHREAD(obj); + IOThreadParamInfo *info = opaque; - if (!iothread_set_param(obj, v, name, opaque, errp)) { + if (!iothread_set_param(obj, v, name, info, errp)) { return; }