diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-13 13:01:30 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-13 13:01:30 +0100 |
commit | 00ce6c36b35e0eb8cc5d68a28f288a6335848813 (patch) | |
tree | ca25062dd798548f1c0bfe53e8dc278de5beaf32 /tests | |
parent | 6c87d9f311dba0641bdc2df556056938a8bf2a12 (diff) | |
parent | 2a84f48c2b387877422ee85f6425d2c1b25bace0 (diff) | |
download | qemu-00ce6c36b35e0eb8cc5d68a28f288a6335848813.zip qemu-00ce6c36b35e0eb8cc5d68a28f288a6335848813.tar.gz qemu-00ce6c36b35e0eb8cc5d68a28f288a6335848813.tar.bz2 |
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-07-13' into staging
* Some fuzzer related fixes
* Fixes / improvements for the "configure" script
* Doc updates
* Gitlab pipeline-status script
# gpg: Signature made Mon 13 Jul 2020 11:48:32 BST
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/huth-gitlab/tags/pull-request-2020-07-13:
docs/system/s390x: Improve the 3270 documentation
GitLab Gating CI: introduce pipeline-status contrib script
disas/sh4: Add missing fallthrough annotations
Remove the CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE switch
docs/devel/fuzzing: Fix bugs in documentation
tests/qtest/fuzz: Add missing spaces in description
fuzz: add missing header for rcu_enable_atfork
configure: do not clobber CFLAGS with --enable-fuzzing
configure: fix malloc check
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/qtest/fuzz/fuzz.c | 1 | ||||
-rw-r--r-- | tests/qtest/fuzz/virtio_scsi_fuzz.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c index a36d903..0b66e43 100644 --- a/tests/qtest/fuzz/fuzz.c +++ b/tests/qtest/fuzz/fuzz.c @@ -19,6 +19,7 @@ #include "sysemu/runstate.h" #include "sysemu/sysemu.h" #include "qemu/main-loop.h" +#include "qemu/rcu.h" #include "tests/qtest/libqtest.h" #include "tests/qtest/libqos/qgraph.h" #include "fuzz.h" diff --git a/tests/qtest/fuzz/virtio_scsi_fuzz.c b/tests/qtest/fuzz/virtio_scsi_fuzz.c index 51dce49..3a9ea13 100644 --- a/tests/qtest/fuzz/virtio_scsi_fuzz.c +++ b/tests/qtest/fuzz/virtio_scsi_fuzz.c @@ -191,7 +191,7 @@ static void register_virtio_scsi_fuzz_targets(void) { fuzz_add_qos_target(&(FuzzTarget){ .name = "virtio-scsi-fuzz", - .description = "Fuzz the virtio-scsi virtual queues, forking" + .description = "Fuzz the virtio-scsi virtual queues, forking " "for each fuzz run", .pre_vm_init = &counter_shm_init, .pre_fuzz = &virtio_scsi_pre_fuzz, @@ -202,7 +202,7 @@ static void register_virtio_scsi_fuzz_targets(void) fuzz_add_qos_target(&(FuzzTarget){ .name = "virtio-scsi-flags-fuzz", - .description = "Fuzz the virtio-scsi virtual queues, forking" + .description = "Fuzz the virtio-scsi virtual queues, forking " "for each fuzz run (also fuzzes the virtio flags)", .pre_vm_init = &counter_shm_init, .pre_fuzz = &virtio_scsi_pre_fuzz, |