Series comparison

-[Qemu-devel] [PULL 0/1] Block patches
+[PULL for-5.0 0/4] Block patches
-The following changes since commit 64175afc695c0672876fbbfc31b299c86d562cb4:
+The following changes since commit 27c94566379069fb8930bb1433dcffbf7df3203d:
-  arm_gicv3: Fix ICC_BPR1 reset value when EL3 not implemented (2017-06-07 17:21:44 +0100)
+  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:
+are available in the Git repository at:
-  git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
+  https://github.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 56faeb9bb6872b3f926b3b3e0452a70beea10af2:
+for you to fetch changes up to cc1adc4488059ac16d4d2772a7aa7cd1323deeca:
-  block/gluster.c: Handle qdict_array_entries() failure (2017-06-09 08:41:29 -0400)
+  lockable: Replace locks with lock guard macros (2020-05-01 09:19:25 +0100)
 ----------------------------------------------------------------
-Gluster patch
+Pull request
 Fix the QEMU_LOCK_GUARD() macros, use them more widely, and allow fuzzer
 targets to be invoked depending on argv[0].
 ----------------------------------------------------------------
-Peter Maydell (1):
+Alexander Bulekov (1):
-  block/gluster.c: Handle qdict_array_entries() failure
+  fuzz: select fuzz target using executable name
- block/gluster.c | 3 +--
+Daniel Brodsky (2):
-file changed, 1 insertion(+), 2 deletions(-)
+  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
  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(-)
 --
-.9.3
+.25.3

-[Qemu-devel] [PULL 1/1] block/gluster.c: Handle qdict_array_entries() failure
+[PULL for-5.0 1/4] fuzz: select fuzz target using executable name
-From: Peter Maydell <peter.maydell@linaro.org>
+From: Alexander Bulekov <alxndr@bu.edu>
-In qemu_gluster_parse_json(), the call to qdict_array_entries()
+The fuzzers are built into a binary (e.g. qemu-fuzz-i386). To select the
-could return a negative error code, which we were ignoring
+device to fuzz/fuzz target, we usually use the --fuzz-target= argument.
-because we assigned the result to an unsigned variable.
+This commit allows the fuzz-target to be specified using the name of the
-Fix this by using the 'int' type instead, which matches the
+executable. If the executable name ends with -target-FUZZ_TARGET, then
-return type of qdict_array_entries() and also the type
+we select the fuzz target based on this name, rather than the
-we use for the loop enumeration variable 'i'.
+--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.
-(Spotted by Coverity, CID 1360960.)
+[Fixed incorrect indentation.
 --Stefan]
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
+Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
-Reviewed-by: Eric Blake <eblake@redhat.com>
+Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
-Reviewed-by: Jeff Cody <jcody@redhat.com>
+Message-id: 20200421182230.6313-1-alxndr@bu.edu
-Message-id: 1496682098-1540-1-git-send-email-peter.maydell@linaro.org
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Signed-off-by: Jeff Cody <jcody@redhat.com>
 ---
- block/gluster.c | 3 +--
+ tests/qtest/fuzz/fuzz.c | 19 +++++++++++--------
-file changed, 1 insertion(+), 2 deletions(-)
+ slirp                   |  2 +-
 files changed, 12 insertions(+), 9 deletions(-)
-diff --git a/block/gluster.c b/block/gluster.c
+diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/gluster.c
+--- a/tests/qtest/fuzz/fuzz.c
-+++ b/block/gluster.c
++++ b/tests/qtest/fuzz/fuzz.c
-@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
+@@ -XXX,XX +XXX,XX @@ static void usage(char *path)
-     Error *local_err = NULL;
+         printf(" * %s  : %s\n", tmp->target->name,
-     char *str = NULL;
+                 tmp->target->description);
-     const char *ptr;
+     }
--    size_t num_servers;
++    printf("Alternatively, add -target-FUZZ_TARGET to the executable name\n");
--    int i, type;
+     exit(0);
-+    int i, type, num_servers;
+ }
-     /* create opts info from runtime_json_opts list */
+@@ -XXX,XX +XXX,XX @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
-     opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort);
+     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
 --
-.9.3
+.25.3

From: Peter Maydell <peter.maydell@linaro.org>

In qemu_gluster_parse_json(), the call to qdict_array_entries()
could return a negative error code, which we were ignoring
because we assigned the result to an unsigned variable.
Fix this by using the 'int' type instead, which matches the
return type of qdict_array_entries() and also the type
we use for the loop enumeration variable 'i'.

(Spotted by Coverity, CID 1360960.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Message-id: 1496682098-1540-1-git-send-email-peter.maydell@linaro.org
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/gluster.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/block/gluster.c b/block/gluster.c
index XXXXXXX..XXXXXXX 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
     Error *local_err = NULL;
     char *str = NULL;
     const char *ptr;
-    size_t num_servers;
-    int i, type;
+    int i, type, num_servers;
 
     /* create opts info from runtime_json_opts list */
     opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort);
-- 
2.9.3

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