diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | docs/devel/index.rst | 2 | ||||
| -rw-r--r-- | docs/devel/tcg-plugins.rst (renamed from docs/devel/plugins.rst) | 27 | ||||
| -rw-r--r-- | tests/tcg/multiarch/float_helpers.c | 2 | ||||
| -rw-r--r-- | tests/tcg/multiarch/linux-test.c | 6 | ||||
| -rwxr-xr-x | tests/vm/basevm.py | 2 |
7 files changed, 30 insertions, 12 deletions
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 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 <alex.bennee@linaro.org> 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 index b18fb6729e..718eef00f2 100644 --- a/docs/devel/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 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; 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: |