diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2025-06-07 15:08:54 -0400 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2025-06-07 15:08:55 -0400 |
| commit | bc98ffdc7577e55ab8373c579c28fe24d600c40f (patch) | |
| tree | 995d9953d9fb557ff6b1f5e16ccec3d32e73b426 /tests/docker | |
| parent | 96215036f47403438c7c7869b7cd419bd7a11f82 (diff) | |
| parent | 63070ce368e1a2d430b9022a9db46f1817628efc (diff) | |
| download | focaccia-qemu-bc98ffdc7577e55ab8373c579c28fe24d600c40f.tar.gz focaccia-qemu-bc98ffdc7577e55ab8373c579c28fe24d600c40f.zip | |
Merge tag 'pull-10.1-maintainer-may-2025-070625-1' of https://gitlab.com/stsquad/qemu into staging
maintainer updates for May (testing, plugins) - expose ~/.cache/qemu to container builds - disable debug info in CI - allow boot.S to handle target el mode selection - new arguments for ips plugin - cleanup assets in size_memop - fix include guard in gdbstub - introduce qGDBServerVersion gdbstub query - update gdb aarch64-core.xml to support bitfields # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAmhEXc4ACgkQ+9DbCVqe # KkT3vwf9GtMoVDBWqWHwdV6H3rblP0k3mkApY4pTkFFSL93qApDK1gAKoklymPHJ # 6agAWn/MmpqguB7yn7TnBEiJyW9CEq0DeWTz9ivPPh5vfm/2MMaXinVd4yH+GbTL # uTuJg4EeRcSj8q4N4h+gROSHkH3mVOe+JlyakRKZ/PZChqjY1WRC/Hm2QdHojxlS # xQBZe4Nip/mafm4yAlnyRVRbaSctmc3/xE/MomkVT+8JMdVt6yWE0HT/nIEFW6/6 # psHoiV4XfROIWj5qMAWHVLekDrsqxJx8uiGv9o3+zKdhDhRZw3Oa5EE5N/oE8KmM # 0s/9usRvtVD0kPh9YTfjEHWHkbPadA== # =X63M # -----END PGP SIGNATURE----- # gpg: Signature made Sat 07 Jun 2025 11:42:06 EDT # gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44 # gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [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: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44 * tag 'pull-10.1-maintainer-may-2025-070625-1' of https://gitlab.com/stsquad/qemu: gdbstub: update aarch64-core.xml gdbstub: Implement qGDBServerVersion packet gdbstub: assert earlier in handle_read_all_regs include/gdbstub: fix include guard in commands.h include/exec: fix assert in size_memop contrib/plugins: allow setting of instructions per quantum contrib/plugins: add a scaling factor to the ips arg tests/qtest: Avoid unaligned access in IGB test tests/tcg: make aarch64 boot.S handle different starting modes gitlab: disable debug info on CI builds tests/docker: expose $HOME/.cache/qemu as docker volume Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'tests/docker')
| -rw-r--r-- | tests/docker/Makefile.include | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index fa1cbb6726..3959d8a028 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -185,8 +185,10 @@ docker: docker-help: docker +# Where QEMU caches build artefacts +DOCKER_QEMU_CACHE_DIR := $$HOME/.cache/qemu # Use a global constant ccache directory to speed up repetitive builds -DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache +DOCKER_QEMU_CCACHE_DIR := DOCKER_QEMU_CACHE_DIR/docker-ccache # This rule if for directly running against an arbitrary docker target. # It is called by the expanded docker targets (e.g. make @@ -195,7 +197,7 @@ DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache # For example: make docker-run TEST="test-quick" IMAGE="debian:arm64" EXECUTABLE=./aarch64-linux-user/qemu-aarch64 # docker-run: docker-qemu-src - @mkdir -p "$(DOCKER_CCACHE_DIR)" + @mkdir -p "$(DOCKER_QEMU_CCACHE_DIR)" @if test -z "$(IMAGE)" || test -z "$(TEST)"; \ then echo "Invalid target $(IMAGE)/$(TEST)"; exit 1; \ fi @@ -222,8 +224,8 @@ docker-run: docker-qemu-src -e V=$V -e J=$J -e DEBUG=$(DEBUG) \ -e SHOW_ENV=$(SHOW_ENV) \ $(if $(NOUSER),, \ - -e CCACHE_DIR=/var/tmp/ccache \ - -v $(DOCKER_CCACHE_DIR):/var/tmp/ccache:z \ + -v $(DOCKER_QEMU_CACHE_DIR):$(DOCKER_QEMU_CACHE_DIR) \ + -e CCACHE_DIR=$(DOCKER_QEMU_CCACHE_DIR) \ ) \ -v $$(readlink -e $(DOCKER_SRC_COPY)):/var/tmp/qemu:z$(COMMA)ro \ $(IMAGE) \ |