[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 6ebd89: submodules: bump meson to 0.55.3
|
From: |
Peter Maydell |
|
Subject: |
[Qemu-commits] [qemu/qemu] 6ebd89: submodules: bump meson to 0.55.3 |
|
Date: |
Mon, 19 Oct 2020 01:40:52 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 6ebd89cf9ca3f5a6948542c4522b9380b1e9539f
https://github.com/qemu/qemu/commit/6ebd89cf9ca3f5a6948542c4522b9380b1e9539f
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M .cirrus.yml
M configure
M meson
Log Message:
-----------
submodules: bump meson to 0.55.3
This adds some bugfixes, and allows MSYS2 to configure
without "--ninja=ninja".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: e90df5eada4e6047548203d781bd61ddcc45d7b4
https://github.com/qemu/qemu/commit/e90df5eada4e6047548203d781bd61ddcc45d7b4
Author: Greg Kurz <groug@kaod.org>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M Makefile
Log Message:
-----------
Makefile: Ensure cscope.out/tags/TAGS are generated in the source tree
Tools usually expect the index files to be in the source tree, eg. emacs.
This is already the case when doing out-of-tree builds, but with in-tree
builds they end up in the build directory.
Force cscope, ctags and etags to put them in the source tree.
Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <160277334665.1754102.10921580280105870386.stgit@bahia.lan>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 88da4b043b4f91a265947149b1cd6758c046a4bd
https://github.com/qemu/qemu/commit/88da4b043b4f91a265947149b1cd6758c046a4bd
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M tests/Makefile.include
Log Message:
-----------
tests/Makefile.include: unbreak non-tcg builds
Remove from check-block the requirement that all TARGET_DIRS are built.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 3bf4583580ab705de1beff6222e934239c3a0356
https://github.com/qemu/qemu/commit/3bf4583580ab705de1beff6222e934239c3a0356
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M Makefile
Log Message:
-----------
make: run shell with pipefail
Without pipefail, it is possible to miss failures if the recipes
include pipes.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 97d6efd0a3f3a08942de6c2aee5d2983c54ca84c
https://github.com/qemu/qemu/commit/97d6efd0a3f3a08942de6c2aee5d2983c54ca84c
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M tests/include/meson.build
M tests/meson.build
Log Message:
-----------
tests: add missing generated sources to testqapi
Ninja notices them due to a different order in visiting the graph.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 1e6e616dc21a8117cbe36a7e9026221b566cdf56
https://github.com/qemu/qemu/commit/1e6e616dc21a8117cbe36a7e9026221b566cdf56
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M configure
M meson.build
Log Message:
-----------
configure: move QEMU_INCLUDES to meson
Confusingly, QEMU_INCLUDES is not used by configure tests. Moving
it to meson.build ensures that Windows paths are specified instead of
the msys paths like /c/Users/...
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: f2f984a3b3bc8322df2efa3937bf11e8ea2bcaa5
https://github.com/qemu/qemu/commit/f2f984a3b3bc8322df2efa3937bf11e8ea2bcaa5
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M tests/docker/dockerfiles/centos8.docker
Log Message:
-----------
dockerfiles: enable Centos 8 PowerTools
ninja is included in the CentOS PowerTools repository.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 345d7053ca4a39b0496366f3c953ae2681570ce3
https://github.com/qemu/qemu/commit/345d7053ca4a39b0496366f3c953ae2681570ce3
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M .cirrus.yml
M .travis.yml
M tests/docker/dockerfiles/centos7.docker
M tests/docker/dockerfiles/centos8.docker
M tests/docker/dockerfiles/debian10.docker
M tests/docker/dockerfiles/fedora.docker
M tests/docker/dockerfiles/travis.docker
M tests/docker/dockerfiles/ubuntu.docker
M tests/docker/dockerfiles/ubuntu1804.docker
M tests/docker/dockerfiles/ubuntu2004.docker
M tests/vm/centos
M tests/vm/centos.aarch64
M tests/vm/fedora
M tests/vm/freebsd
M tests/vm/netbsd
M tests/vm/openbsd
M tests/vm/ubuntu.aarch64
M tests/vm/ubuntu.i386
Log Message:
-----------
add ninja to dockerfiles, CI configurations and test VMs
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Acked-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 2b8575bd5fbc8a8880e9ecfb1c7e7990feb1fea6
https://github.com/qemu/qemu/commit/2b8575bd5fbc8a8880e9ecfb1c7e7990feb1fea6
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M Makefile
Log Message:
-----------
build: cleanups to Makefile
Group similar rules, add comments to "else" and "endif" lines,
detect too-old config-host.mak before messing things up.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 09e93326e448ab43fa26a9e2d9cc20ecf951f32b
https://github.com/qemu/qemu/commit/09e93326e448ab43fa26a9e2d9cc20ecf951f32b
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M Makefile
M configure
M docs/devel/build-system.rst
M meson.build
M scripts/mtest2make.py
R scripts/ninjatool.py
M tests/Makefile.include
Log Message:
-----------
build: replace ninjatool with ninja
Now that the build is done entirely by Meson, there is no need
to keep the Makefile conversion. Instead, we can ask Ninja about
the targets it exposes and forward them.
The main advantages are, from smallest to largest:
- reducing the possible namespace pollution within the Makefile
- removal of a relatively large Python program
- faster build because parsing Makefile.ninja is slower than
parsing build.ninja; and faster build after Meson runs because
we do not have to generate Makefile.ninja.
- tracking of command lines, which provides more accurate rebuilds
In addition the change removes the requirement for GNU make 3.82, which
was annoying on Mac, and avoids bugs on Windows due to ninjatool not
knowing how to convert Windows escapes to POSIX escapes.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 5c53015a480b3fe137ebd8b3b584a595c65e8f21
https://github.com/qemu/qemu/commit/5c53015a480b3fe137ebd8b3b584a595c65e8f21
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M configure
M meson.build
M meson_options.txt
Log Message:
-----------
build: add --enable/--disable-libudev
Initially, libudev detection was bundled with --enable-mpath because
qemu-pr-helper was the only user of libudev. Recently however the USB
U2F emulation has also started using libudev, so add a separate
option. This also allows 1) disabling libudev if desired for static
builds and 2) for non-static builds, requiring libudev even if
multipath support is undesirable.
The multipath test is adjusted, because it is now possible to enter it
with configurations that should fail, such as --static --enable-mpath
--disable-libudev.
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: ac0c8351abf79f3b65105ea27bd0491387d804f6
https://github.com/qemu/qemu/commit/ac0c8351abf79f3b65105ea27bd0491387d804f6
Author: Bruce Rogers <brogers@suse.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M meson.build
Log Message:
-----------
meson.build: don't condition iconv detection on library detection
It isn't necessarily the case that use of iconv requires an additional
library. For that reason we shouldn't conditionalize iconv detection on
libiconv.found.
Fixes: 5285e593c33 (configure: Fixes ncursesw detection under msys2/mingw by
convert them to meson)
Signed-off-by: Bruce Rogers <brogers@suse.com>
Reviewed-by: Yonggang Luo<l <brogers@suse.com>uoyonggang@gmail.com>
Reviewed-by:Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20201014221939.196958-1-brogers@suse.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 30fe76b17cc5aad395eb8a8a3da59e377a0b3d8e
https://github.com/qemu/qemu/commit/30fe76b17cc5aad395eb8a8a3da59e377a0b3d8e
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M meson.build
Log Message:
-----------
meson: cleanup curses/iconv test
Skip the test if it is system emulation is not requested, and
differentiate errors for lack of iconv and lack of curses.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: c6502638075557ff38fbb874af32f91186b667eb
https://github.com/qemu/qemu/commit/c6502638075557ff38fbb874af32f91186b667eb
Author: Bruce Rogers <brogers@suse.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M configure
Log Message:
-----------
configure: fix handling of --docdir parameter
Commit ca8c0909f01 changed qemu_docdir to be docdir, then later uses the
qemu_docdir name in the final assignment. Unfortunately, one instance of
qemu_docdir was missed: the one which comes from the --docdir parameter.
This patch restores the proper handling of the --docdir parameter.
Fixes: ca8c0909f01 ("configure: build docdir like other suffixed
directories")
Signed-off-by: Bruce Rogers <brogers@suse.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20201015190742.270629-1-brogers@suse.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 3856873ee404c028a47115147f21cdc4b0d25566
https://github.com/qemu/qemu/commit/3856873ee404c028a47115147f21cdc4b0d25566
Author: Bruce Rogers <brogers@suse.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M ui/meson.build
Log Message:
-----------
meson: Only install icons and qemu.desktop if have_system
These files are not needed for a linux-user only install.
Signed-off-by: Bruce Rogers <brogers@suse.com>
Message-Id: <20201015201840.282956-1-brogers@suse.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: a94a689cc5c5b2a1fbba4dd418e456a14e6e12e5
https://github.com/qemu/qemu/commit/a94a689cc5c5b2a1fbba4dd418e456a14e6e12e5
Author: Yonggang Luo <luoyonggang@gmail.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M docs/conf.py
M docs/sphinx/kerneldoc.py
Log Message:
-----------
docs: Fix Sphinx configuration for msys2/mingw
Python doesn't support running ../scripts/kernel-doc directly.
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20201015220626.418-2-luoyonggang@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 9dc6ee3fd78a478935eecf936cddd575c6dfb20a
https://github.com/qemu/qemu/commit/9dc6ee3fd78a478935eecf936cddd575c6dfb20a
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M tests/qapi-schema/meson.build
Log Message:
-----------
meson: move SPHINX_ARGS references within "if build_docs"
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: e36676604683c1ee12963d83eaaf3d3c2a1790ce
https://github.com/qemu/qemu/commit/e36676604683c1ee12963d83eaaf3d3c2a1790ce
Author: Yonggang Luo <luoyonggang@gmail.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M configure
M docs/meson.build
M meson.build
M meson_options.txt
Log Message:
-----------
meson: Move the detection logic for sphinx to meson
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20201015220626.418-4-luoyonggang@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 5bfb4f52fe897f5594a0089891e19c78d3ecd672
https://github.com/qemu/qemu/commit/5bfb4f52fe897f5594a0089891e19c78d3ecd672
Author: Yonggang Luo <luoyonggang@gmail.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M .cirrus.yml
Log Message:
-----------
cirrus: Enable doc build on msys2/mingw
Currently rST depends on old version sphinx-2.x.
Install it by downloading it.
Remove the need of university mirror, the main repo are recovered.
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20201015220626.418-5-luoyonggang@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: fc69fa216cf52709b1279a592364e50c674db6ff
https://github.com/qemu/qemu/commit/fc69fa216cf52709b1279a592364e50c674db6ff
Author: Alexander Bulekov <alxndr@bu.edu>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M tests/qtest/fuzz/fuzz.c
Log Message:
-----------
fuzz: Disable QEMU's SIG{INT,HUP,TERM} handlers
Prior to this patch, the only way I found to terminate the fuzzer was
either to:
1. Explicitly specify the number of fuzzer runs with the -runs= flag
2. SIGKILL the process with "pkill -9 qemu-fuzz-*" or similar
In addition to being annoying to deal with, SIGKILLing the process skips
over any exit handlers(e.g. registered with atexit()). This is bad,
since some fuzzers might create temporary files that should ideally be
removed on exit using an exit handler. The only way to achieve a clean
exit now is to specify -runs=N , but the desired "N" is tricky to
identify prior to fuzzing.
Why doesn't the process exit with standard SIGINT,SIGHUP,SIGTERM
signals? QEMU installs its own handlers for these signals in
os-posix.c:os_setup_signal_handling, which notify the main loop that an
exit was requested. The fuzzer, however, does not run qemu_main_loop,
which performs the main_loop_should_exit() check. This means that the
fuzzer effectively ignores these signals. As we don't really care about
cleanly stopping the disposable fuzzer "VM", this patch uninstalls
QEMU's signal handlers. Thus, we can stop the fuzzer with
SIG{INT,HUP,TERM} and the fuzzing code can optionally use atexit() to
clean up temporary files/resources.
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Message-Id: <20201014142157.46028-1-alxndr@bu.edu>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: a1b0e4613006704fb02209df548ce9fde62232e0
https://github.com/qemu/qemu/commit/a1b0e4613006704fb02209df548ce9fde62232e0
Author: Claudio Fontana <cfontana@suse.de>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M target/i386/hax-cpus.c
Log Message:
-----------
hax: unbreak accelerator cpu code after cpus.c split
during my split of cpus.c, code line
"current_cpu = cpu"
was removed by mistake, causing hax to break.
This commit fixes the situation restoring it.
Reported-by: Volker Rümelin <vr_qemu@t-online.de>
Fixes: e92558e4bf8059ce4f0b310afe218802b72766bc
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Message-Id: <20201016080032.13914-1-cfontana@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: c47110d90fa5401bcc42c17f8ae0724a1c96599a
https://github.com/qemu/qemu/commit/c47110d90fa5401bcc42c17f8ae0724a1c96599a
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M .cirrus.yml
M .gitlab-ci.yml
M .travis.yml
Log Message:
-----------
ci: include configure and meson logs in all jobs if configure fails
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 782d7b30dd8e27ba24346e7c411b476db88b59e7
https://github.com/qemu/qemu/commit/782d7b30dd8e27ba24346e7c411b476db88b59e7
Author: Peter Maydell <peter.maydell@linaro.org>
Date: 2020-10-17 (Sat, 17 Oct 2020)
Changed paths:
M .cirrus.yml
M .gitlab-ci.yml
M .travis.yml
M Makefile
M configure
M docs/conf.py
M docs/devel/build-system.rst
M docs/meson.build
M docs/sphinx/kerneldoc.py
M meson
M meson.build
M meson_options.txt
M scripts/mtest2make.py
R scripts/ninjatool.py
M target/i386/hax-cpus.c
M tests/Makefile.include
M tests/docker/dockerfiles/centos7.docker
M tests/docker/dockerfiles/centos8.docker
M tests/docker/dockerfiles/debian10.docker
M tests/docker/dockerfiles/fedora.docker
M tests/docker/dockerfiles/travis.docker
M tests/docker/dockerfiles/ubuntu.docker
M tests/docker/dockerfiles/ubuntu1804.docker
M tests/docker/dockerfiles/ubuntu2004.docker
M tests/include/meson.build
M tests/meson.build
M tests/qapi-schema/meson.build
M tests/qtest/fuzz/fuzz.c
M tests/vm/centos
M tests/vm/centos.aarch64
M tests/vm/fedora
M tests/vm/freebsd
M tests/vm/netbsd
M tests/vm/openbsd
M tests/vm/ubuntu.aarch64
M tests/vm/ubuntu.i386
M ui/meson.build
Log Message:
-----------
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into
staging
* Drop ninjatool and just require ninja (Paolo)
* Fix docs build under msys2 (Yonggang)
* HAX snafu fix (Claudio)
* Disable signal handlers during fuzzing (Alex)
* Miscellaneous fixes (Bruce, Greg)
# gpg: Signature made Sat 17 Oct 2020 15:45:56 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: (22 commits)
ci: include configure and meson logs in all jobs if configure fails
hax: unbreak accelerator cpu code after cpus.c split
fuzz: Disable QEMU's SIG{INT,HUP,TERM} handlers
cirrus: Enable doc build on msys2/mingw
meson: Move the detection logic for sphinx to meson
meson: move SPHINX_ARGS references within "if build_docs"
docs: Fix Sphinx configuration for msys2/mingw
meson: Only install icons and qemu.desktop if have_system
configure: fix handling of --docdir parameter
meson: cleanup curses/iconv test
meson.build: don't condition iconv detection on library detection
build: add --enable/--disable-libudev
build: replace ninjatool with ninja
build: cleanups to Makefile
add ninja to dockerfiles, CI configurations and test VMs
dockerfiles: enable Centos 8 PowerTools
configure: move QEMU_INCLUDES to meson
tests: add missing generated sources to testqapi
make: run shell with pipefail
tests/Makefile.include: unbreak non-tcg builds
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Compare: https://github.com/qemu/qemu/compare/e12ce85b2c79...782d7b30dd8e