[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 31/39] tcg/plugins: enable by default for TCG builds
From: |
Alex Bennée |
Subject: |
[PATCH v1 31/39] tcg/plugins: enable by default for TCG builds |
Date: |
Tue, 6 Jul 2021 15:58:09 +0100 |
Aside from a minor bloat to file size the ability to have TCG plugins
has no real impact on performance unless a plugin is actively loaded.
Even then the libempty.so plugin shows only a minor degradation in
performance caused by the extra book keeping the TCG has to do to keep
track of instructions. As it's a useful feature lets just enable it by
default and reduce our testing matrix a little.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
v2
- properly handle plugins being ""
- make the test for linker support handle default case
- move linker tests to before the glib-modules test
---
docs/devel/tcg-plugins.rst | 3 +-
configure | 125 ++++++++++++++++++++-----------------
.gitlab-ci.d/buildtest.yml | 23 -------
3 files changed, 71 insertions(+), 80 deletions(-)
diff --git a/docs/devel/tcg-plugins.rst b/docs/devel/tcg-plugins.rst
index 18c6581d85..0cd77c77d2 100644
--- a/docs/devel/tcg-plugins.rst
+++ b/docs/devel/tcg-plugins.rst
@@ -71,7 +71,8 @@ API
Usage
=====
-The QEMU binary needs to be compiled for plugin support::
+Any QEMU binary with TCG support has plugins enabled by default.
+Earlier releases needed to be explicitly enabled with::
configure --enable-plugins
diff --git a/configure b/configure
index 9d72b31a9f..0ce6c1ff65 100755
--- a/configure
+++ b/configure
@@ -429,7 +429,7 @@ libxml2="auto"
debug_mutex="no"
libpmem="auto"
default_devices="true"
-plugins="no"
+plugins="$default_feature"
fuzzing="no"
rng_none="no"
secret_keyring="$default_feature"
@@ -3085,6 +3085,73 @@ for drv in $audio_drv_list; do
esac
done
+##########################################
+# plugin linker support probe
+
+if test "$plugins" != "no"; then
+
+ #########################################
+ # See if --dynamic-list is supported by the linker
+
+ ld_dynamic_list="no"
+ if test "$static" = "no" ; then
+ cat > $TMPTXT <<EOF
+{
+ foo;
+};
+EOF
+
+ cat > $TMPC <<EOF
+#include <stdio.h>
+void foo(void);
+
+void foo(void)
+{
+ printf("foo\n");
+}
+
+int main(void)
+{
+ foo();
+ return 0;
+}
+EOF
+
+ if compile_prog "" "-Wl,--dynamic-list=$TMPTXT" ; then
+ ld_dynamic_list="yes"
+ fi
+ fi
+
+ #########################################
+ # See if -exported_symbols_list is supported by the linker
+
+ ld_exported_symbols_list="no"
+ if test "$static" = "no" ; then
+ cat > $TMPTXT <<EOF
+ _foo
+EOF
+
+ if compile_prog "" "-Wl,-exported_symbols_list,$TMPTXT" ; then
+ ld_exported_symbols_list="yes"
+ fi
+ fi
+
+ if test "$ld_dynamic_list" = "no" &&
+ test "$ld_exported_symbols_list" = "no" ; then
+ if test "$plugins" = "yes"; then
+ error_exit \
+ "Plugin ($plugins) support requires dynamic linking and
specifying a set of symbols " \
+ "that are exported to plugins. Unfortunately your linker
doesn't " \
+ "support the flag (--dynamic-list or -exported_symbols_list)
used " \
+ "for this purpose. You can't build with --static."
+ else
+ plugins="no"
+ fi
+ else
+ plugins="yes"
+ fi
+fi
+
##########################################
# glib support probe
@@ -3093,7 +3160,7 @@ glib_modules=gthread-2.0
if test "$modules" = yes; then
glib_modules="$glib_modules gmodule-export-2.0"
fi
-if test "$plugins" = yes; then
+if test "$plugins" = "yes"; then
glib_modules="$glib_modules gmodule-2.0"
fi
@@ -3931,60 +3998,6 @@ if compile_prog "" "" ; then
atomic64=yes
fi
-#########################################
-# See if --dynamic-list is supported by the linker
-ld_dynamic_list="no"
-if test "$static" = "no" ; then
- cat > $TMPTXT <<EOF
-{
- foo;
-};
-EOF
-
- cat > $TMPC <<EOF
-#include <stdio.h>
-void foo(void);
-
-void foo(void)
-{
- printf("foo\n");
-}
-
-int main(void)
-{
- foo();
- return 0;
-}
-EOF
-
- if compile_prog "" "-Wl,--dynamic-list=$TMPTXT" ; then
- ld_dynamic_list="yes"
- fi
-fi
-
-#########################################
-# See if -exported_symbols_list is supported by the linker
-
-ld_exported_symbols_list="no"
-if test "$static" = "no" ; then
- cat > $TMPTXT <<EOF
- _foo
-EOF
-
- if compile_prog "" "-Wl,-exported_symbols_list,$TMPTXT" ; then
- ld_exported_symbols_list="yes"
- fi
-fi
-
-if test "$plugins" = "yes" &&
- test "$ld_dynamic_list" = "no" &&
- test "$ld_exported_symbols_list" = "no" ; then
- error_exit \
- "Plugin support requires dynamic linking and specifying a set of symbols
" \
- "that are exported to plugins. Unfortunately your linker doesn't " \
- "support the flag (--dynamic-list or -exported_symbols_list) used " \
- "for this purpose. You can't build with --static."
-fi
########################################
# check if getauxval is available.
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index d9b834c848..89df51517c 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -354,29 +354,6 @@ build-some-softmmu:
TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu
MAKE_CHECK_ARGS: check-tcg
-# Run check-tcg against linux-user (with plugins)
-# we skip sparc64-linux-user until it has been fixed somewhat
-# we skip cris-linux-user as it doesn't use the common run loop
-build-user-plugins:
- extends: .native_build_job_template
- needs:
- job: amd64-debian-user-cross-container
- variables:
- IMAGE: debian-all-test-cross
- CONFIGURE_ARGS: --disable-tools --disable-system --enable-plugins
--enable-debug-tcg --target-list-exclude=sparc64-linux-user,cris-linux-user
- MAKE_CHECK_ARGS: check-tcg
- timeout: 1h 30m
-
-build-some-softmmu-plugins:
- extends: .native_build_job_template
- needs:
- job: amd64-debian-user-cross-container
- variables:
- IMAGE: debian-all-test-cross
- CONFIGURE_ARGS: --disable-tools --disable-user --enable-plugins
--enable-debug-tcg
- TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu
- MAKE_CHECK_ARGS: check-tcg
-
clang-system:
extends: .native_build_job_template
needs:
--
2.20.1
- [PATCH v1 36/39] plugins/cache: Enable cache parameterization, (continued)
- [PATCH v1 36/39] plugins/cache: Enable cache parameterization, Alex Bennée, 2021/07/06
- [PATCH v1 16/39] tests/docker: fix mistakes in fedora package list, Alex Bennée, 2021/07/06
- [PATCH v1 19/39] tests/docker: expand centos8 package list, Alex Bennée, 2021/07/06
- [PATCH v1 39/39] MAINTAINTERS: Added myself as a reviewer for TCG Plugins, Alex Bennée, 2021/07/06
- [PATCH v1 14/39] tests/docker: fix sorting in package lists, Alex Bennée, 2021/07/06
- [PATCH v1 27/39] plugins: fix-up handling of internal hostaddr for 32 bit, Alex Bennée, 2021/07/06
- [PATCH v1 17/39] tests/docker: fix mistakes in ubuntu package lists, Alex Bennée, 2021/07/06
- [PATCH v1 31/39] tcg/plugins: enable by default for TCG builds,
Alex Bennée <=
- [PATCH v1 25/39] tests/vm: update openbsd to release 6.9, Alex Bennée, 2021/07/06
- [PATCH v1 38/39] docs/devel: Added cache plugin to the plugins docs, Alex Bennée, 2021/07/06
- [PATCH v1 24/39] tests/vm: update NetBSD to 9.2, Alex Bennée, 2021/07/06
- [PATCH v1 18/39] tests/docker: remove mingw packages from Fedora, Alex Bennée, 2021/07/06
- [PATCH v1 35/39] plugins: Added a new cache modelling plugin, Alex Bennée, 2021/07/06
- [PATCH v1 29/39] configure: don't allow plugins to be enabled for a non-TCG build, Alex Bennée, 2021/07/06
- Re: [PATCH v1 00/39] final pre-PR for 6.1 (testing and plugins), Philippe Mathieu-Daudé, 2021/07/07