[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] a26962: tests/docker: simplify HOST_ARCH defi
|
From: |
Richard Henderson |
|
Subject: |
[Qemu-commits] [qemu/qemu] a26962: tests/docker: simplify HOST_ARCH definition |
|
Date: |
Fri, 26 May 2023 17:16:38 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: a2696204de05fc3f57a2bc1c7762b9f5f2df594f
https://github.com/qemu/qemu/commit/a2696204de05fc3f57a2bc1c7762b9f5f2df594f
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2023-05-26 (Fri, 26 May 2023)
Changed paths:
M tests/docker/Makefile.include
Log Message:
-----------
tests/docker: simplify HOST_ARCH definition
ARCH is always empty, so just define HOST_ARCH as the result of uname.
Acked-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: b1399b0c851f36b4cd0185321cb620bf4e52f30b
https://github.com/qemu/qemu/commit/b1399b0c851f36b4cd0185321cb620bf4e52f30b
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2023-05-26 (Fri, 26 May 2023)
Changed paths:
M tests/vm/Makefile.include
Log Message:
-----------
tests/vm: fix and simplify HOST_ARCH definition
ARCH is always empty, so just define HOST_ARCH as the result of uname.
The incorrect definition was not being used because the "ifeq" statement
is wrong; replace it with the same idiom based on $(realpath) that the
main Makefile uses.
With this change, vm-build-netbsd in a configured tree will not use
the PYTHONPATH hack.
Reported-by: John Snow <jsnow@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: eea2d141179e58222eb655f948a951561134b260
https://github.com/qemu/qemu/commit/eea2d141179e58222eb655f948a951561134b260
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2023-05-26 (Fri, 26 May 2023)
Changed paths:
M tests/Makefile.include
M tests/vm/Makefile.include
Log Message:
-----------
Makefile: remove $(TESTS_PYTHON)
It is now the same as $(PYTHON), since the latter always points at
pyvenv/bin/python3.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 5b507233e6ce8f7ccfc4431f934518e15102e63a
https://github.com/qemu/qemu/commit/5b507233e6ce8f7ccfc4431f934518e15102e63a
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2023-05-26 (Fri, 26 May 2023)
Changed paths:
M configure
Log Message:
-----------
configure: unset harmful environment variables
Apart from CLICOLOR_FORCE and GREP_OPTIONS, there are other variables
that are listed in the Autoconf manual. While Autoconf neutralizes them
very early, and assumes it does not (yet) run in a shell that has "unset",
QEMU assumes that the user invoked configure under a POSIX shell, and
therefore can simply use "unset" to clear them.
CDPATH is particularly nasty because it messes up "cd ... && pwd".
Reported-by: Juan Quintela <quintela@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: bac1bc848bb5ab7b020975d161a4043cabcbb8f9
https://github.com/qemu/qemu/commit/bac1bc848bb5ab7b020975d161a4043cabcbb8f9
Author: Fabiano Rosas <farosas@suse.de>
Date: 2023-05-26 (Fri, 26 May 2023)
Changed paths:
M meson.build
Log Message:
-----------
meson: Remove leftover comment
Commit d2e6f9272d ("fuzz: remove fork-fuzzing scaffolding") removed
the linker script and forgot to remove the comment.
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Message-Id: <20230525212044.30222-2-farosas@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: db01d85f168b19a48e5112cb02cda37014719c3e
https://github.com/qemu/qemu/commit/db01d85f168b19a48e5112cb02cda37014719c3e
Author: Fabiano Rosas <farosas@suse.de>
Date: 2023-05-26 (Fri, 26 May 2023)
Changed paths:
M tests/migration/meson.build
Log Message:
-----------
meson: Add static glib dependency for initrd-stress.img
We recently moved glib detection code to meson but this changes the
linker command line from -lglib-2.0 to using a path to libglib-2.0.so.
This does not work for static linking, which is used by stress.c:
$ make V=1 tests/migration/initrd-stress.img
cc -m64 -mcx16 -o tests/migration/stress ... -static -Wl,--start-group
/usr/lib64/libglib-2.0.so -Wl,--end-group
...
bin/ld: attempted static link of dynamic object `/usr/lib64/libglib-2.0.so'
Add a specific dependency for stress.c, which is linked statically.
The compiler command line is now:
cc -m64 -mcx16 -o tests/migration/stress ... -static -pthread
-Wl,--start-group -lm /usr/lib64/libpcre.a -lglib-2.0 -Wl,--end-group
Fixes: fc9a809e0d ("build: move glib detection and workarounds to meson")
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Message-Id: <20230525212044.30222-3-farosas@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 5590615276f217bc875b0fdc6c2351293f55df6c
https://github.com/qemu/qemu/commit/5590615276f217bc875b0fdc6c2351293f55df6c
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2023-05-26 (Fri, 26 May 2023)
Changed paths:
M subprojects/slirp.wrap
Log Message:
-----------
slirp: update wrap to latest master
It is recommended to use SSIZE_T for ssize_t on win32, but the commit
that is being used for slirp.wrap uses int. Update to include the fix
as well as the other bugfix commit "ip: Enforce strict aliasing".
Reported-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 0bfd14149b248e8097ea4da1f9d53beb5c5b0cca
https://github.com/qemu/qemu/commit/0bfd14149b248e8097ea4da1f9d53beb5c5b0cca
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2023-05-26 (Fri, 26 May 2023)
Changed paths:
M hw/virtio/virtio-qmp.c
Log Message:
-----------
virtio: qmp: fix memory leak
The VirtioInfoList is already allocated by QAPI_LIST_PREPEND and
need not be allocated by the caller.
Fixes Coverity CID 1508724.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 577bdbcf85d4c491da3271d99526b66c576d90e5
https://github.com/qemu/qemu/commit/577bdbcf85d4c491da3271d99526b66c576d90e5
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2023-05-26 (Fri, 26 May 2023)
Changed paths:
M meson.build
Log Message:
-----------
meson: simplify logic for -Dfdt
fdt_opt == 'disabled' is going to give an error if libfdt is required
by any target, so catch that immediately. For fdt_opt == 'enabled',
instead, do not check immediately whether the internal libfdt is present.
Instead do the check after ascertaining that libfdt is absent or too old.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: 58e48b2e721dcf70571d293e86c02eedbe3a0f39
https://github.com/qemu/qemu/commit/58e48b2e721dcf70571d293e86c02eedbe3a0f39
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2023-05-26 (Fri, 26 May 2023)
Changed paths:
M .gitmodules
M configure
R dtc
M meson.build
M scripts/archive-source.sh
A subprojects/dtc
Log Message:
-----------
meson: use subproject for internal libfdt
Recent dtc/libfdt can use either Make or meson as the build system.
By using a subproject, our own meson.build can remove the hard
coded list of source files.
This is also the first step towards managing downloads with .wrap
files instead of submodule.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: c53648abba167db47827840bbd4257ed7bc6133c
https://github.com/qemu/qemu/commit/c53648abba167db47827840bbd4257ed7bc6133c
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2023-05-26 (Fri, 26 May 2023)
Changed paths:
M .gitmodules
M configure
M scripts/archive-source.sh
A subprojects/keycodemapdb
R ui/keycodemapdb
M ui/meson.build
Log Message:
-----------
meson: use subproject for keycodemapdb
By using a subproject, our own meson.build can use variables from
the subproject instead of hard-coded paths. This is also the first step
towards managing downloads with .wrap files instead of submodule.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: b17bbf835c8998e93fd99b06164f1d63843fe8c9
https://github.com/qemu/qemu/commit/b17bbf835c8998e93fd99b06164f1d63843fe8c9
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: 2023-05-26 (Fri, 26 May 2023)
Changed paths:
M configure
M meson.build
Log Message:
-----------
configure: ignore --make
Setting the MAKE variable to a GNU Make executable does not really have
any effect: if a non-GNU Make is used, the QEMU Makefile will fail to
parse. Just remove everything related to --make and $make as dead code.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Commit: ac84b57b4d74606f7f83667a0606deef32b2049d
https://github.com/qemu/qemu/commit/ac84b57b4d74606f7f83667a0606deef32b2049d
Author: Richard Henderson <richard.henderson@linaro.org>
Date: 2023-05-26 (Fri, 26 May 2023)
Changed paths:
M .gitmodules
M configure
R dtc
M hw/virtio/virtio-qmp.c
M meson.build
M scripts/archive-source.sh
A subprojects/dtc
A subprojects/keycodemapdb
M subprojects/slirp.wrap
M tests/Makefile.include
M tests/docker/Makefile.include
M tests/migration/meson.build
M tests/vm/Makefile.include
R ui/keycodemapdb
M ui/meson.build
Log Message:
-----------
Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging
* build system fixes and cleanups
* use subproject() for the dtc and keycodemapdb submodules
* fix virtio memory leak
* update slirp.wrap to latest commit in the master branch
# -----BEGIN PGP SIGNATURE-----
#
# iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmRwi6cUHHBib256aW5p
# QHJlZGhhdC5jb20ACgkQv/vSX3jHroO3awf9GsLa0sip+lUsV2JgzZGm2mL7Fo9A
# kBbuehaT+5gI2PGY6Sp1RVdDnf/JS4HkU11TBBVYFpJdDwqerCNcprgOO3Y5Mung
# Ukg93FgdvORlbTyfnMXNUe8dDaoTe6kvN1kTm+zhzMCJDTSCgZRqWc4Fh5oNg+No
# pupeR7hjW6nEKSnYVhjP7LjSOteJfR9aeKT/bxRaQpmlegeGVC6RZ1naZtRHY6le
# Y8KeKoelgBkEGPk5MnmFhnrITwYrfV0g2uP4Jinr5GildC8E/ZSmxo5h1TUqkQFA
# /MKuIt6cRBitCHyYQLiXY+MZc6AkS3tsAhCo41Nknb4nylKeWgPHBIAWxA==
# =NRBc
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 26 May 2023 03:36:23 AM PDT
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [undefined]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [undefined]
# 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:
configure: ignore --make
meson: use subproject for keycodemapdb
meson: use subproject for internal libfdt
meson: simplify logic for -Dfdt
virtio: qmp: fix memory leak
slirp: update wrap to latest master
meson: Add static glib dependency for initrd-stress.img
meson: Remove leftover comment
configure: unset harmful environment variables
Makefile: remove $(TESTS_PYTHON)
tests/vm: fix and simplify HOST_ARCH definition
tests/docker: simplify HOST_ARCH definition
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Compare: https://github.com/qemu/qemu/compare/9c9fff18c45b...ac84b57b4d74