qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] e78119: qemu-iotests: move check-block back t


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] e78119: qemu-iotests: move check-block back to Makefiles
Date: Tue, 08 Sep 2020 06:30:32 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: e781190cda3d8b4e17ac0a6985570a485e164d89
      
https://github.com/qemu/qemu/commit/e781190cda3d8b4e17ac0a6985570a485e164d89
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M meson.build
    M tests/Makefile.include
    M tests/qemu-iotests/meson.build

  Log Message:
  -----------
  qemu-iotests: move check-block back to Makefiles

check-block has its own test harness, unlike every other test.  If
we capture its output, as is in general nicer to do without V=1,
there will be no sign of progress.  So for lack of a better option
just move the invocation of the test back to Makefile rules.

As a side effect, this will also fix "make check" in --disable-tools
builds, as they were trying to run qemu-iotests without having
made qemu-img before.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 555b27a75072d2298a5c37f81df41036b780e181
      
https://github.com/qemu/qemu/commit/555b27a75072d2298a5c37f81df41036b780e181
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M scripts/mtest2make.py

  Log Message:
  -----------
  mtest2make: split environment from test command

Pass the environment and test command in separate macro arguments,
so that we will be able to insert a test driver in the next patch.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 42d729e12c9a03e1140d681a5fdeceb10c4fa548
      
https://github.com/qemu/qemu/commit/42d729e12c9a03e1140d681a5fdeceb10c4fa548
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M scripts/mtest2make.py

  Log Message:
  -----------
  mtest2make: split working directory from test command

Pass the working directory and test command in separate macro arguments,
so that we will be able to insert a test driver in the next patch.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: d322e84eef850d1e16bca81ac9b6811f13a8d7a7
      
https://github.com/qemu/qemu/commit/d322e84eef850d1e16bca81ac9b6811f13a8d7a7
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M scripts/mtest2make.py
    A scripts/test-driver.py

  Log Message:
  -----------
  mtest2make: hide output of successful tests

The softfloat tests are quite noisy; before the Meson conversion
they buffered the output in a file and emitted the output only
if the test failed.  Tweak mtest2make.py so that the courtesy
is extended to all non-TAP tests.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 40d9b74eafc9db5d19b92e32932ba915e6e2e664
      
https://github.com/qemu/qemu/commit/40d9b74eafc9db5d19b92e32932ba915e6e2e664
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M scripts/mtest2make.py

  Log Message:
  -----------
  mtest2make: unify tests that appear in multiple suites

Whenever a test appears in multiple suites, the rules generated
by mtest2make are currently running it twice.  Instead, after
this patch we generate a phony target for each test and we have
a generic "run-tests" target depend on all the tests that were
chosen on the command line.  Tests that appear in multiple suites
will be added to the prerequisites just once.

This has other advantages: it removes the handling of -k and
it increases parallelism.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 3e0e519026841977c1c00b067af52faa0311133c
      
https://github.com/qemu/qemu/commit/3e0e519026841977c1c00b067af52faa0311133c
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: remove b_lundef option

Meson automatically adds "-undefined dynamic_lookup" to
shared_module build targets; b_lundef is only needed for
executables.  Therefore, we can remove this option.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 58683d07d2590b934cc2688d2b054bfbb7708518
      
https://github.com/qemu/qemu/commit/58683d07d2590b934cc2688d2b054bfbb7708518
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: do not include absolute paths in -I and -L paths

On msys2, paths such as -L/e/path/to/qemu are not recognized by
the linker.  Fortunately we do not need absolute paths at all in a
non-recursive build system.

Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: e817851479f80622c70566740ac3cf020eb99f27
      
https://github.com/qemu/qemu/commit/e817851479f80622c70566740ac3cf020eb99f27
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: include cross sdl2-config in meson cross file

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 8d60f377409bf3570bad4cc27a7fc6b2ca5818f0
      
https://github.com/qemu/qemu/commit/8d60f377409bf3570bad4cc27a7fc6b2ca5818f0
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M scripts/ninjatool.py

  Log Message:
  -----------
  ninjatool: use constant names for stamp files

Numbering files according to rules causes confusion, because
CUSTOM_COMMAND3.stamp from a previous build might represent
completely different targets after Makefile.ninja is regenerated.
As a result, the new targets are not rebuilt and compilation
fails.

Use the targets to build a SHA1 hash; the chances for collision
are one in 2^24 even with a 12-character prefix of the hash.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: c138156ba55cd7e1b8b45a0e49f62f97d92a9e64
      
https://github.com/qemu/qemu/commit/c138156ba55cd7e1b8b45a0e49f62f97d92a9e64
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M tests/qtest/libqos/meson.build

  Log Message:
  -----------
  meson: fix libqos linking

Add genh to the sources to avoid race conditions between QAPI
file generation and libqos compilation.

Make the name_suffix .fa for consistency with other link_whole
static libraries and to work around a Meson issue where
lots of linker flags are placed between -Wl,--start-group and
-Wl,--end-group and this breaks the fork-fuzz.ld linker script.

Reported-by: Claudio Fontana <cfontana@suse.de>
Reported-by: Alexander Bulekov <alxndr@bu.edu>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 37e2777670dcf25f65929a871f246c6c012d8b03
      
https://github.com/qemu/qemu/commit/37e2777670dcf25f65929a871f246c6c012d8b03
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M tests/Makefile.include
    A tests/include/meson.build
    M tests/meson.build

  Log Message:
  -----------
  meson: build qapi tests library

- builds QAPI builtins types/visitor to fix a linking issue with
  unresolved symbols in the static library.

- work around a meson limitation on generated file output directories.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200828110734.1638685-2-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 8ce0a45fa24b2dbb7d9e33eecad13a6fde962dbb
      
https://github.com/qemu/qemu/commit/8ce0a45fa24b2dbb7d9e33eecad13a6fde962dbb
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: declare tasn1 dependency

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200828110734.1638685-3-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 9866a33cbb7046891dec3dcc9ca2015828673afe
      
https://github.com/qemu/qemu/commit/9866a33cbb7046891dec3dcc9ca2015828673afe
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M configure
    M meson.build
    M tests/Makefile.include
    M tests/test-crypto-secret.c

  Log Message:
  -----------
  meson: declare keyutils dependency

Rename the variable to be more explicit. A further clean-up patch will
move the actual to dependency check to meson entirely.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200828110734.1638685-4-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: a9726a900d163d3e6d9551715ba00eec5b347413
      
https://github.com/qemu/qemu/commit/a9726a900d163d3e6d9551715ba00eec5b347413
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M tests/Makefile.include
    M tests/meson.build

  Log Message:
  -----------
  meson: convert qht-bench

This is required by test-qht-par unit test.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200828110734.1638685-5-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 279588d4deea2694ebe9ceb29dfdc5c08a7c4e27
      
https://github.com/qemu/qemu/commit/279588d4deea2694ebe9ceb29dfdc5c08a7c4e27
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M tests/Makefile.include
    M tests/meson.build
    M tests/test-qga.c

  Log Message:
  -----------
  meson: convert the unit tests

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200828110734.1638685-7-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: af04e89dd97a8098fe5643f6e9a28fa4233f21cf
      
https://github.com/qemu/qemu/commit/af04e89dd97a8098fe5643f6e9a28fa4233f21cf
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M configure
    M meson.build

  Log Message:
  -----------
  meson: move keyutils dependency check

Since there is not minimum version specified, and it's a test-only
dependency, it's fair to depend on a version that ships with a .pc I
suppose.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200828110734.1638685-8-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: fb5c5786972626db202c5eb9c7bb86579145b9a5
      
https://github.com/qemu/qemu/commit/fb5c5786972626db202c5eb9c7bb86579145b9a5
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M tests/Makefile.include

  Log Message:
  -----------
  meson: remove old socket_scm_helper rule

It was covered already in commit d3ca592b3c10 ("meson: convert check-block")

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200828110734.1638685-9-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 89d4dc8f8fdd6fa2688741c780bc060ac9d2b516
      
https://github.com/qemu/qemu/commit/89d4dc8f8fdd6fa2688741c780bc060ac9d2b516
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M tests/Makefile.include
    M tests/meson.build

  Log Message:
  -----------
  meson: convert vhost-user-bridge

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200828110734.1638685-10-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: a52f4a7a5799341c250d4a27c220e53bad3f6b28
      
https://github.com/qemu/qemu/commit/a52f4a7a5799341c250d4a27c220e53bad3f6b28
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M tests/Makefile.include
    M tests/meson.build

  Log Message:
  -----------
  meson: convert atomic*-bench

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200828110734.1638685-11-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 24441f912e67233d9c52ce6b459ed75de2484525
      
https://github.com/qemu/qemu/commit/24441f912e67233d9c52ce6b459ed75de2484525
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M tests/benchmark-crypto-cipher.c
    M tests/benchmark-crypto-hash.c
    M tests/benchmark-crypto-hmac.c

  Log Message:
  -----------
  tests: do not print benchmark output to stdout

As this makes the TAP output invalid. Use g_test_message().

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200828110734.1638685-13-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 9ed7247a5969cf101ac3d22995ae06730b7da3ea
      
https://github.com/qemu/qemu/commit/9ed7247a5969cf101ac3d22995ae06730b7da3ea
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M Makefile
    M scripts/mtest2make.py
    M tests/Makefile.include
    M tests/meson.build

  Log Message:
  -----------
  meson: convert the speed tests

Use meson benchmark() for them, adjust mtest2make.py for that.
A new target "make bench" can be used to run all benchmarks.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200828110734.1638685-14-marcandre.lureau@redhat.com>
[Rewrite mtest2make part. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: c4c4aacb24747429a1ecaa03bef1ceddb736c368
      
https://github.com/qemu/qemu/commit/c4c4aacb24747429a1ecaa03bef1ceddb736c368
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M tests/migration/stress.c

  Log Message:
  -----------
  tests/migration/stress: remove unused exit_success

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200828110734.1638685-15-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 3909def82a699e4d628c07df948b4dd2656610ea
      
https://github.com/qemu/qemu/commit/3909def82a699e4d628c07df948b4dd2656610ea
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M meson.build
    M tests/migration/stress.c

  Log Message:
  -----------
  meson: fix migration/stress compilation with glibc>=2.30

gettid() was introduced with glibc 2.30.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200828110734.1638685-16-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 4fbcdcd74237549d2d30facf670bf0006bcf5ea9
      
https://github.com/qemu/qemu/commit/4fbcdcd74237549d2d30facf670bf0006bcf5ea9
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M tests/Makefile.include
    M tests/meson.build
    A tests/migration/initrd-stress.sh
    A tests/migration/meson.build

  Log Message:
  -----------
  meson: convert migration/initrd-stress

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200828110734.1638685-17-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 0f4d8894df5c1f0d54b50331e36e8894757d9f7e
      
https://github.com/qemu/qemu/commit/0f4d8894df5c1f0d54b50331e36e8894757d9f7e
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: remove dead code for in-tree builds

The $pwd_is_source_path variable is never "y", since
configure re-executes itself from a build directory.
Remove code that will never run.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: a98006bc798169e661d2e2f02f6efb105c55ffa0
      
https://github.com/qemu/qemu/commit/a98006bc798169e661d2e2f02f6efb105c55ffa0
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M .gitignore
    M meson.build
    R scripts/grepy.sh

  Log Message:
  -----------
  meson: compute config_all_devices directly

There is no need anymore to produce config-all-devices.mak, compute
the resulting dictionary directly instead of going through grepy.sh.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 296bf3d12bee9483d5e7270520088e8974a789f5
      
https://github.com/qemu/qemu/commit/296bf3d12bee9483d5e7270520088e8974a789f5
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M Makefile
    R Makefile.objs
    M tests/Makefile.include

  Log Message:
  -----------
  Makefile: remove dead variables and includes

Makefile.objs, the .d files and various CONFIG_* symbols are not
used anymore by the Make side of the build; they are only processed
by Meson.  We can delete them.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 660f79309303d696531ffb394719dfab3e0c42c0
      
https://github.com/qemu/qemu/commit/660f79309303d696531ffb394719dfab3e0c42c0
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M Makefile
    M docs/devel/build-system.rst
    R rules.mak
    M tests/docker/Makefile.include
    M tests/tcg/Makefile.qemu

  Log Message:
  -----------
  Makefile: inline the relevant parts of rules.mak

Most of rules.mak is not used anymore, just inline what's needed.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: ca0fc78431fb313cba7c23a38ad7af092a73e06a
      
https://github.com/qemu/qemu/commit/ca0fc78431fb313cba7c23a38ad7af092a73e06a
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M .gitignore
    M configure
    M disas/meson.build
    M meson.build

  Log Message:
  -----------
  configure: move disassembler configuration to meson

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 201e8ed7df00cffe6df967bd42903c1cbcecd721
      
https://github.com/qemu/qemu/commit/201e8ed7df00cffe6df967bd42903c1cbcecd721
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: keep all compiler flags detection together

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: ccf7afa59e070b0cc65618af91dc01105f04e566
      
https://github.com/qemu/qemu/commit/ccf7afa59e070b0cc65618af91dc01105f04e566
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M accel/tcg/meson.build
    M configure
    M meson.build

  Log Message:
  -----------
  configure: move -ldl test to meson

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 3fc1aad3864b77df504ea4c61faa751a5a5a2244
      
https://github.com/qemu/qemu/commit/3fc1aad3864b77df504ea4c61faa751a5a5a2244
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: remove unnecessary libm test

The same test is already performed by meson.build.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: b6daf4d3699fe255202e9a0866633ed2f2248497
      
https://github.com/qemu/qemu/commit/b6daf4d3699fe255202e9a0866633ed2f2248497
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M configure
    M docs/devel/build-system.rst
    M meson.build

  Log Message:
  -----------
  configure: do not look for install(1)

It is not used anymore, so there is no Solaris-specific check to
perform.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 215b0c2fa5c9864343373f5a3e6680611dabef20
      
https://github.com/qemu/qemu/commit/215b0c2fa5c9864343373f5a3e6680611dabef20
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M configure
    M meson.build

  Log Message:
  -----------
  meson: get glib compilation flags from GLIB_CFLAGS

The glib compilation flags were added to QEMU_CFLAGS.  While we still
want them to be added to all compilation commands (at least for now),
do that via GLIB_CFLAGS rather than via QEMU_CFLAGS.  This shows that
glib is a special case and makes it clearer that QEMU_CFLAGS is only
about compiler commands and not dependencies.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: de2d30051a460e220817b5b5ae6e86bd5609b2b7
      
https://github.com/qemu/qemu/commit/de2d30051a460e220817b5b5ae6e86bd5609b2b7
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M configure
    M meson.build

  Log Message:
  -----------
  meson: get opengl compilation flags from OPENGL_CFLAGS

The opengl compilation flags were added to QEMU_CFLAGS.  We do not
want them to be added to all compilation commands, so export them
also via OPENGL_CFLAGS rather than via QEMU_CFLAGS.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: feabc71dfa5807427b6b1a0f8db00d994399210d
      
https://github.com/qemu/qemu/commit/feabc71dfa5807427b6b1a0f8db00d994399210d
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M Makefile
    M configure
    M hw/arm/meson.build
    M hw/mips/meson.build
    M hw/riscv/meson.build
    M monitor/meson.build
    M ui/meson.build

  Log Message:
  -----------
  configure: do not include dependency flags in QEMU_CFLAGS and LIBS

All Meson executables should specify their dependencies explicitly, either
directly or indirectly via declare_dependency.  Makefiles instead did
not propagate dependencies correctly from static libraries, for example.
Therefore, flags for dependencies need not be included in QEMU_CFLAGS.
LIBS is not used at all, so drop that one as well.

In a few cases the dependencies were not yet specified, so add them.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: f2995ee4cb1cd866ce523a51cbee7f3359a4466b
      
https://github.com/qemu/qemu/commit/f2995ee4cb1cd866ce523a51cbee7f3359a4466b
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: drop dead variables and functions

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 738aa606248ba4c04ca666f42db234c750728050
      
https://github.com/qemu/qemu/commit/738aa606248ba4c04ca666f42db234c750728050
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M docs/devel/build-system.rst

  Log Message:
  -----------
  docs: suggest Meson replacements for various configure functions

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 5d91a2ed799cc0fe4e96c8c8786353c00a64c8ed
      
https://github.com/qemu/qemu/commit/5d91a2ed799cc0fe4e96c8c8786353c00a64c8ed
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: update dtc submodule

Update the dtc submodule in configure already and symlink dtc after
git submodule update, because on win32 symlinks to non-existing folders
are forbidden.

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20200902170054.810-2-luoyonggang@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 789035f1239054331b335801a06bdbef026f02e1
      
https://github.com/qemu/qemu/commit/789035f1239054331b335801a06bdbef026f02e1
  Author: Alexander Bulekov <alxndr@bu.edu>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M scripts/oss-fuzz/build.sh

  Log Message:
  -----------
  oss-fuzz: fix rpath

Prior to this change,
readelf -d build/out/qemu/qemu-fuzz-i386-target-virtio-net-slirp
...
0x000000000000000f (RPATH)  Library rpath: 
['$$ORIGIN/lib':$ORIGIN/migration:$ORIGIN/]

As of 1a4db552d8 ("ninjatool: quote dollars in variables"), we don't
need to manually double the dollars. Also, remove the single-quotes as
they are copied into the rpath.

After this change:
0x000000000000000f (RPATH)  Library rpath: 
[$ORIGIN/lib:$ORIGIN/migration:$ORIGIN/]

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Message-Id: <20200902142657.112879-3-alxndr@bu.edu>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: c46f76d15869be27e5c9420f6a1733c3cfafc1a1
      
https://github.com/qemu/qemu/commit/c46f76d15869be27e5c9420f6a1733c3cfafc1a1
  Author: Alexander Bulekov <alxndr@bu.edu>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M meson.build
    M tests/qtest/fuzz/meson.build

  Log Message:
  -----------
  meson: specify fuzz linker script as a project arg

With this change, the fuzzer-linker script should be specified outside
any --start-group/--end-group pairs. We need this on oss-fuzz, where
partially applying the linker-script results in a linker failure

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Message-Id: <20200902173652.307222-2-alxndr@bu.edu>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 54c9e41d47daa38219a53311cbc1c4e602709aee
      
https://github.com/qemu/qemu/commit/54c9e41d47daa38219a53311cbc1c4e602709aee
  Author: Alexander Bulekov <alxndr@bu.edu>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M configure
    M tests/qtest/fuzz/meson.build

  Log Message:
  -----------
  fuzz: Add support for custom fuzzing library

On oss-fuzz, we must use the LIB_FUZZING_ENGINE and CFLAGS environment
variables, rather than -fsanitize=fuzzer. With this change, when
LIB_FUZZING_ENGINE is set, the --enable-fuzzing configure option will
use that environment variable during the linking stage, rather than
-fsanitize=fuzzer

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Message-Id: <20200902173652.307222-3-alxndr@bu.edu>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 604f3e4e90c011a6b94fdc1d13700f3ec2375f2a
      
https://github.com/qemu/qemu/commit/604f3e4e90c011a6b94fdc1d13700f3ec2375f2a
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M meson.build
    A scripts/undefsym.py
    R scripts/undefsym.sh

  Log Message:
  -----------
  meson: Convert undefsym.sh to undefsym.py

Shell scripts are not easily invoked from the build process
on MSYS, so convert undefsym.sh to a python script.

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20200902170054.810-3-luoyonggang@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: fd6c986d90832e0ff5bfcf338bc54da21b7e27d6
      
https://github.com/qemu/qemu/commit/fd6c986d90832e0ff5bfcf338bc54da21b7e27d6
  Author: Bruce Rogers <brogers@suse.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M chardev/meson.build

  Log Message:
  -----------
  meson: remove linkage of sdl to baum

Ever since commit 537fe2d63f744e7c96ff45b60d09486a81958e06 there
has been a 'linkage' to sdl for compiling baum.c. Originally it
had to do with including sdl cflags for any file including sdl
headers. There is no longer any such need for baum.c, but the
association has persisted in the make system, and with the switch
to meson it has now become a hard requirement, which now causes
chardev-baum.so to not be produced if sdl is not configured.
Remove this bogus linkage.

Signed-off-by: Bruce Rogers <brogers@suse.com>
Message-Id: <20200903152933.97838-1-brogers@suse.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: ef6a0d6e3927464de67f70cb13abbfe67361e0c9
      
https://github.com/qemu/qemu/commit/ef6a0d6e3927464de67f70cb13abbfe67361e0c9
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M docs/devel/build-system.rst

  Log Message:
  -----------
  docs: update build system documentation

Most of the Makefile bits are obsolete and can be removed.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 46853bd9e7126e0673b12e6d2bf1ee9dedc5afbd
      
https://github.com/qemu/qemu/commit/46853bd9e7126e0673b12e6d2bf1ee9dedc5afbd
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-09-08 (Tue, 08 Sep 2020)

  Changed paths:
    M .gitignore
    M Makefile
    R Makefile.objs
    M accel/tcg/meson.build
    M chardev/meson.build
    M configure
    M disas/meson.build
    M docs/devel/build-system.rst
    M hw/arm/meson.build
    M hw/mips/meson.build
    M hw/riscv/meson.build
    M meson.build
    M monitor/meson.build
    R rules.mak
    R scripts/grepy.sh
    M scripts/mtest2make.py
    M scripts/ninjatool.py
    M scripts/oss-fuzz/build.sh
    A scripts/test-driver.py
    A scripts/undefsym.py
    R scripts/undefsym.sh
    M tests/Makefile.include
    M tests/benchmark-crypto-cipher.c
    M tests/benchmark-crypto-hash.c
    M tests/benchmark-crypto-hmac.c
    M tests/docker/Makefile.include
    A tests/include/meson.build
    M tests/meson.build
    A tests/migration/initrd-stress.sh
    A tests/migration/meson.build
    M tests/migration/stress.c
    M tests/qemu-iotests/meson.build
    M tests/qtest/fuzz/meson.build
    M tests/qtest/libqos/meson.build
    M tests/tcg/Makefile.qemu
    M tests/test-crypto-secret.c
    M tests/test-qga.c
    M ui/meson.build

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into 
staging

meson related:
* convert unit tests
* bugfixes for mtest2make
* miscellaneous bugfixes
* dead code removal and configure cleanups
* oss-fuzz fixes
* msys fixes

# gpg: Signature made Tue 08 Sep 2020 10:43:27 BST
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# 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-gitlab/tags/for-upstream: (45 commits)
  docs: update build system documentation
  meson: remove linkage of sdl to baum
  meson: Convert undefsym.sh to undefsym.py
  fuzz: Add support for custom fuzzing library
  meson: specify fuzz linker script as a project arg
  oss-fuzz: fix rpath
  configure: update dtc submodule
  docs: suggest Meson replacements for various configure functions
  configure: drop dead variables and functions
  configure: do not include dependency flags in QEMU_CFLAGS and LIBS
  meson: get opengl compilation flags from OPENGL_CFLAGS
  meson: get glib compilation flags from GLIB_CFLAGS
  configure: do not look for install(1)
  configure: remove unnecessary libm test
  configure: move -ldl test to meson
  meson: keep all compiler flags detection together
  configure: move disassembler configuration to meson
  Makefile: inline the relevant parts of rules.mak
  Makefile: remove dead variables and includes
  meson: compute config_all_devices directly
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/e4c4f7db607f...46853bd9e712



reply via email to

[Prev in Thread] Current Thread [Next in Thread]