From bcc388df07b8ac69660c2ad0200d4f242513e642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Tue, 12 Nov 2019 15:08:15 +0000 Subject: [PATCH 1/5] tests/vm: make --interactive (and therefore DEBUG=1) unconditional MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While the concept of only dropping to ssh if a test fails is nice it is more useful for this to be unconditional. You usually just want to get the build up and running and then noodle around debugging or attempting to replicate. Cc: Peter Maydell Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- tests/vm/basevm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 91a9226026..0b8c1b2657 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -403,7 +403,7 @@ def main(vmcls): exitcode = 0 if vm.ssh(*cmd) != 0: exitcode = 3 - if exitcode != 0 and args.interactive: + if args.interactive: vm.ssh() if not args.snapshot: From 8ea6abf0d06c8a86af93bfc8135301aae1480b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Tue, 12 Nov 2019 16:28:53 +0000 Subject: [PATCH 2/5] docs/devel: rename plugins.rst to tcg-plugins.rst MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes it a bit clearer what this is about. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- MAINTAINERS | 1 + docs/devel/index.rst | 2 +- docs/devel/{plugins.rst => tcg-plugins.rst} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename docs/devel/{plugins.rst => tcg-plugins.rst} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index dfb7932608..5e5e3e52d6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2371,6 +2371,7 @@ F: tcg/ TCG Plugins M: Alex Bennée S: Maintained +F: docs/devel/tcg-plugins.rst F: plugins/ F: tests/plugin diff --git a/docs/devel/index.rst b/docs/devel/index.rst index 2ff058bae3..c86a3cdff2 100644 --- a/docs/devel/index.rst +++ b/docs/devel/index.rst @@ -22,4 +22,4 @@ Contents: decodetree secure-coding-practices tcg - plugins + tcg-plugins diff --git a/docs/devel/plugins.rst b/docs/devel/tcg-plugins.rst similarity index 100% rename from docs/devel/plugins.rst rename to docs/devel/tcg-plugins.rst From 5c6ecbdc83daef751da3c925be3bfb95ef480842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Tue, 12 Nov 2019 20:16:33 +0000 Subject: [PATCH 3/5] docs/devel: update tcg-plugins.rst with API versioning details MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While we are at it fix up the quoted code sections with the inline :: approach. Signed-off-by: Alex Bennée Reviewed-by: Robert Foley --- docs/devel/tcg-plugins.rst | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/docs/devel/tcg-plugins.rst b/docs/devel/tcg-plugins.rst index b18fb6729e..718eef00f2 100644 --- a/docs/devel/tcg-plugins.rst +++ b/docs/devel/tcg-plugins.rst @@ -25,6 +25,23 @@ process. However the project reserves the right to change or break the API should it need to do so. The best way to avoid this is to submit your plugin upstream so they can be updated if/when the API changes. +API versioning +-------------- + +All plugins need to declare a symbol which exports the plugin API +version they were built against. This can be done simply by:: + + QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION; + +The core code will refuse to load a plugin that doesn't export a +`qemu_plugin_version` symbol or if plugin version is outside of QEMU's +supported range of API versions. + +Additionally the `qemu_info_t` structure which is passed to the +`qemu_plugin_install` method of a plugin will detail the minimum and +current API versions supported by QEMU. The API version will be +incremented if new APIs are added. The minimum API version will be +incremented if existing APIs are changed or removed. Exposure of QEMU internals -------------------------- @@ -40,16 +57,14 @@ instructions and events are opaque to the plugins themselves. Usage ===== -The QEMU binary needs to be compiled for plugin support: +The QEMU binary needs to be compiled for plugin support:: -:: - configure --enable-plugins + configure --enable-plugins Once built a program can be run with multiple plugins loaded each with -their own arguments: +their own arguments:: -:: - $QEMU $OTHER_QEMU_ARGS \ + $QEMU $OTHER_QEMU_ARGS \ -plugin tests/plugin/libhowvec.so,arg=inline,arg=hint \ -plugin tests/plugin/libhotblocks.so From 6e98888041db350b9dbd347d885368e3802227d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Tue, 12 Nov 2019 18:31:19 +0000 Subject: [PATCH 4/5] .travis.yml: drop 32 bit systems from MAIN_SOFTMMU_TARGETS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The older clangs are still struggling to build and run everything withing the 50 minute timeout so lets lighten the load a bit more. We still have coverage for GCC and hopefully no obscure 32 bit guest only breakages slip through the cracks. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b9a026c8ee..c09b6a0014 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,7 +79,7 @@ env: - BASE_CONFIG="--disable-docs --disable-tools" - TEST_CMD="make check V=1" # This is broadly a list of "mainline" softmmu targets which have support across the major distros - - MAIN_SOFTMMU_TARGETS="aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" + - MAIN_SOFTMMU_TARGETS="aarch64-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" - CCACHE_SLOPPINESS="include_file_ctime,include_file_mtime" - CCACHE_MAXSIZE=1G From 22c30b2d20e828edadbd992c1d4c4bfd0f3433ba Mon Sep 17 00:00:00 2001 From: Taylor Simpson Date: Sun, 17 Nov 2019 17:14:25 -0600 Subject: [PATCH 5/5] tests/tcg: modify multiarch tests to work with clang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Taylor Simpson Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Message-Id: <1574032465-12186-1-git-send-email-tsimpson@quicinc.com> [AJB: tweak header line] Signed-off-by: Alex Bennée --- tests/tcg/multiarch/float_helpers.c | 2 -- tests/tcg/multiarch/linux-test.c | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/tcg/multiarch/float_helpers.c b/tests/tcg/multiarch/float_helpers.c index 8ee7903c78..bc530e5732 100644 --- a/tests/tcg/multiarch/float_helpers.c +++ b/tests/tcg/multiarch/float_helpers.c @@ -79,11 +79,9 @@ char *fmt_16(uint16_t num) #ifndef SNANF /* Signaling NaN macros, if supported. */ -# if __GNUC_PREREQ(3, 3) # define SNANF (__builtin_nansf ("")) # define SNAN (__builtin_nans ("")) # define SNANL (__builtin_nansl ("")) -# endif #endif static float f32_numbers[] = { diff --git a/tests/tcg/multiarch/linux-test.c b/tests/tcg/multiarch/linux-test.c index 673d7c8a1c..8a7c15cd31 100644 --- a/tests/tcg/multiarch/linux-test.c +++ b/tests/tcg/multiarch/linux-test.c @@ -485,7 +485,11 @@ static void test_signal(void) act.sa_flags = SA_SIGINFO; chk_error(sigaction(SIGSEGV, &act, NULL)); if (setjmp(jmp_env) == 0) { - *(uint8_t *)0 = 0; + /* + * clang requires volatile or it will turn this into a + * call to abort() instead of forcing a SIGSEGV. + */ + *(volatile uint8_t *)0 = 0; } act.sa_handler = SIG_DFL;