qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 09a49a: meson: Avoid implicit declaration of


From: Richard Henderson
Subject: [Qemu-commits] [qemu/qemu] 09a49a: meson: Avoid implicit declaration of absent functions
Date: Tue, 06 Jun 2023 12:09:09 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 09a49afeae2542993d4cdc5d7af22abdfce7a3ba
      
https://github.com/qemu/qemu/commit/09a49afeae2542993d4cdc5d7af22abdfce7a3ba
  Author: Michal Privoznik <mprivozn@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: Avoid implicit declaration of absent functions

While detecting a presence of a function via 'cc.links()'
gives desired result (i.e. detects whether function is present),
it also produces a warning on systems where the function is not
present (into meson-log.txt), e.g.:

  qemu.git/build/meson-private/tmph74x3p38/testfile.c:2:34: \
  warning: implicit declaration of function 'malloc_trim' 
[-Wimplicit-function-declaration]

And some distributions (e.g. Gentoo) parse the meson log and
consider these erroneous because it can lead to feature
misdetection (see [1]).

We can check whether given function exists via
'cc.has_function()' or whether STATX_* macros exist via
'cc.has_header_symbol()'.

1: https://wiki.gentoo.org/wiki/Modern_C_porting
Resolves: https://bugs.gentoo.org/898810
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Message-Id: 
<8e02776d18595a1c575c90a189ff65f1785f76ca.1685442612.git.mprivozn@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 06831001ac8949b0801e0d20c347d97339769a20
      
https://github.com/qemu/qemu/commit/06831001ac8949b0801e0d20c347d97339769a20
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M accel/tcg/cpu-exec.c
    M accel/tcg/tcg-accel-ops-mttcg.c
    M accel/tcg/tcg-accel-ops-rr.c
    M docs/devel/atomics.rst
    M include/qemu/atomic.h
    M monitor/qmp.c
    M softmmu/cpus.c
    M softmmu/physmem.c
    M target/arm/hvf/hvf.c
    M tests/unit/test-aio-multithread.c
    M util/qemu-coroutine-lock.c

  Log Message:
  -----------
  atomics: eliminate mb_read/mb_set

qatomic_mb_read and qatomic_mb_set were the very first atomic primitives
introduced for QEMU; their semantics are unclear and they provide a false
sense of safety.

The last use of qatomic_mb_read() has been removed, so delete it.
qatomic_mb_set() instead can survive as an optimized
qatomic_set()+smp_mb(), similar to Linux's smp_store_mb(), but
rename it to qatomic_set_mb() to match the order of the two
operations.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 0dec4e6f7a90a3b6c992ef212eefa058c4f7ce9a
      
https://github.com/qemu/qemu/commit/0dec4e6f7a90a3b6c992ef212eefa058c4f7ce9a
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    R scripts/test-driver.py

  Log Message:
  -----------
  scripts: remove dead file

scripts/test-driver.py was used when "make check" was already using meson
introspection data, but it did not execute "meson test".  It is dead since
commit 3d2f73ef75e ("build: use "meson test" as the test harness", 2021-12-23).

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


  Commit: 9e48afa3ceb695685a0ae756384fa83594bc5f16
      
https://github.com/qemu/qemu/commit/9e48afa3ceb695685a0ae756384fa83594bc5f16
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson.build: Group the UI entries in a separate summary section

Let's make it easier for the users to spot UI-related entries in
the summary of the meson output.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230602171832.533739-2-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: c3527c5e492f2ee37bd0697de3fe8dbb9dbffa24
      
https://github.com/qemu/qemu/commit/c3527c5e492f2ee37bd0697de3fe8dbb9dbffa24
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson.build: Group the network backend entries in a separate summary section

Let's make it easier for the users to spot network-related entries
in the summary of the meson output.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230602171832.533739-3-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: aece7238c4ebf4d95780df95f1a4743a7fa52ca9
      
https://github.com/qemu/qemu/commit/aece7238c4ebf4d95780df95f1a4743a7fa52ca9
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson.build: Group the audio backend entries in a separate summary section

Let's make it easier for the users to spot audio-related entries
in the summary of the meson output.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230602171832.533739-4-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 6da5f22b65f7147e1f0bd589cbdb072305a13bb7
      
https://github.com/qemu/qemu/commit/6da5f22b65f7147e1f0bd589cbdb072305a13bb7
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson.build: Use -Wno-undef only for SDL2 versions that need it

There is no need to disable this useful compiler warning for
all versions of the SDL. Unfortunately, various versions are
buggy (beside SDL 2.0.8, the version 2.26.0 and 2.26.1 are
broken, too, see https://github.com/libsdl-org/SDL/issues/6619 ),
but we can use a simple compiler check to see whether we need
the -Wno-undef or not.

This also enables the printing of the version number with
good versions of the SDL in the summary of the meson output
again.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230605114523.282987-1-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 6b40847ab40dba9eb1b2b0c530fcb7d484966d74
      
https://github.com/qemu/qemu/commit/6b40847ab40dba9eb1b2b0c530fcb7d484966d74
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M meson.build
    M scsi/qemu-pr-helper.c

  Log Message:
  -----------
  scsi/qemu-pr-helper: Drop support for 'old' libmultipath API

Commit 1b0578f5c4 ("qemu-pr-helper: Fix build on CentOS 7") added
code to probe for 'old' libmultipath API on CentOS 7. However since
merge commit 8c345b3e6a (June 2021) we don't build/test CentOS 7 as
it felt out of our list of supported distrib versions. Therefore we
can safely remove the 'old' API check (mostly reverting commit
1b0578f5c4, except the code got converted to meson in commit
6ec0e15d95 "meson: move libmpathpersist test").

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230605174146.87440-2-philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: eaf245becd9ece615a4831c0cf4d27b165d8675f
      
https://github.com/qemu/qemu/commit/eaf245becd9ece615a4831c0cf4d27b165d8675f
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M tests/Makefile.include
    M tests/requirements.txt

  Log Message:
  -----------
  Revert "tests/requirements.txt: bump up avocado-framework version to 101.0"

This reverts commit ec5ffa0056389c3c10ea2de1e78366f66f4e5abc.

Bumping avocado to version 101 has two issues.  First, there are problems
where Avocado is not logging of command lines or terminal output, and not
collecting Python logs outside the avocado namespace.

Second, the recent changes to Python handling mean that there is a single
virtual environment for all the build, instead of a separate one for testing.
Requiring a too-new version of avocado causes conflicts with any avocado
plugins installed on the host:

   $ make check-venv
   make[1]: Entering directory '/home/berrange/src/virt/qemu/build'
     GIT     ui/keycodemapdb tests/fp/berkeley-testfloat-3 
tests/fp/berkeley-softfloat-3 dtc
     VENVPIP install -e /home/berrange/src/virt/qemu/python/
     VENVPIP install -r /home/berrange/src/virt/qemu/tests/requirements.txt
   ERROR: pip's dependency resolver does not currently take into account all 
the packages that are installed. This behaviour is the source of the following 
dependency conflicts.
   avocado-framework-plugin-varianter-yaml-to-mux 98.0 requires 
avocado-framework==98.0, but you have avocado-framework 101.0 which is 
incompatible.
   avocado-framework-plugin-result-html 98.0 requires avocado-framework==98.0, 
but you have avocado-framework 101.0 which is incompatible.
   make[1]: Leaving directory '/home/berrange/src/virt/qemu/build'

To avoid this issue, tests/requirements.txt should use a ">=" constraint
and the version of Avocado should be limited to what distros provide
in the system packages.  Only Fedora has Avocado, and more specifically
version 92.0 (though 98.0 is also available as a module).  As a first
step, this patch reverts the introduction of a too-new Avocado.

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


  Commit: e8e4298feadae7924cf7600bb3bcc5b0a8d7cbe9
      
https://github.com/qemu/qemu/commit/e8e4298feadae7924cf7600bb3bcc5b0a8d7cbe9
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M .gitlab-ci.d/buildtest.yml
    M docs/devel/acpi-bits.rst
    M docs/devel/testing.rst
    M scripts/ci/org.centos/stream/8/x86_64/test-avocado
    M scripts/device-crash-test
    M tests/Makefile.include
    M tests/requirements.txt
    M tests/vm/Makefile.include

  Log Message:
  -----------
  tests: Use separate virtual environment for avocado

This reverts commits eea2d141179 ("Makefile: remove $(TESTS_PYTHON)",
2023-05-26) and 9c6692db550 ("tests: Use configure-provided pyvenv for
tests", 2023-05-18).

Right now, there is a conflict between wanting a ">=" constraint when
using a distro-provided package and wanting a "==" constraint when
installing Avocado from PyPI; this would provide the best of both worlds
in terms of resiliency for both distros that have required packages and
distros that don't.

The conflict is visible also for meson, where we would like to install
the latest 0.63.x version but also accept a distro 1.1.x version.
But it is worse for avocado, for two reasons:

1) we cannot use an "==" constraint to install avocado if the venv
includes a system avocado.  The distro will package plugins that have
"==" constraints on the version that is included in the distro, and, using
"pip install avocado==88.1" on a venv that includes system packages will
result in this error:

   ERROR: pip's dependency resolver does not currently take into account all 
the packages that are installed. This behaviour is the source of the following 
dependency conflicts.
   avocado-framework-plugin-varianter-yaml-to-mux 98.0 requires 
avocado-framework==98.0, but you have avocado-framework 88.1 which is 
incompatible.
   avocado-framework-plugin-result-html 98.0 requires avocado-framework==98.0, 
but you have avocado-framework 88.1 which is incompatible.
   make[1]: Leaving directory '/home/berrange/src/virt/qemu/build'

2) we cannot use ">=" either if the venv does _not_ include a system
avocado, because that would result in the installation of v101.0 which
is the one we've just reverted.

So the idea is to encode the dependencies as an (acceptable, locked)
tuple, like this hypothetical TOML that would be committed inside
python/ and used by mkvenv.py:

  [meson]
  meson = { minimum = "0.63.0", install = "0.63.3", canary = "meson" }

  [docs]
  # 6.0 drops support for Python 3.7
  sphinx = { minimum = "1.6", install = "<6.0", canary = "sphinx-build" }
  sphinx_rtd_theme = { minimum = "0.5" }

  [avocado]
  avocado-framework = { minimum = "88.1", install = "88.1", canary = "avocado" }

Once this is implemented, it would also be possible to install avocado in
pyvenv/ using "mkvenv.py ensure", thus using the distro package on Fedora
and CentOS Stream (the only distros where it's available).  But until
this is implemented, keep avocado in a separate venv.  There is still the
benefit of using a single python for meson custom_targets and for sphinx.

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


  Commit: 47a90a51a9c24ba10c58c0cd09d2117cf9e3fde2
      
https://github.com/qemu/qemu/commit/47a90a51a9c24ba10c58c0cd09d2117cf9e3fde2
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M python/scripts/mkvenv.py

  Log Message:
  -----------
  mkvenv: always pass locally-installed packages to pip

Let pip decide whether a new version should be installed or the current
one is okay.  This ensures that the virtual environment is updated
(either upgraded or downgraded) whenever a new version of a package is
requested.

The hardest part here is figuring out if a package is installed in
the venv (which also has to be done twice to account for the presence
of either setuptools in Python <3.8, or importlib in Python >=3.8).

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Cc: John Snow <jsnow@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 50cfed80ecc01ea4300ed4b0ea5b567f381b9421
      
https://github.com/qemu/qemu/commit/50cfed80ecc01ea4300ed4b0ea5b567f381b9421
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M Makefile
    M configure
    M meson.build
    M scripts/ci/org.centos/stream/8/x86_64/configure
    M scripts/git-submodule.sh

  Log Message:
  -----------
  configure: remove --with-git= option

The scenario for which --with-git= was introduced was to use a SOCKS proxy
such as tsocks.  However, this was back in 2017 when QEMU's submodules
used the git:// protocol, and it is not as important when using the
"smart HTTP" backend; for example, neither "meson subprojects download"
nor scripts/checkpatch.pl obey the GIT environment variable.

So remove the knob, but test for the presence of git in the configure and
git-submodule.sh scripts, and suggest using --with-git-submodules=validate
+ a manual invocation of git-submodule.sh when git does not work.  Hopefully
in the future the GIT environment variable will be supported by Meson.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: ac4ccac740a824539a92ef397bb5efa58bd8cbe5
      
https://github.com/qemu/qemu/commit/ac4ccac740a824539a92ef397bb5efa58bd8cbe5
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M .gitignore
    M configure
    M meson.build
    A subprojects/.gitignore

  Log Message:
  -----------
  configure: rename --enable-pypi to --enable-download, control subprojects too

The behavior of --{enable,disable}-pypi is similar to that of
-Dwrapmode={default,nodownload} respectively.  In particular,
in both cases a feature needs to be explicitly enabled for the
dependency to be downloaded.

So, use a single option to control both cases.  Now, --enable-slirp
will trigger cloning and building of libslirp if the .pc file
is not found on the machine.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: fdb8fd8cb915647be7f7f2e2f0c530ed06ca9b01
      
https://github.com/qemu/qemu/commit/fdb8fd8cb915647be7f7f2e2f0c530ed06ca9b01
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M scripts/git-submodule.sh

  Log Message:
  -----------
  git-submodule: allow partial update of .git-submodule-status

Allow a specific subdirectory to run git-submodule.sh with only a
subset of submodules, without removing the others from the
.git-submodule-status file.

This also allows scripts/git-submodule.sh to be more lenient:
validating an empty set of submodules is not a mistake.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: d120116b5d6e81831332f807028a29c5e5815a6a
      
https://github.com/qemu/qemu/commit/d120116b5d6e81831332f807028a29c5e5815a6a
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M Makefile
    M scripts/git-submodule.sh

  Log Message:
  -----------
  build: log submodule update from git-submodule.sh

Print exactly which submodules have been updated, by reusing the logic of
"git-submodule.sh validate" after executing "git submodule update --init'.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 2019cabfee08dd49c28359b6fd0bac63fb12df9b
      
https://github.com/qemu/qemu/commit/2019cabfee08dd49c28359b6fd0bac63fb12df9b
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M .gitlab-ci.d/buildtest-template.yml
    M .gitmodules
    M configure
    M meson.build
    M scripts/archive-source.sh
    M scripts/make-release
    M subprojects/.gitignore
    R subprojects/dtc
    A subprojects/dtc.wrap
    R subprojects/keycodemapdb
    A subprojects/keycodemapdb.wrap
    R subprojects/libvfio-user
    A subprojects/libvfio-user.wrap

  Log Message:
  -----------
  meson: subprojects: replace submodules with wrap files

Compared to submodules, .wrap files have several advantages:

* option parsing and downloading is delegated to meson

* the commit is stored in a text file instead of a magic entry in the
  git tree object

* we could stop shipping external dependencies that are only used as a
  fallback, but not break compilation on platforms that lack them.
  For example it may make sense to download dtc at build time, controlled
  by --enable-download, even when building from a tarball.  Right now,
  this patch does the opposite: make-release treats dtc like libvfio-user
  (which is not stable API and therefore hasn't found its way into any
  distros) and keycodemap (which is a copylib, for better or worse).

dependency() can fall back to a wrap automatically.  However, this
is only possible for libraries that come with a .pc file, and this
is not very common for libfdt even though the upstream project in
principle provides it; it also removes the control that we provide with
--enable-fdt={system,internal}.  Therefore, the logic to pick system
vs. internal libfdt is left untouched.

--enable-fdt=git is removed; it was already a synonym for
--enable-fdt=internal.

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


  Commit: b11f9bd96f451f0e60b2b91e19b900ec7c673f29
      
https://github.com/qemu/qemu/commit/b11f9bd96f451f0e60b2b91e19b900ec7c673f29
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M .gitlab-ci.d/buildtest-template.yml
    M configure
    M pc-bios/s390-ccw/Makefile

  Log Message:
  -----------
  configure: move SLOF submodule handling to pc-bios/s390-ccw

Move the handling of the roms/SLOF submodule out of the main Makefile,
since we are going to remove submodules from the build process of QEMU.

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


  Commit: bf6903f6944fe75606e4c67d6962b407c7bb5656
      
https://github.com/qemu/qemu/commit/bf6903f6944fe75606e4c67d6962b407c7bb5656
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M pc-bios/s390-ccw/Makefile

  Log Message:
  -----------
  pc-bios/s390-ccw: always build network bootloader

In the beginning, the network bootloader was considered experimental and
thus optional, but it is well established nowadays and configure always
checks for roms/SLOF before compiling pc-bios/s390-ccw.

Therefore, it makes sense to always build it together with the other
part of the s390-ccw bios.

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


  Commit: d2dfe0b506e47e1409b29b65acb098d707532149
      
https://github.com/qemu/qemu/commit/d2dfe0b506e47e1409b29b65acb098d707532149
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M .gitmodules
    M configure
    M scripts/archive-source.sh
    M scripts/make-release
    M subprojects/.gitignore
    A subprojects/berkeley-softfloat-3.wrap
    A subprojects/berkeley-testfloat-3.wrap
    A subprojects/packagefiles/berkeley-softfloat-3/meson.build
    A subprojects/packagefiles/berkeley-softfloat-3/meson_options.txt
    A subprojects/packagefiles/berkeley-testfloat-3/meson.build
    A subprojects/packagefiles/berkeley-testfloat-3/meson_options.txt
    M tests/fp/meson.build

  Log Message:
  -----------
  meson: subprojects: replace berkeley-{soft,test}float-3 with wraps

Unlike other subprojects, these require an overlay directory to include
meson rules to build the libraries.  The rules are basically lifted
from tests/fp/meson.build, with a few changes to create platform.h
and publish a dependency.

The build defines are passed through a subproject option, and posted
back to users of the library via the dependency's compile_args.

The only remaining user of GIT_SUBMODULES and GIT_SUBMODULES_ACTION
is roms/SLOF, which is used to build pc-bios/s390-ccw.  All other
roms submodules are only present to satisfy the license on pre-built
firmware blobs.

Best reviewed with --color-moved.

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


  Commit: 1f468152fb2d461f2a5f8838a3bea9fd6aaa2207
      
https://github.com/qemu/qemu/commit/1f468152fb2d461f2a5f8838a3bea9fd6aaa2207
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M .gitlab-ci.d/buildtest-template.yml
    M Makefile
    M configure
    M meson.build

  Log Message:
  -----------
  build: remove git submodule handling from main makefile

The only remaining user of submodules at build time is roms/SLOF,
which is handled in pc-bios/s390-ccw/Makefile.  Remove the relevant
code from the main makefile.

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


  Commit: 6f3ae23b29ad5831902e3ecdc7e443bbbf295bde
      
https://github.com/qemu/qemu/commit/6f3ae23b29ad5831902e3ecdc7e443bbbf295bde
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M configure
    M scripts/ci/org.centos/stream/8/x86_64/configure
    M scripts/git-submodule.sh

  Log Message:
  -----------
  configure: remove --with-git-submodules=

Reuse --enable/--disable-download to control git submodules as well.
Adjust the error messages of git-submodule.sh to refer to the new
option.

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


  Commit: 80bdd58ae41ee7f65081c33e5f96cd6033da8337
      
https://github.com/qemu/qemu/commit/80bdd58ae41ee7f65081c33e5f96cd6033da8337
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2023-06-06 (Tue, 06 Jun 2023)

  Changed paths:
    M .gitignore
    M .gitlab-ci.d/buildtest-template.yml
    M .gitlab-ci.d/buildtest.yml
    M .gitmodules
    M Makefile
    M accel/tcg/cpu-exec.c
    M accel/tcg/tcg-accel-ops-mttcg.c
    M accel/tcg/tcg-accel-ops-rr.c
    M configure
    M docs/devel/acpi-bits.rst
    M docs/devel/atomics.rst
    M docs/devel/testing.rst
    M include/qemu/atomic.h
    M meson.build
    M monitor/qmp.c
    M pc-bios/s390-ccw/Makefile
    M python/scripts/mkvenv.py
    M scripts/archive-source.sh
    M scripts/ci/org.centos/stream/8/x86_64/configure
    M scripts/ci/org.centos/stream/8/x86_64/test-avocado
    M scripts/device-crash-test
    M scripts/git-submodule.sh
    M scripts/make-release
    R scripts/test-driver.py
    M scsi/qemu-pr-helper.c
    M softmmu/cpus.c
    M softmmu/physmem.c
    A subprojects/.gitignore
    A subprojects/berkeley-softfloat-3.wrap
    A subprojects/berkeley-testfloat-3.wrap
    R subprojects/dtc
    A subprojects/dtc.wrap
    R subprojects/keycodemapdb
    A subprojects/keycodemapdb.wrap
    R subprojects/libvfio-user
    A subprojects/libvfio-user.wrap
    A subprojects/packagefiles/berkeley-softfloat-3/meson.build
    A subprojects/packagefiles/berkeley-softfloat-3/meson_options.txt
    A subprojects/packagefiles/berkeley-testfloat-3/meson.build
    A subprojects/packagefiles/berkeley-testfloat-3/meson_options.txt
    M target/arm/hvf/hvf.c
    M tests/Makefile.include
    M tests/fp/meson.build
    M tests/requirements.txt
    M tests/unit/test-aio-multithread.c
    M tests/vm/Makefile.include
    M util/qemu-coroutine-lock.c

  Log Message:
  -----------
  Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging

* finish atomics revamp
* meson.build tweaks
* revert avocado update
* always upgrade/downgrade locally installed Python packages
* switch from submodules to subprojects
* remove --with-git= option
* rename --enable-pypi to --enable-download, control submodules and subprojects 
too

# -----BEGIN PGP SIGNATURE-----
#
# iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmR/Qu8UHHBib256aW5p
# QHJlZGhhdC5jb20ACgkQv/vSX3jHroMmSwgAj5SHD8R+5D1UmptzBvI/72CfgqVv
# MJa4O1LvHwUkuSmxX1MFFhRa0mo0bu6j+bPpvJ29zKS61ybVwJl87gnsRcDAMXe7
# 08YbcG35Chox6aZxbidUQtXm18JZ3F2aMtmxUuP0PR7LDjVXLV5FsjrHTIt8KuEZ
# vUqq3IsVbc4FxCCC0ke2DzrtgpRCxYSdfPrj/t5WzAztAXId9r1zvUlCLN+FUpri
# E3KIZYpkXZyOnJQ9W30KnsZo5QtDACwlIMBK6whSdoCjyNN7TwDdhNW8QkOueNO6
# q3tLfwf5+u6uyEoaQTW+teE2oMXT8N4IJllRJj2RyQ1BFD49XhUUJmc33Q==
# =b9QD
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 06 Jun 2023 07:30:07 AM PDT
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [unknown]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# 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

* tag 'for-upstream' of https://gitlab.com/bonzini/qemu: (21 commits)
  configure: remove --with-git-submodules=
  build: remove git submodule handling from main makefile
  meson: subprojects: replace berkeley-{soft,test}float-3 with wraps
  pc-bios/s390-ccw: always build network bootloader
  configure: move SLOF submodule handling to pc-bios/s390-ccw
  meson: subprojects: replace submodules with wrap files
  build: log submodule update from git-submodule.sh
  git-submodule: allow partial update of .git-submodule-status
  configure: rename --enable-pypi to --enable-download, control subprojects too
  configure: remove --with-git= option
  mkvenv: always pass locally-installed packages to pip
  tests: Use separate virtual environment for avocado
  Revert "tests/requirements.txt: bump up avocado-framework version to 101.0"
  scsi/qemu-pr-helper: Drop support for 'old' libmultipath API
  meson.build: Use -Wno-undef only for SDL2 versions that need it
  meson.build: Group the audio backend entries in a separate summary section
  meson.build: Group the network backend entries in a separate summary section
  meson.build: Group the UI entries in a separate summary section
  scripts: remove dead file
  atomics: eliminate mb_read/mb_set
  ...

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/7ce5a15fa633...80bdd58ae41e



reply via email to

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