diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-06-07 20:05:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-06-07 20:05:29 +0100 |
| commit | 33ba8b0adc91482dd4247a0773cfe7def011933f (patch) | |
| tree | 7ad27f3a761a1c999aa111e74584b1be2b50c09a /scripts | |
| parent | a35947f15c0ee695eba3c55248ec8ac3e4e23cca (diff) | |
| parent | df77d45a51412ca84abd7f1490b48c1bccf07057 (diff) | |
| download | qemu-33ba8b0adc91482dd4247a0773cfe7def011933f.zip qemu-33ba8b0adc91482dd4247a0773cfe7def011933f.tar.gz qemu-33ba8b0adc91482dd4247a0773cfe7def011933f.tar.bz2 | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.1-pull-request' into staging
Trivial branch pull request 20210607
# gpg: Signature made Mon 07 Jun 2021 19:56:43 BST
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-for-6.1-pull-request:
vhost-vdpa: Remove redundant declaration of address_space_memory
scripts/oss-fuzz: Fix typo in documentation
target/mips: Fix 'Uncoditional' typo
target/hppa: Remove unused 'memory.h' header
hw/display/macfb: Classify the "nubus-macfb" as display device
target/nios2: fix page-fit instruction count
docs: fix broken reference
linux-user/syscall: Constify bitmask_transtbl fcntl/mmap flags_tlb[]
misc: Correct relative include path
i386/kvm: The value passed to strerror should be positive
target/riscv: Do not include 'pmp.h' in user emulation
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py b/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py index 890e1de..b154a25 100755 --- a/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py +++ b/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py @@ -14,7 +14,7 @@ QEMU_FUZZ_ARGS="-machine q35,accel=qtest" QEMU_FUZZ_OBJECTS="*" \ /path/to/crash 2> qtest_log_output scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py qtest_log_output > qtest_trace ./i386-softmmu/qemu-fuzz-i386 -machine q35,accel=qtest \ - -qtest stdin < qtest_trace + -qtest stdio < qtest_trace ### Details ### |