| Message ID | 20201221144447.26161-1-pbonzini@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 21 Dec 2020 at 14:51, Paolo Bonzini <pbonzini@redhat.com> wrote: > > The following changes since commit a05f8ecd88f15273d033b6f044b850a8af84a5b8: > > Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-20201217-1' into staging (2020-12-18 11:12:35 +0000) > > are available in the Git repository at: > > https://gitlab.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 16efbeeb765944fdda71862b40d60f0abeb1e200: > > win32: drop fd registration to the main-loop on setting non-block (2020-12-21 13:53:24 +0100) > > ---------------------------------------------------------------- > From Alex's pull request: > * improve cross-build KVM coverage > * new --without-default-features configure flag > * add __repr__ for ConsoleSocket for debugging > * build tcg tests with -Werror > * test 32 bit builds with fedora > * remove last traces of debian9 > * hotfix for centos8 powertools repo > > * Move lots of feature detection code to meson (Alex, myself) > * CFI and LTO support (Daniele) > * test-char dangling pointer (Eduardo) > * Build system and win32 fixes (Marc-André) > * Initialization fixes (myself) > * TCG include cleanup (Richard, myself) > * x86 'int N' fix (Peter) Fails to build, all hosts: make: Entering directory '/home/ubuntu/qemu/build/all' (cd /home/ubuntu/qemu && GIT="git" ./scripts/git-submodule.sh update ui/keycodemapdb tests/fp/berkeley-testfloat-3 te sts/fp/berkeley-softfloat-3 meson dtc capstone slirp roms/SLOF) config-host.mak is out-of-date, running configure cross containers no NOTE: guest cross-compilers enabled: cc cc /usr/bin/ninja -v build.ninja && touch build.ninja.stamp [0/1] /usr/bin/python3 /home/ubuntu/qemu/meson/meson.py --internal regenerate /home/ubuntu/qemu /home/ubuntu/qemu/bui ld/all --backend ninja WARNING: Regenerating configuration from scratch. Reason: Coredata file '/home/ubuntu/qemu/build/all/meson-private/coredata.dat' references functions or classes that d on't exist. This probably means that it was generated with an old version of meson. The Meson build system Version: 0.56.0 Source dir: /home/ubuntu/qemu Build dir: /home/ubuntu/qemu/build/all Build type: native build ../../meson.build:1:0: ERROR: Value "true" (of type "string") for combo option "Localization of the GTK+ user interface" is not one of the choices. Possible choices are (as string): "enabled", "disabled", "auto". A full log can be found at /home/ubuntu/qemu/build/all/meson-logs/meson-log.txt FAILED: build.ninja /usr/bin/python3 /home/ubuntu/qemu/meson/meson.py --internal regenerate /home/ubuntu/qemu /home/ubuntu/qemu/build/all --backend ninja ninja: error: rebuilding 'build.ninja': subcommand failed /usr/bin/ninja -v build.ninja && touch build.ninja.stamp [0/1] /usr/bin/python3 /home/ubuntu/qemu/meson/meson.py --internal regenerate /home/ubuntu/qemu /home/ubuntu/qemu/build/all --backend ninja WARNING: Regenerating configuration from scratch. Reason: Coredata file '/home/ubuntu/qemu/build/all/meson-private/coredata.dat' references functions or classes that don't exist. This probably means that it was generated with an old version of meson. The Meson build system Version: 0.56.0 Source dir: /home/ubuntu/qemu Build dir: /home/ubuntu/qemu/build/all Build type: native build ../../meson.build:1:0: ERROR: Value "true" (of type "string") for combo option "Localization of the GTK+ user interface" is not one of the choices. Possible choices are (as string): "enabled", "disabled", "auto". A full log can be found at /home/ubuntu/qemu/build/all/meson-logs/meson-log.txt FAILED: build.ninja /usr/bin/python3 /home/ubuntu/qemu/meson/meson.py --internal regenerate /home/ubuntu/qemu /home/ubuntu/qemu/build/all --backend ninja ninja: error: rebuilding 'build.ninja': subcommand failed /usr/bin/ninja -v all | cat make -C pc-bios/s390-ccw/ V="1" TARGET_DIR="pc-bios/s390-ccw/" all make[1]: Entering directory '/home/ubuntu/qemu/build/all/pc-bios/s390-ccw' make[1]: Leaving directory '/home/ubuntu/qemu/build/all/pc-bios/s390-ccw' [0/1] /usr/bin/python3 /home/ubuntu/qemu/meson/meson.py --internal regenerate /home/ubuntu/qemu /home/ubuntu/qemu/build/all --backend ninja WARNING: Regenerating configuration from scratch. Reason: Coredata file '/home/ubuntu/qemu/build/all/meson-private/coredata.dat' references functions or classes that don't exist. This probably means that it was generated with an old version of meson. The Meson build system Version: 0.56.0 Source dir: /home/ubuntu/qemu Build dir: /home/ubuntu/qemu/build/all Build type: native build ../../meson.build:1:0: ERROR: Value "true" (of type "string") for combo option "Localization of the GTK+ user interface" is not one of the choices. Possible choices are (as string): "enabled", "disabled", "auto". A full log can be found at /home/ubuntu/qemu/build/all/meson-logs/meson-log.txt ninja: error: rebuilding 'build.ninja': subcommand failed FAILED: build.ninja /usr/bin/python3 /home/ubuntu/qemu/meson/meson.py --internal regenerate /home/ubuntu/qemu /home/ubuntu/qemu/build/all --backend ninja Makefile:172: recipe for target 'run-ninja' failed make: *** [run-ninja] Error 1 make: Leaving directory '/home/ubuntu/qemu/build/all' (why does it print the same failure three times rather than stopping after the first one?) thanks -- PMM
Il ven 1 gen 2021, 18:05 Peter Maydell <peter.maydell@linaro.org> ha scritto: > (why does it print the same failure three times rather than > stopping after the first one?) > It probably has something to do with how make processes rules to rebuild makefiles. I will remove the patch that moves xgettext from boolean to feature and then try to reproduce the failure. Paolo > thanks > -- PMM > >
The following changes since commit a05f8ecd88f15273d033b6f044b850a8af84a5b8: Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-20201217-1' into staging (2020-12-18 11:12:35 +0000) are available in the Git repository at: https://gitlab.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 16efbeeb765944fdda71862b40d60f0abeb1e200: win32: drop fd registration to the main-loop on setting non-block (2020-12-21 13:53:24 +0100) ---------------------------------------------------------------- From Alex's pull request: * improve cross-build KVM coverage * new --without-default-features configure flag * add __repr__ for ConsoleSocket for debugging * build tcg tests with -Werror * test 32 bit builds with fedora * remove last traces of debian9 * hotfix for centos8 powertools repo * Move lots of feature detection code to meson (Alex, myself) * CFI and LTO support (Daniele) * test-char dangling pointer (Eduardo) * Build system and win32 fixes (Marc-André) * Initialization fixes (myself) * TCG include cleanup (Richard, myself) * x86 'int N' fix (Peter) ---------------------------------------------------------------- Alex Bennée (7): gitlab: include aarch64-softmmu and ppc64-softmmu cross-system-build configure: move gettext detection to meson.build configure: add --without-default-features python: add __repr__ to ConsoleSocket to aid debugging gitlab: move --without-default-devices build from Travis gitlab: add --without-default-features build tests/tcg: build tests with -Werror Daniel P. Berrangé (1): tests: update for rename of CentOS8 PowerTools repo Daniele Buono (5): configure,meson: add option to enable LTO cfi: Initial support for cfi-icall in QEMU check-block: enable iotests with cfi-icall configure,meson: support Control-Flow Integrity docs: Add CFI Documentation Eduardo Habkost (2): test-char: Destroy chardev correctly at char_file_test_internal() qom: Assert that objects being destroyed have no parent Marc-André Lureau (2): build-sys: fix -static linking of libvhost-user win32: drop fd registration to the main-loop on setting non-block Paolo Bonzini (34): configure: document --without-default-{features,devices} vl: initialize displays _after_ exiting preconfiguration remove TCG includes from common code trace: do not include TCG helper tracepoints in no-TCG builds Makefile: add dummy target for build.ninja dependencies meson: update submodule to 0.56.0 meson: switch minimum meson version to 0.56.0 meson: fix detection of curses with pkgconfig meson: use pkg-config method for libudev meson: use dependency to gate block modules meson: cleanup Kconfig.host handling configure: remove useless code to check for Xen PCI passthrough configure: remove variable bogus_os configure: accept --enable-slirp configure: remove CONFIG_FILEVERSION and CONFIG_PRODUCTVERSION brlapi: convert to meson curl: remove compatibility code, require 7.29.0 curl: convert to meson glusterfs: convert to meson bzip2: convert to meson libiscsi: convert to meson libnfs: convert to meson libssh: convert to meson rbd: convert to meson lzo: convert to meson snappy: convert to meson lzfse: convert to meson zstd: convert to meson seccomp: convert to meson virtfs: convert to meson cap_ng: convert to meson libattr: convert to meson meson.build: convert --with-default-devices to meson configure: move tests/qemu-iotests/common.env generation to meson Peter Maydell (1): target/i386: Check privilege level for protected mode 'int N' task gate Richard Henderson (1): util: Extract flush_icache_range to cacheflush.c Thomas Huth (2): gitlab-CI: Test 32-bit builds with the fedora-i386-cross container tests/docker: Remove the remainders of debian9 containers from the Makefile .gitlab-ci.d/crossbuilds.yml | 22 +- .gitlab-ci.yml | 14 + .travis.yml | 8 - MAINTAINERS | 2 + Makefile | 1 + accel/Kconfig | 9 + accel/stubs/tcg-stub.c | 1 - accel/tcg/cpu-exec.c | 11 + accel/tcg/cputlb.c | 2 +- accel/tcg/translate-all.c | 2 +- accel/tcg/user-exec.c | 2 +- block/curl.c | 28 - block/meson.build | 22 +- chardev/meson.build | 2 +- configure | 805 +++++----------------- contrib/elf2dmp/meson.build | 2 +- contrib/vhost-user-scsi/meson.build | 2 +- cpu.c | 2 +- docs/devel/control-flow-integrity.rst | 137 ++++ docs/devel/index.rst | 5 +- docs/devel/kconfig.rst | 19 +- docs/meson.build | 12 +- hw/i386/kvmvapic.c | 1 - {accel/tcg => include/exec}/translate-all.h | 0 include/qemu/cacheflush.h | 24 + include/qemu/compiler.h | 12 + meson | 2 +- meson.build | 484 +++++++++---- meson_options.txt | 49 +- migration/meson.build | 2 +- monitor/misc.c | 1 - plugins/core.c | 37 + plugins/loader.c | 7 + plugins/meson.build | 4 +- po/meson.build | 2 +- python/qemu/console_socket.py | 7 + qom/object.c | 1 + softmmu/meson.build | 2 +- softmmu/physmem.c | 4 +- softmmu/qemu-seccomp.c | 2 - softmmu/vl.c | 2 +- target/i386/tcg/seg_helper.c | 35 +- tcg/aarch64/tcg-target.h | 5 - tcg/arm/tcg-target.h | 5 - tcg/i386/tcg-target.h | 4 - tcg/mips/tcg-target.h | 11 - tcg/ppc/tcg-target.c.inc | 22 - tcg/ppc/tcg-target.h | 1 - tcg/riscv/tcg-target.h | 5 - tcg/s390/tcg-target.h | 4 - tcg/sparc/tcg-target.h | 8 - tcg/tcg.c | 1 + tcg/tci.c | 7 + tcg/tci/tcg-target.h | 4 - tests/check-block.sh | 18 +- tests/docker/Makefile.include | 6 +- tests/docker/dockerfiles/centos8.docker | 5 +- tests/docker/dockerfiles/fedora-i386-cross.docker | 18 +- tests/meson.build | 2 +- tests/qapi-schema/meson.build | 4 +- tests/qemu-iotests/common.env.in | 3 + tests/qemu-iotests/meson.build | 3 + tests/qtest/meson.build | 2 +- tests/tcg/Makefile.target | 2 +- tests/test-char.c | 2 +- tools/meson.build | 6 +- trace/meson.build | 6 +- util/cacheflush.c | 71 ++ util/main-loop.c | 11 + util/meson.build | 2 +- util/oslib-posix.c | 11 + util/oslib-win32.c | 1 - version.rc | 4 +- 73 files changed, 1069 insertions(+), 973 deletions(-) create mode 100644 docs/devel/control-flow-integrity.rst rename {accel/tcg => include/exec}/translate-all.h (100%) create mode 100644 include/qemu/cacheflush.h create mode 100644 tests/qemu-iotests/common.env.in create mode 100644 util/cacheflush.c