Series comparison

-[Qemu-devel] [PULL 0/2] Block patches
+[PULL 0/2] Block patches
-The following changes since commit 41feb5b955f0d7c9d071b2c5adbc404ae2895c7a:
+The following changes since commit ca61fa4b803e5d0abaf6f1ceb690f23bb78a4def:
-  Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.0-pull-request' into staging (2018-06-05 10:38:33 +0100)
+  Merge remote-tracking branch 'remotes/quic/tags/pull-hex-20211006' into staging (2021-10-06 12:11:14 -0700)
-are available in the git repository at:
+are available in the Git repository at:
-  git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
+  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 68acc99f143b60ec4faa2903065b187d4d3c4bf3:
+for you to fetch changes up to 1cc7eada97914f090125e588497986f6f7900514:
-  sheepdog: remove huge BSS object (2018-06-05 10:15:12 -0400)
+  iothread: use IOThreadParamInfo in iothread_[set|get]_param() (2021-10-07 15:29:50 +0100)
 ----------------------------------------------------------------
-Sheepdog patches
+Pull request
 ----------------------------------------------------------------
-Paolo Bonzini (2):
+Stefano Garzarella (2):
-  sheepdog: cleanup repeated expression
+  iothread: rename PollParamInfo to IOThreadParamInfo
-  sheepdog: remove huge BSS object
+  iothread: use IOThreadParamInfo in iothread_[set|get]_param()
- block/sheepdog.c | 28 +++++++++++++++-------------
+ iothread.c | 28 +++++++++++++++-------------
 file changed, 15 insertions(+), 13 deletions(-)
 --
-.13.6
+.31.1

-[Qemu-devel] [PULL 2/2] sheepdog: remove huge BSS object
+[PULL 1/2] iothread: rename PollParamInfo to IOThreadParamInfo
-From: Paolo Bonzini <pbonzini@redhat.com>
+From: Stefano Garzarella <sgarzare@redhat.com>
-block/sheepdog.o has a 4M static variable that is 90% of QEMU's whole .bss
+Commit 1793ad0247 ("iothread: add aio-max-batch parameter") added
-section.  Replace it with a heap-allocated block, and make it smaller too
+a new parameter (aio-max-batch) to IOThread and used PollParamInfo
-since only the inode header is actually being used.
+structure to handle it.
-bss size goes down from 4464280 to 269976.
+Since it is not a parameter of the polling mechanism, we rename the
 structure to a more generic IOThreadParamInfo.
-Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+Suggested-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Jeff Cody <jcody@redhat.com>
+Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Message-Id: <20180523160721.14018-3-pbonzini@redhat.com>
+Message-id: 20210727145936.147032-2-sgarzare@redhat.com
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block/sheepdog.c | 22 ++++++++++++----------
+ iothread.c | 14 +++++++-------
-file changed, 12 insertions(+), 10 deletions(-)
+file changed, 7 insertions(+), 7 deletions(-)
-diff --git a/block/sheepdog.c b/block/sheepdog.c
+diff --git a/iothread.c b/iothread.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/sheepdog.c
+--- a/iothread.c
-+++ b/block/sheepdog.c
++++ b/iothread.c
-@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
+@@ -XXX,XX +XXX,XX @@ static void iothread_complete(UserCreatable *obj, Error **errp)
-     QEMUSnapshotInfo *sn_tab = NULL;
+ typedef struct {
-     unsigned wlen, rlen;
+     const char *name;
-     int found = 0;
+     ptrdiff_t offset; /* field's byte offset in IOThread struct */
--    static SheepdogInode inode;
+-} PollParamInfo;
-+    SheepdogInode *inode;
++} IOThreadParamInfo;
-     unsigned long *vdi_inuse;
-     unsigned int start_nr;
+-static PollParamInfo poll_max_ns_info = {
-     uint64_t hval;
++static IOThreadParamInfo poll_max_ns_info = {
-     uint32_t vid;
+     "poll-max-ns", offsetof(IOThread, poll_max_ns),
+ };
-     vdi_inuse = g_malloc(max);
+-static PollParamInfo poll_grow_info = {
-+    inode = g_malloc(SD_INODE_HEADER_SIZE);
++static IOThreadParamInfo poll_grow_info = {
+     "poll-grow", offsetof(IOThread, poll_grow),
-     fd = connect_to_sdog(s, &local_err);
+ };
-     if (fd < 0) {
+-static PollParamInfo poll_shrink_info = {
-@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
++static IOThreadParamInfo poll_shrink_info = {
-         }
+     "poll-shrink", offsetof(IOThread, poll_shrink),
+ };
-         /* we don't need to read entire object */
+-static PollParamInfo aio_max_batch_info = {
--        ret = read_object(fd, s->bs, (char *)&inode,
++static IOThreadParamInfo aio_max_batch_info = {
-+        ret = read_object(fd, s->bs, (char *)inode,
+     "aio-max-batch", offsetof(IOThread, aio_max_batch),
-                           vid_to_vdi_oid(vid),
+ };
-, SD_INODE_HEADER_SIZE, 0,
-                           s->cache_flags);
+@@ -XXX,XX +XXX,XX @@ static void iothread_get_param(Object *obj, Visitor *v,
-@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
+         const char *name, void *opaque, Error **errp)
-             continue;
+ {
-         }
+     IOThread *iothread = IOTHREAD(obj);
+-    PollParamInfo *info = opaque;
--        if (!strcmp(inode.name, s->name) && is_snapshot(&inode)) {
++    IOThreadParamInfo *info = opaque;
--            sn_tab[found].date_sec = inode.snap_ctime >> 32;
+     int64_t *field = (void *)iothread + info->offset;
--            sn_tab[found].date_nsec = inode.snap_ctime & 0xffffffff;
--            sn_tab[found].vm_state_size = inode.vm_state_size;
+     visit_type_int64(v, name, field, errp);
--            sn_tab[found].vm_clock_nsec = inode.vm_clock_nsec;
+@@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v,
-+        if (!strcmp(inode->name, s->name) && is_snapshot(inode)) {
+         const char *name, void *opaque, Error **errp)
-+            sn_tab[found].date_sec = inode->snap_ctime >> 32;
+ {
-+            sn_tab[found].date_nsec = inode->snap_ctime & 0xffffffff;
+     IOThread *iothread = IOTHREAD(obj);
-+            sn_tab[found].vm_state_size = inode->vm_state_size;
+-    PollParamInfo *info = opaque;
-+            sn_tab[found].vm_clock_nsec = inode->vm_clock_nsec;
++    IOThreadParamInfo *info = opaque;
+     int64_t *field = (void *)iothread + info->offset;
-             snprintf(sn_tab[found].id_str, sizeof(sn_tab[found].id_str),
+     int64_t value;
--                     "%" PRIu32, inode.snap_id);
 +                     "%" PRIu32, inode->snap_id);
              pstrcpy(sn_tab[found].name,
 -                    MIN(sizeof(sn_tab[found].name), sizeof(inode.tag)),
 -                    inode.tag);
 +                    MIN(sizeof(sn_tab[found].name), sizeof(inode->tag)),
 +                    inode->tag);
              found++;
          }
      }
@@ -XXX,XX +XXX,XX @@ out:
      *psn_tab = sn_tab;
      g_free(vdi_inuse);
 +    g_free(inode);
      if (ret < 0) {
          return ret;
 --
-.13.6
+.31.1

-[Qemu-devel] [PULL 1/2] sheepdog: cleanup repeated expression
+[PULL 2/2] iothread: use IOThreadParamInfo in iothread_[set|get]_param()
-From: Paolo Bonzini <pbonzini@redhat.com>
+From: Stefano Garzarella <sgarzare@redhat.com>
-The expression "SD_INODE_SIZE - sizeof(inode.data_vdi_id)" already has a macro
+Commit 0445409d74 ("iothread: generalize
-defined for the same value (though with a nicer definition using offsetof).
+iothread_set_param/iothread_get_param") moved common code to set and
-Replace it.
+get IOThread parameters in two new functions.
-Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+These functions are called inside callbacks, so we don't need to use an
-Reviewed-by: Fam Zheng <famz@redhat.com>
+opaque pointer. Let's replace `void *opaque` parameter with
-Reviewed-by: Jeff Cody <jcody@redhat.com>
+`IOThreadParamInfo *info`.
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-Message-Id: <20180523160721.14018-2-pbonzini@redhat.com>
+Suggested-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Jeff Cody <jcody@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>
 ---
- block/sheepdog.c | 6 +++---
+ iothread.c | 18 ++++++++++--------
-file changed, 3 insertions(+), 3 deletions(-)
+file changed, 10 insertions(+), 8 deletions(-)
-diff --git a/block/sheepdog.c b/block/sheepdog.c
+diff --git a/iothread.c b/iothread.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/sheepdog.c
+--- a/iothread.c
-+++ b/block/sheepdog.c
++++ b/iothread.c
-@@ -XXX,XX +XXX,XX @@ static int sd_truncate(BlockDriverState *bs, int64_t offset,
+@@ -XXX,XX +XXX,XX @@ 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;
@@ -XXX,XX +XXX,XX @@ 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;
      }
-     /* we don't need to update entire object */
+@@ -XXX,XX +XXX,XX @@ static void iothread_set_poll_param(Object *obj, Visitor *v,
--    datalen = SD_INODE_SIZE - sizeof(s->inode.data_vdi_id);
+ static void iothread_get_aio_param(Object *obj, Visitor *v,
-+    datalen = SD_INODE_HEADER_SIZE;
+         const char *name, void *opaque, Error **errp)
-     s->inode.vdi_size = offset;
+ {
-     ret = write_object(fd, s->bs, (char *)&s->inode,
++    IOThreadParamInfo *info = opaque;
-                        vid_to_vdi_oid(s->inode.vdi_id), s->inode.nr_copies,
-@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
+-    iothread_get_param(obj, v, name, opaque, errp);
-      */
++    iothread_get_param(obj, v, name, info, errp);
-     strncpy(s->inode.tag, sn_info->name, sizeof(s->inode.tag));
+ }
-     /* we don't need to update entire object */
--    datalen = SD_INODE_SIZE - sizeof(s->inode.data_vdi_id);
+ static void iothread_set_aio_param(Object *obj, Visitor *v,
-+    datalen = SD_INODE_HEADER_SIZE;
+         const char *name, void *opaque, Error **errp)
-     inode = g_malloc(datalen);
+ {
+     IOThread *iothread = IOTHREAD(obj);
-     /* refresh inode. */
++    IOThreadParamInfo *info = opaque;
-@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
-         /* we don't need to read entire object */
+-    if (!iothread_set_param(obj, v, name, opaque, errp)) {
-         ret = read_object(fd, s->bs, (char *)&inode,
++    if (!iothread_set_param(obj, v, name, info, errp)) {
-                           vid_to_vdi_oid(vid),
+         return;
--                          0, SD_INODE_SIZE - sizeof(inode.data_vdi_id), 0,
+     }
-+                          0, SD_INODE_HEADER_SIZE, 0,
                            s->cache_flags);
          if (ret) {
 --
-.13.6
+.31.1

From: Paolo Bonzini <pbonzini@redhat.com>

The expression "SD_INODE_SIZE - sizeof(inode.data_vdi_id)" already has a macro
defined for the same value (though with a nicer definition using offsetof).
Replace it.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20180523160721.14018-2-pbonzini@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/sheepdog.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/block/sheepdog.c b/block/sheepdog.c
index XXXXXXX..XXXXXXX 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -XXX,XX +XXX,XX @@ static int sd_truncate(BlockDriverState *bs, int64_t offset,
     }
 
     /* we don't need to update entire object */
-    datalen = SD_INODE_SIZE - sizeof(s->inode.data_vdi_id);
+    datalen = SD_INODE_HEADER_SIZE;
     s->inode.vdi_size = offset;
     ret = write_object(fd, s->bs, (char *)&s->inode,
                        vid_to_vdi_oid(s->inode.vdi_id), s->inode.nr_copies,
@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
      */
     strncpy(s->inode.tag, sn_info->name, sizeof(s->inode.tag));
     /* we don't need to update entire object */
-    datalen = SD_INODE_SIZE - sizeof(s->inode.data_vdi_id);
+    datalen = SD_INODE_HEADER_SIZE;
     inode = g_malloc(datalen);
 
     /* refresh inode. */
@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
         /* we don't need to read entire object */
         ret = read_object(fd, s->bs, (char *)&inode,
                           vid_to_vdi_oid(vid),
-                          0, SD_INODE_SIZE - sizeof(inode.data_vdi_id), 0,
+                          0, SD_INODE_HEADER_SIZE, 0,
                           s->cache_flags);
 
         if (ret) {
-- 
2.13.6

From: Paolo Bonzini <pbonzini@redhat.com>

block/sheepdog.o has a 4M static variable that is 90% of QEMU's whole .bss
section.  Replace it with a heap-allocated block, and make it smaller too
since only the inode header is actually being used.

bss size goes down from 4464280 to 269976.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20180523160721.14018-3-pbonzini@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/sheepdog.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/block/sheepdog.c b/block/sheepdog.c
index XXXXXXX..XXXXXXX 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
     QEMUSnapshotInfo *sn_tab = NULL;
     unsigned wlen, rlen;
     int found = 0;
-    static SheepdogInode inode;
+    SheepdogInode *inode;
     unsigned long *vdi_inuse;
     unsigned int start_nr;
     uint64_t hval;
     uint32_t vid;
 
     vdi_inuse = g_malloc(max);
+    inode = g_malloc(SD_INODE_HEADER_SIZE);
 
     fd = connect_to_sdog(s, &local_err);
     if (fd < 0) {
@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
         }
 
         /* we don't need to read entire object */
-        ret = read_object(fd, s->bs, (char *)&inode,
+        ret = read_object(fd, s->bs, (char *)inode,
                           vid_to_vdi_oid(vid),
                           0, SD_INODE_HEADER_SIZE, 0,
                           s->cache_flags);
@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
             continue;
         }
 
-        if (!strcmp(inode.name, s->name) && is_snapshot(&inode)) {
-            sn_tab[found].date_sec = inode.snap_ctime >> 32;
-            sn_tab[found].date_nsec = inode.snap_ctime & 0xffffffff;
-            sn_tab[found].vm_state_size = inode.vm_state_size;
-            sn_tab[found].vm_clock_nsec = inode.vm_clock_nsec;
+        if (!strcmp(inode->name, s->name) && is_snapshot(inode)) {
+            sn_tab[found].date_sec = inode->snap_ctime >> 32;
+            sn_tab[found].date_nsec = inode->snap_ctime & 0xffffffff;
+            sn_tab[found].vm_state_size = inode->vm_state_size;
+            sn_tab[found].vm_clock_nsec = inode->vm_clock_nsec;
 
             snprintf(sn_tab[found].id_str, sizeof(sn_tab[found].id_str),
-                     "%" PRIu32, inode.snap_id);
+                     "%" PRIu32, inode->snap_id);
             pstrcpy(sn_tab[found].name,
-                    MIN(sizeof(sn_tab[found].name), sizeof(inode.tag)),
-                    inode.tag);
+                    MIN(sizeof(sn_tab[found].name), sizeof(inode->tag)),
+                    inode->tag);
             found++;
         }
     }
@@ -XXX,XX +XXX,XX @@ out:
     *psn_tab = sn_tab;
 
     g_free(vdi_inuse);
+    g_free(inode);
 
     if (ret < 0) {
         return ret;
-- 
2.13.6

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 XXXXXXX..XXXXXXX 100644
--- a/iothread.c
+++ b/iothread.c
@@ -XXX,XX +XXX,XX @@ 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),
 };
 
@@ -XXX,XX +XXX,XX @@ 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);
@@ -XXX,XX +XXX,XX @@ 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

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 XXXXXXX..XXXXXXX 100644
--- a/iothread.c
+++ b/iothread.c
@@ -XXX,XX +XXX,XX @@ 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;
 
@@ -XXX,XX +XXX,XX @@ 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;
     }
 
@@ -XXX,XX +XXX,XX @@ 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