* [PULL 1/2] iothread: rename PollParamInfo to IOThreadParamInfo
2021-10-11 12:40 [PULL 0/2] Block patches Stefan Hajnoczi
@ 2021-10-11 12:40 ` Stefan Hajnoczi
2021-10-11 12:40 ` [PULL 2/2] iothread: use IOThreadParamInfo in iothread_[set|get]_param() Stefan Hajnoczi
2021-10-11 18:23 ` [PULL 0/2] Block patches Richard Henderson
2 siblings, 0 replies; 4+ messages in thread
From: Stefan Hajnoczi @ 2021-10-11 12:40 UTC (permalink / raw)
To: Peter Maydell, qemu-devel
Cc: Kevin Wolf, Philippe Mathieu-Daudé, qemu-block,
Stefan Hajnoczi, Stefano Garzarella
From: Stefano Garzarella <sgarzare@redhat.com>
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 <kwolf@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20210727145936.147032-2-sgarzare@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
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;
--
2.31.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PULL 2/2] iothread: use IOThreadParamInfo in iothread_[set|get]_param()
2021-10-11 12:40 [PULL 0/2] Block patches Stefan Hajnoczi
2021-10-11 12:40 ` [PULL 1/2] iothread: rename PollParamInfo to IOThreadParamInfo Stefan Hajnoczi
@ 2021-10-11 12:40 ` Stefan Hajnoczi
2021-10-11 18:23 ` [PULL 0/2] Block patches Richard Henderson
2 siblings, 0 replies; 4+ messages in thread
From: Stefan Hajnoczi @ 2021-10-11 12:40 UTC (permalink / raw)
To: Peter Maydell, qemu-devel
Cc: Kevin Wolf, Philippe Mathieu-Daudé, qemu-block,
Stefan Hajnoczi, Stefano Garzarella
From: Stefano Garzarella <sgarzare@redhat.com>
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 <kwolf@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20210727145936.147032-3-sgarzare@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
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;
}
--
2.31.1
^ permalink raw reply related [flat|nested] 4+ messages in thread