diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-06-24 09:31:26 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-06-24 09:31:26 +0100 |
| commit | d0ac9a61474cf594d19082bc8976247e984ea9a3 (patch) | |
| tree | 140d9ed53026e577e12e46e5837c924ae6a3c30e /tests | |
| parent | b22726abdfa54592d6ad88f65b0297c0e8b363e2 (diff) | |
| parent | c32c3d68ed0629910d5a1cd72bfb57d7f89b553b (diff) | |
| download | focaccia-qemu-d0ac9a61474cf594d19082bc8976247e984ea9a3.tar.gz focaccia-qemu-d0ac9a61474cf594d19082bc8976247e984ea9a3.zip | |
Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-06-21' into staging
* Documentation updates * Remove leading underscores from header guards * Display hexadecimal value with '0x' prefix # gpg: Signature made Mon 21 Jun 2021 11:33:53 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/thuth-gitlab/tags/pull-request-2021-06-21: MAINTAINERS: Add qtest/arm-cpu-features.c to ARM TCG CPUs section fuzz: Display hexadecimal value with '0x' prefix Remove leading underscores from QEMU defines Update documentation to refer to new location for issues docs/tools/virtiofsd: Fix bad rst syntax docs/tools/virtiofsd.rst: Do not hard-code the QEMU binary name docs/interop/live-block-operations: Do not hard-code the QEMU binary name Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qtest/fuzz/generic_fuzz.c | 4 | ||||
| -rw-r--r-- | tests/qtest/fuzz/qos_fuzz.h | 4 | ||||
| -rw-r--r-- | tests/tcg/minilib/minilib.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c index cea7d4058e..6c67522717 100644 --- a/tests/qtest/fuzz/generic_fuzz.c +++ b/tests/qtest/fuzz/generic_fuzz.c @@ -841,9 +841,9 @@ static void generic_pre_fuzz(QTestState *s) g_hash_table_iter_init(&iter, fuzzable_memoryregions); while (g_hash_table_iter_next(&iter, (gpointer)&mr, NULL)) { - printf(" * %s (size %lx)\n", + printf(" * %s (size 0x%" PRIx64 ")\n", object_get_canonical_path_component(&(mr->parent_obj)), - (uint64_t)mr->size); + memory_region_size(mr)); } if (!g_hash_table_size(fuzzable_memoryregions)) { diff --git a/tests/qtest/fuzz/qos_fuzz.h b/tests/qtest/fuzz/qos_fuzz.h index 477f11b02b..63d8459b71 100644 --- a/tests/qtest/fuzz/qos_fuzz.h +++ b/tests/qtest/fuzz/qos_fuzz.h @@ -10,8 +10,8 @@ * See the COPYING file in the top-level directory. */ -#ifndef _QOS_FUZZ_H_ -#define _QOS_FUZZ_H_ +#ifndef QOS_FUZZ_H +#define QOS_FUZZ_H #include "tests/qtest/fuzz/fuzz.h" #include "tests/qtest/libqos/qgraph.h" diff --git a/tests/tcg/minilib/minilib.h b/tests/tcg/minilib/minilib.h index e23361380a..17d0f2f314 100644 --- a/tests/tcg/minilib/minilib.h +++ b/tests/tcg/minilib/minilib.h @@ -9,8 +9,8 @@ * SPDX-License-Identifier: GPL-2.0-only */ -#ifndef _MINILIB_H_ -#define _MINILIB_H_ +#ifndef MINILIB_H +#define MINILIB_H /* * Provided by the individual arch |