diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-08-22 13:13:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-08-22 13:13:35 +0100 |
| commit | 810923480863c43ecb22ae124156298385439339 (patch) | |
| tree | 786989fcc3da6a00bcabd53b9289bffcc2c0f55b /configure | |
| parent | f3b8f18ebf344ab359e8f79f6ed777e740dae77c (diff) | |
| parent | 78d01598aea85841f0e4f8baf62c42b76230a81c (diff) | |
| download | qemu-810923480863c43ecb22ae124156298385439339.zip qemu-810923480863c43ecb22ae124156298385439339.tar.gz qemu-810923480863c43ecb22ae124156298385439339.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* Longstanding chardev race condition fix (Berto)
* Cleanups and tests from the Meson POC (Marc-André, myself)
* Coalesced range cleanup (Peter)
# gpg: Signature made Wed 21 Aug 2019 18:27:43 BST
# gpg: using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
char-socket: Lock tcp_chr_disconnect() and socket_reconnect_timeout()
main-loop: Fix GSource leak in qio_task_thread_worker()
memory: Fix up memory_region_{add|del}_coalescing
memory: Remove has_coalesced_range counter
memory: Split zones when do coalesced_io_del()
memory: Refactor memory_region_clear_coalescing
minikconf: don't print CONFIG_FOO=n lines
configure: remove AUTOCONF_HOST
tests: add module loading test
module: return success on module load
module: use g_hash_table_add()
configure: define CONFIG_TOOLS here
qemu-ga: clean up TOOLS variable
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -6129,7 +6129,7 @@ if [ "$guest_agent" != "no" ]; then if [ "$softmmu" = no -a "$want_tools" = no ] ; then guest_agent=no elif [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" -o "$mingw32" = "yes" ] ; then - tools="qemu-ga $tools" + tools="qemu-ga\$(EXESUF) $tools" guest_agent=yes elif [ "$guest_agent" != yes ]; then guest_agent=no @@ -6614,6 +6614,9 @@ fi if test "$profiler" = "yes" ; then echo "CONFIG_PROFILER=y" >> $config_host_mak fi +if test "$want_tools" = "yes" ; then + echo "CONFIG_TOOLS=y" >> $config_host_mak +fi if test "$slirp" != "no"; then echo "CONFIG_SLIRP=y" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak @@ -7360,11 +7363,6 @@ if test "$sparse" = "yes" ; then echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_host_mak echo "QEMU_CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak fi -if test "$cross_prefix" != ""; then - echo "AUTOCONF_HOST := --host=${cross_prefix%-}" >> $config_host_mak -else - echo "AUTOCONF_HOST := " >> $config_host_mak -fi echo "LDFLAGS=$LDFLAGS" >> $config_host_mak echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak |