Series comparison

-[PULL for-5.0 0/4] Block patches
+[PULL 0/2] Block patches
-The following changes since commit 27c94566379069fb8930bb1433dcffbf7df3203d:
+The following changes since commit ca61fa4b803e5d0abaf6f1ceb690f23bb78a4def:
-  Merge remote-tracking branch 'remotes/edgar/tags/edgar/xilinx-next-2020-04-30.for-upstream' into staging (2020-04-30 16:47:23 +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:
-  https://github.com/stefanha/qemu.git tags/block-pull-request
+  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to cc1adc4488059ac16d4d2772a7aa7cd1323deeca:
+for you to fetch changes up to 1cc7eada97914f090125e588497986f6f7900514:
-  lockable: Replace locks with lock guard macros (2020-05-01 09:19:25 +0100)
+  iothread: use IOThreadParamInfo in iothread_[set|get]_param() (2021-10-07 15:29:50 +0100)
 ----------------------------------------------------------------
 Pull request
-Fix the QEMU_LOCK_GUARD() macros, use them more widely, and allow fuzzer
-targets to be invoked depending on argv[0].
 ----------------------------------------------------------------
-Alexander Bulekov (1):
+Stefano Garzarella (2):
-  fuzz: select fuzz target using executable name
+  iothread: rename PollParamInfo to IOThreadParamInfo
   iothread: use IOThreadParamInfo in iothread_[set|get]_param()
-Daniel Brodsky (2):
+ iothread.c | 28 +++++++++++++++-------------
-  lockable: fix __COUNTER__ macro to be referenced properly
+file changed, 15 insertions(+), 13 deletions(-)
   lockable: replaced locks with lock guard macros where appropriate
 Simran Singhal (1):
   lockable: Replace locks with lock guard macros
  include/qemu/lockable.h |  7 +++---
  include/qemu/rcu.h      |  2 +-
  block/iscsi.c           |  7 ++----
  block/nfs.c             | 51 +++++++++++++++++++----------------------
  cpus-common.c           | 14 ++++-------
  hw/display/qxl.c        | 43 ++++++++++++++++------------------
  hw/hyperv/hyperv.c      | 15 ++++++------
  hw/rdma/rdma_backend.c  | 50 ++++++++++++++++++++--------------------
  hw/rdma/rdma_rm.c       |  3 +--
  hw/vfio/platform.c      |  5 ++--
  migration/migration.c   |  3 +--
  migration/multifd.c     |  8 +++----
  migration/ram.c         |  3 +--
  monitor/misc.c          |  4 +---
  tests/qtest/fuzz/fuzz.c | 19 ++++++++-------
  ui/spice-display.c      | 14 +++++------
  util/log.c              |  4 ++--
  util/qemu-timer.c       | 17 +++++++-------
  util/rcu.c              |  8 +++----
  util/thread-pool.c      |  3 +--
  util/vfio-helpers.c     |  5 ++--
  slirp                   |  2 +-
 files changed, 133 insertions(+), 154 deletions(-)
 --
-.25.3
+.31.1

-New patch
+[PULL 1/2] iothread: rename PollParamInfo to IOThreadParamInfo
+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 for-5.0 1/4] fuzz: select fuzz target using executable name
+[PULL 2/2] iothread: use IOThreadParamInfo in iothread_[set|get]_param()
-From: Alexander Bulekov <alxndr@bu.edu>
+From: Stefano Garzarella <sgarzare@redhat.com>
-The fuzzers are built into a binary (e.g. qemu-fuzz-i386). To select the
+Commit 0445409d74 ("iothread: generalize
-device to fuzz/fuzz target, we usually use the --fuzz-target= argument.
+iothread_set_param/iothread_get_param") moved common code to set and
-This commit allows the fuzz-target to be specified using the name of the
+get IOThread parameters in two new functions.
 executable. If the executable name ends with -target-FUZZ_TARGET, then
 we select the fuzz target based on this name, rather than the
 --fuzz-target argument. This is useful for systems such as oss-fuzz
 where we don't have control of the arguments passed to the fuzzer.
-[Fixed incorrect indentation.
+These functions are called inside callbacks, so we don't need to use an
---Stefan]
+opaque pointer. Let's replace `void *opaque` parameter with
 `IOThreadParamInfo *info`.
-Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
+Suggested-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
+Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Message-id: 20200421182230.6313-1-alxndr@bu.edu
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
 Message-id: 20210727145936.147032-3-sgarzare@redhat.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- tests/qtest/fuzz/fuzz.c | 19 +++++++++++--------
+ iothread.c | 18 ++++++++++--------
- slirp                   |  2 +-
+file changed, 10 insertions(+), 8 deletions(-)
 files changed, 12 insertions(+), 9 deletions(-)
-diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c
+diff --git a/iothread.c b/iothread.c
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qtest/fuzz/fuzz.c
+--- a/iothread.c
-+++ b/tests/qtest/fuzz/fuzz.c
++++ b/iothread.c
-@@ -XXX,XX +XXX,XX @@ static void usage(char *path)
+@@ -XXX,XX +XXX,XX @@ static IOThreadParamInfo aio_max_batch_info = {
-         printf(" * %s  : %s\n", tmp->target->name,
+ };
-                 tmp->target->description);
  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;
      }
-+    printf("Alternatively, add -target-FUZZ_TARGET to the executable name\n");
-     exit(0);
+@@ -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);
  }
-@@ -XXX,XX +XXX,XX @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
+ static void iothread_set_aio_param(Object *obj, Visitor *v,
-     module_call_init(MODULE_INIT_QOM);
+         const char *name, void *opaque, Error **errp)
-     module_call_init(MODULE_INIT_LIBQOS);
+ {
+     IOThread *iothread = IOTHREAD(obj);
--    if (*argc <= 1) {
++    IOThreadParamInfo *info = opaque;
-+    target_name = strstr(**argv, "-target-");
-+    if (target_name) {        /* The binary name specifies the target */
+-    if (!iothread_set_param(obj, v, name, opaque, errp)) {
-+        target_name += strlen("-target-");
++    if (!iothread_set_param(obj, v, name, info, errp)) {
-+    } else if (*argc > 1) {  /* The target is specified as an argument */
+         return;
 +        target_name = (*argv)[1];
 +        if (!strstr(target_name, "--fuzz-target=")) {
 +            usage(**argv);
 +        }
 +        target_name += strlen("--fuzz-target=");
 +    } else {
          usage(**argv);
      }
-     /* Identify the fuzz target */
--    target_name = (*argv)[1];
--    if (!strstr(target_name, "--fuzz-target=")) {
--        usage(**argv);
--    }
--
--    target_name += strlen("--fuzz-target=");
--
-     fuzz_target = fuzz_get_target(target_name);
-     if (!fuzz_target) {
-         usage(**argv);
-diff --git a/slirp b/slirp
-index XXXXXXX..XXXXXXX 160000
---- a/slirp
-+++ b/slirp
-@@ -1 +1 @@
--Subproject commit 2faae0f778f818fadc873308f983289df697eb93
-+Subproject commit 55ab21c9a36852915b81f1b41ebaf3b6509dd8ba
 --
-.25.3
+.31.1

The following changes since commit 27c94566379069fb8930bb1433dcffbf7df3203d:

Merge remote-tracking branch 'remotes/edgar/tags/edgar/xilinx-next-2020-04-30.for-upstream' into staging (2020-04-30 16:47:23 +0100)

are available in the Git repository at:

https://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to cc1adc4488059ac16d4d2772a7aa7cd1323deeca:

lockable: Replace locks with lock guard macros (2020-05-01 09:19:25 +0100)

----------------------------------------------------------------
Pull request

Fix the QEMU_LOCK_GUARD() macros, use them more widely, and allow fuzzer
targets to be invoked depending on argv[0].

----------------------------------------------------------------

Alexander Bulekov (1):
  fuzz: select fuzz target using executable name

Daniel Brodsky (2):
  lockable: fix __COUNTER__ macro to be referenced properly
  lockable: replaced locks with lock guard macros where appropriate

Simran Singhal (1):
  lockable: Replace locks with lock guard macros

-- 
2.25.3

From: Alexander Bulekov <alxndr@bu.edu>

The fuzzers are built into a binary (e.g. qemu-fuzz-i386). To select the
device to fuzz/fuzz target, we usually use the --fuzz-target= argument.
This commit allows the fuzz-target to be specified using the name of the
executable. If the executable name ends with -target-FUZZ_TARGET, then
we select the fuzz target based on this name, rather than the
--fuzz-target argument. This is useful for systems such as oss-fuzz
where we don't have control of the arguments passed to the fuzzer.

[Fixed incorrect indentation.
--Stefan]

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Message-id: 20200421182230.6313-1-alxndr@bu.edu
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 tests/qtest/fuzz/fuzz.c | 19 +++++++++++--------
 slirp                   |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/qtest/fuzz/fuzz.c
+++ b/tests/qtest/fuzz/fuzz.c
@@ -XXX,XX +XXX,XX @@ static void usage(char *path)
         printf(" * %s  : %s\n", tmp->target->name,
                 tmp->target->description);
     }
+    printf("Alternatively, add -target-FUZZ_TARGET to the executable name\n");
     exit(0);
 }
 
@@ -XXX,XX +XXX,XX @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
     module_call_init(MODULE_INIT_QOM);
     module_call_init(MODULE_INIT_LIBQOS);
 
-    if (*argc <= 1) {
+    target_name = strstr(**argv, "-target-");
+    if (target_name) {        /* The binary name specifies the target */
+        target_name += strlen("-target-");
+    } else if (*argc > 1) {  /* The target is specified as an argument */
+        target_name = (*argv)[1];
+        if (!strstr(target_name, "--fuzz-target=")) {
+            usage(**argv);
+        }
+        target_name += strlen("--fuzz-target=");
+    } else {
         usage(**argv);
     }
 
     /* Identify the fuzz target */
-    target_name = (*argv)[1];
-    if (!strstr(target_name, "--fuzz-target=")) {
-        usage(**argv);
-    }
-
-    target_name += strlen("--fuzz-target=");
-
     fuzz_target = fuzz_get_target(target_name);
     if (!fuzz_target) {
         usage(**argv);
diff --git a/slirp b/slirp
index XXXXXXX..XXXXXXX 160000
--- a/slirp
+++ b/slirp
@@ -1 +1 @@
-Subproject commit 2faae0f778f818fadc873308f983289df697eb93
+Subproject commit 55ab21c9a36852915b81f1b41ebaf3b6509dd8ba
-- 
2.25.3

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