[Qemu-commits] [qemu/qemu] 05509c: fuzz: select fuzz target using executable name

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 05509c8e6def8a23878b93eda3163b7b405a5d57
      
https://github.com/qemu/qemu/commit/05509c8e6def8a23878b93eda3163b7b405a5d57
  Author: Alexander Bulekov <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M tests/qtest/fuzz/fuzz.c

  Log Message:
  -----------
  fuzz: select fuzz target using executable name

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 <address@hidden>
Reviewed-by: Darren Kenny <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 56f21718b8767a1b523f2a14107d6307336ca51d
      
https://github.com/qemu/qemu/commit/56f21718b8767a1b523f2a14107d6307336ca51d
  Author: Daniel Brodsky <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M include/qemu/lockable.h
    M include/qemu/rcu.h

  Log Message:
  -----------
  lockable: fix __COUNTER__ macro to be referenced properly

- __COUNTER__ doesn't work with ## concat
- replaced ## with glue() macro so __COUNTER__ is evaluated

Fixes: 3284c3ddc4

Signed-off-by: Daniel Brodsky <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 6e8a355de6c4d32e9df336cdafb009cd78262836
      
https://github.com/qemu/qemu/commit/6e8a355de6c4d32e9df336cdafb009cd78262836
  Author: Daniel Brodsky <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M block/iscsi.c
    M block/nfs.c
    M cpus-common.c
    M hw/display/qxl.c
    M hw/vfio/platform.c
    M migration/migration.c
    M migration/multifd.c
    M migration/ram.c
    M monitor/misc.c
    M ui/spice-display.c
    M util/log.c
    M util/qemu-timer.c
    M util/rcu.c
    M util/thread-pool.c
    M util/vfio-helpers.c

  Log Message:
  -----------
  lockable: replaced locks with lock guard macros where appropriate

- ran regexp "qemu_mutex_lock\(.*\).*\n.*if" to find targets
- replaced result with QEMU_LOCK_GUARD if all unlocks at function end
- replaced result with WITH_QEMU_LOCK_GUARD if unlock not at end

Signed-off-by: Daniel Brodsky <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 08b689aa6b521964b8275dd7a2564aefa5d68129
      
https://github.com/qemu/qemu/commit/08b689aa6b521964b8275dd7a2564aefa5d68129
  Author: Simran Singhal <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M hw/hyperv/hyperv.c
    M hw/rdma/rdma_backend.c
    M hw/rdma/rdma_rm.c

  Log Message:
  -----------
  lockable: Replace locks with lock guard macros

Replace manual lock()/unlock() calls with lock guard macros
(QEMU_LOCK_GUARD/WITH_QEMU_LOCK_GUARD).

Signed-off-by: Simran Singhal <address@hidden>
Reviewed-by: Yuval Shaia <address@hidden>
Reviewed-by: Marcel Apfelbaum<address@hidden>
Tested-by: Yuval Shaia <address@hidden>
Message-id: 20200402065035.GA15477@simran-Inspiron-5558
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 5c7c46fea9f745956fcc7bea5c3af8380a599ee4
      
https://github.com/qemu/qemu/commit/5c7c46fea9f745956fcc7bea5c3af8380a599ee4
  Author: Peter Maydell <address@hidden>
  Date:   2020-05-04 (Mon, 04 May 2020)

  Changed paths:
    M block/iscsi.c
    M block/nfs.c
    M cpus-common.c
    M hw/display/qxl.c
    M hw/hyperv/hyperv.c
    M hw/rdma/rdma_backend.c
    M hw/rdma/rdma_rm.c
    M hw/vfio/platform.c
    M include/qemu/lockable.h
    M include/qemu/rcu.h
    M migration/migration.c
    M migration/multifd.c
    M migration/ram.c
    M monitor/misc.c
    M tests/qtest/fuzz/fuzz.c
    M ui/spice-display.c
    M util/log.c
    M util/qemu-timer.c
    M util/rcu.c
    M util/thread-pool.c
    M util/vfio-helpers.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into 
staging

Pull request

v2:
 * 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].

# gpg: Signature made Mon 04 May 2020 16:11:11 BST
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>" [full]
# gpg:                 aka "Stefan Hajnoczi <address@hidden>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  lockable: Replace locks with lock guard macros
  lockable: replaced locks with lock guard macros where appropriate
  lockable: fix __COUNTER__ macro to be referenced properly
  fuzz: select fuzz target using executable name

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/5375af3cd7b8...5c7c46fea9f7