The following changes since commit 9af638cc1f665712522608c5d6b8c03d8fa67666:

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200504' into staging (2020-05-04 13:37:17 +0100)

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

for you to fetch changes up to 08b689aa6b521964b8275dd7a2564aefa5d68129:

lockable: Replace locks with lock guard macros (2020-05-04 16:07:43 +0100)

Pull request

* Fixed stray slirp submodule change [Peter]

Fixes for the lock guard macros, code conversions to the lock guard macros, and

support for selecting fuzzer targets with 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

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 ++--

21 files changed, 132 insertions(+), 153 deletions(-)

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 +++++++++++--------

1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c

--- 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);