Series comparison

-[PULL 0/2] Block patches
+[PULL 0/1] Block patches
-The following changes since commit ca61fa4b803e5d0abaf6f1ceb690f23bb78a4def:
+The following changes since commit 99fc08366b06282614daeda989d2fde6ab8a707f:
-  Merge remote-tracking branch 'remotes/quic/tags/pull-hex-20211006' into staging (2021-10-06 12:11:14 -0700)
+  Merge tag 'seabios-20211203-pull-request' of git://git.kraxel.org/qemu into staging (2021-12-03 05:26:40 -0800)
 are available in the Git repository at:
   https://gitlab.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 1cc7eada97914f090125e588497986f6f7900514:
+for you to fetch changes up to 5b807181c27a940a3a7ad1f221a2e76a132cbdc0:
-  iothread: use IOThreadParamInfo in iothread_[set|get]_param() (2021-10-07 15:29:50 +0100)
+  virtio-blk: Fix clean up of host notifiers for single MR transaction. (2021-12-06 14:21:14 +0000)
 ----------------------------------------------------------------
 Pull request
 ----------------------------------------------------------------
-Stefano Garzarella (2):
+Mark Mielke (1):
-  iothread: rename PollParamInfo to IOThreadParamInfo
+  virtio-blk: Fix clean up of host notifiers for single MR transaction.
   iothread: use IOThreadParamInfo in iothread_[set|get]_param()
- iothread.c | 28 +++++++++++++++-------------
+ hw/block/dataplane/virtio-blk.c | 2 +-
-file changed, 15 insertions(+), 13 deletions(-)
+file changed, 1 insertion(+), 1 deletion(-)
 --
-.31.1
+.33.1

-[PULL 1/2] iothread: rename PollParamInfo to IOThreadParamInfo
+Deleted patch
-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 +++++++-------
-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;
---
-.31.1

-[PULL 2/2] iothread: use IOThreadParamInfo in iothread_[set|get]_param()
+[PULL 1/1] virtio-blk: Fix clean up of host notifiers for single MR transaction.
-From: Stefano Garzarella <sgarzare@redhat.com>
+From: Mark Mielke <mark.mielke@gmail.com>
-Commit 0445409d74 ("iothread: generalize
+The code that introduced "virtio-blk: Configure all host notifiers in
-iothread_set_param/iothread_get_param") moved common code to set and
+a single MR transaction" introduced a second loop variable to perform
-get IOThread parameters in two new functions.
+cleanup in second loop, but mistakenly still refers to the first
 loop variable within the second loop body.
-These functions are called inside callbacks, so we don't need to use an
+Fixes: d0267da61489 ("virtio-blk: Configure all host notifiers in a single MR transaction")
-opaque pointer. Let's replace `void *opaque` parameter with
+Signed-off-by: Mark Mielke <mark.mielke@gmail.com>
-`IOThreadParamInfo *info`.
+Message-id: CALm7yL08qarOu0dnQkTN+pa=BSRC92g31YpQQNDeAiT4yLZWQQ@mail.gmail.com
 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 ++++++++++--------
+ hw/block/dataplane/virtio-blk.c | 2 +-
-file changed, 10 insertions(+), 8 deletions(-)
+file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/iothread.c b/iothread.c
+diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
 index XXXXXXX..XXXXXXX 100644
---- a/iothread.c
+--- a/hw/block/dataplane/virtio-blk.c
-+++ b/iothread.c
++++ b/hw/block/dataplane/virtio-blk.c
-@@ -XXX,XX +XXX,XX @@ static IOThreadParamInfo aio_max_batch_info = {
+@@ -XXX,XX +XXX,XX @@ int virtio_blk_data_plane_start(VirtIODevice *vdev)
- };
+             memory_region_transaction_commit();
- static void iothread_get_param(Object *obj, Visitor *v,
+             while (j--) {
--        const char *name, void *opaque, Error **errp)
+-                virtio_bus_cleanup_host_notifier(VIRTIO_BUS(qbus), i);
-+        const char *name, IOThreadParamInfo *info, Error **errp)
++                virtio_bus_cleanup_host_notifier(VIRTIO_BUS(qbus), j);
- {
+             }
-     IOThread *iothread = IOTHREAD(obj);
+             goto fail_host_notifiers;
--    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;
      }
 --
-.31.1
+.33.1

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

From: Mark Mielke <mark.mielke@gmail.com>

The code that introduced "virtio-blk: Configure all host notifiers in
a single MR transaction" introduced a second loop variable to perform
cleanup in second loop, but mistakenly still refers to the first
loop variable within the second loop body.

Fixes: d0267da61489 ("virtio-blk: Configure all host notifiers in a single MR transaction")
Signed-off-by: Mark Mielke <mark.mielke@gmail.com>
Message-id: CALm7yL08qarOu0dnQkTN+pa=BSRC92g31YpQQNDeAiT4yLZWQQ@mail.gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/block/dataplane/virtio-blk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/dataplane/virtio-blk.c
+++ b/hw/block/dataplane/virtio-blk.c
@@ -XXX,XX +XXX,XX @@ int virtio_blk_data_plane_start(VirtIODevice *vdev)
             memory_region_transaction_commit();
 
             while (j--) {
-                virtio_bus_cleanup_host_notifier(VIRTIO_BUS(qbus), i);
+                virtio_bus_cleanup_host_notifier(VIRTIO_BUS(qbus), j);
             }
             goto fail_host_notifiers;
         }
-- 
2.33.1