* SEV refactoring (David) * Hyper-V initial support (Jon) * i386 TCG fixes (x87 and SSE, Joseph) * vmport cleanup and improvements (Philippe, Liran) * Use-after-free with vCPU hot-unplug (Nengyuan) * run-coverity-scan improvements (myself) * Record/replay fixes (Pavel) * -machine kernel_irqchip=split improvements for INTx (Peter) * Code cleanups (Philippe) * Crash and security fixes (PJP) * HVF cleanups (Roman) -----BEGIN PGP SIGNATURE----- iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAl7jpdAUHHBib256aW5p QHJlZGhhdC5jb20ACgkQv/vSX3jHroMfjwf/X7+0euuE9dwKFKDDMmIi+4lRWnq7 gSOyE1BYSfDIUXRIukf64konXe0VpiotNYlyEaYnnQjkMdGm5E9iXKF+LgEwXj/t NSGkfj5J3VeWRG4JJp642CSN/aZWO8uzkenld3myCnu6TicuN351tDJchiFwAk9f wsXtgLKd67zE8MLVt8AP0rNTbzMHttPXnPaOXDCuwjMHNvMEKnC93UeOeM0M4H5s 3Dl2HvsNWZ2SzUG9mAbWp0bWWuoIb+Ep9//87HWANvb7Z8jratRws18i6tYt1sPx 8zOnUS87sVnh1CQlXBDd9fEcqBUVgR9pAlqaaYavNhFp5eC31euvpDU8Iw== =F4sU -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging * Miscellaneous fixes and feature enablement (many) * SEV refactoring (David) * Hyper-V initial support (Jon) * i386 TCG fixes (x87 and SSE, Joseph) * vmport cleanup and improvements (Philippe, Liran) * Use-after-free with vCPU hot-unplug (Nengyuan) * run-coverity-scan improvements (myself) * Record/replay fixes (Pavel) * -machine kernel_irqchip=split improvements for INTx (Peter) * Code cleanups (Philippe) * Crash and security fixes (PJP) * HVF cleanups (Roman) # gpg: Signature made Fri 12 Jun 2020 16:57:04 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/tags/for-upstream: (116 commits) target/i386: Remove obsolete TODO file stubs: move Xen stubs to accel/ replay: fix replay shutdown for console mode exec/cpu-common: Move MUSB specific typedefs to 'hw/usb/hcd-musb.h' hw/usb: Move device-specific declarations to new 'hcd-musb.h' header exec/memory: Remove unused MemoryRegionMmio type checkpatch: reversed logic with acpi test checks target/i386: sev: Unify SEVState and SevGuestState target/i386: sev: Remove redundant handle field target/i386: sev: Remove redundant policy field target/i386: sev: Remove redundant cbitpos and reduced_phys_bits fields target/i386: sev: Partial cleanup to sev_state global target/i386: sev: Embed SEVState in SevGuestState target/i386: sev: Rename QSevGuestInfo target/i386: sev: Move local structure definitions into .c file target/i386: sev: Remove unused QSevGuestInfoClass xen: fix build without pci passthrough i386: hvf: Drop HVFX86EmulatorState i386: hvf: Move mmio_buf into CPUX86State i386: hvf: Move lazy_flags into CPUX86State ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org> # Conflicts: # hw/i386/acpi-build.c
265 lines
10 KiB
Makefile
265 lines
10 KiB
Makefile
# Makefile for Docker tests
|
|
|
|
.PHONY: docker docker-test docker-clean docker-image docker-qemu-src
|
|
|
|
HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m))
|
|
|
|
DOCKER_SUFFIX := .docker
|
|
DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
|
|
# we don't run tests on intermediate images (used as base by another image)
|
|
DOCKER_PARTIAL_IMAGES := debian9 debian10 debian11
|
|
DOCKER_PARTIAL_IMAGES += debian9-mxe debian-bootstrap
|
|
DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
|
|
DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
|
|
# Use a global constant ccache directory to speed up repetitive builds
|
|
DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
|
|
|
|
DOCKER_TESTS := $(notdir $(shell \
|
|
find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f))
|
|
|
|
DOCKER_TOOLS := travis
|
|
|
|
ENGINE := auto
|
|
|
|
DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE)
|
|
|
|
TESTS ?= %
|
|
IMAGES ?= %
|
|
|
|
CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$)
|
|
DOCKER_SRC_COPY := $(BUILD_DIR)/docker-src.$(CUR_TIME)
|
|
|
|
.DELETE_ON_ERROR: $(DOCKER_SRC_COPY)
|
|
$(DOCKER_SRC_COPY):
|
|
@mkdir $@
|
|
$(if $(SRC_ARCHIVE), \
|
|
$(call quiet-command, cp "$(SRC_ARCHIVE)" $@/qemu.tar, \
|
|
"CP", "$@/qemu.tar"), \
|
|
$(call quiet-command, cd $(SRC_PATH) && scripts/archive-source.sh $@/qemu.tar, \
|
|
"GEN", "$@/qemu.tar"))
|
|
$(call quiet-command, cp $(SRC_PATH)/tests/docker/run $@/run, \
|
|
"COPY","RUNNER")
|
|
|
|
docker-qemu-src: $(DOCKER_SRC_COPY)
|
|
|
|
docker-image: ${DOCKER_TARGETS}
|
|
|
|
# General rule for building docker images. If we are a sub-make
|
|
# invoked with SKIP_DOCKER_BUILD we still check the image is up to date
|
|
# though
|
|
ifdef SKIP_DOCKER_BUILD
|
|
docker-image-%: $(DOCKER_FILES_DIR)/%.docker
|
|
$(call quiet-command, \
|
|
$(DOCKER_SCRIPT) check --quiet qemu:$* $<, \
|
|
"CHECK", "$*")
|
|
else
|
|
docker-image-%: $(DOCKER_FILES_DIR)/%.docker
|
|
$(call quiet-command,\
|
|
$(DOCKER_SCRIPT) build -t qemu:$* -f $< \
|
|
$(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \
|
|
$(if $(NOUSER),,--add-current-user) \
|
|
$(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\
|
|
$(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\
|
|
"BUILD","$*")
|
|
|
|
# Special rule for debootstraped binfmt linux-user images
|
|
docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
|
|
$(if $(EXECUTABLE),,\
|
|
$(error EXECUTABLE not set, debootstrap of debian-$* would fail))
|
|
$(if $(DEB_ARCH),,\
|
|
$(error DEB_ARCH not set, debootstrap of debian-$* would fail))
|
|
$(if $(DEB_TYPE),,\
|
|
$(error DEB_TYPE not set, debootstrap of debian-$* would fail))
|
|
$(if $(wildcard $(EXECUTABLE)), \
|
|
$(call quiet-command, \
|
|
DEB_ARCH=$(DEB_ARCH) \
|
|
DEB_TYPE=$(DEB_TYPE) \
|
|
$(if $(DEB_URL),DEB_URL=$(DEB_URL),) \
|
|
$(DOCKER_SCRIPT) build qemu:debian-$* $< \
|
|
$(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \
|
|
$(if $(NOUSER),,--add-current-user) \
|
|
$(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES)) \
|
|
$(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)), \
|
|
"BUILD","binfmt debian-$* (debootstrapped)"), \
|
|
$(call quiet-command, \
|
|
$(DOCKER_SCRIPT) check --quiet qemu:debian-$* $< || \
|
|
{ echo "You will need to build $(EXECUTABLE)"; exit 1;},\
|
|
"CHECK", "debian-$* exists"))
|
|
|
|
endif
|
|
|
|
# Enforce dependencies for composite images
|
|
docker-image-debian9-mxe: docker-image-debian9
|
|
ifeq ($(HOST_ARCH),x86_64)
|
|
docker-image-debian-amd64: docker-image-debian10
|
|
DOCKER_PARTIAL_IMAGES += debian-amd64-cross
|
|
else
|
|
docker-image-debian-amd64-cross: docker-image-debian10
|
|
DOCKER_PARTIAL_IMAGES += debian-amd64
|
|
endif
|
|
docker-image-debian-win32-cross: docker-image-debian9-mxe
|
|
docker-image-debian-win64-cross: docker-image-debian9-mxe
|
|
|
|
# For non-x86 hosts not all cross-compilers have been packaged
|
|
ifneq ($(HOST_ARCH),x86_64)
|
|
DOCKER_PARTIAL_IMAGES += debian-mips-cross debian-mipsel-cross debian-mips64el-cross
|
|
DOCKER_PARTIAL_IMAGES += debian-ppc64el-cross
|
|
DOCKER_PARTIAL_IMAGES += debian-s390x-cross
|
|
DOCKER_PARTIAL_IMAGES += debian-win32-cross debian-win64-cross
|
|
DOCKER_PARTIAL_IMAGES += fedora travis
|
|
endif
|
|
|
|
docker-image-debian-alpha-cross: docker-image-debian10
|
|
docker-image-debian-arm64-cross: docker-image-debian10
|
|
docker-image-debian-armel-cross: docker-image-debian10
|
|
docker-image-debian-armhf-cross: docker-image-debian10
|
|
docker-image-debian-hppa-cross: docker-image-debian10
|
|
docker-image-debian-m68k-cross: docker-image-debian10
|
|
docker-image-debian-mips-cross: docker-image-debian10
|
|
docker-image-debian-mips64-cross: docker-image-debian10
|
|
docker-image-debian-mips64el-cross: docker-image-debian10
|
|
docker-image-debian-mipsel-cross: docker-image-debian10
|
|
docker-image-debian-powerpc-cross: docker-image-debian10
|
|
docker-image-debian-ppc64-cross: docker-image-debian10
|
|
docker-image-debian-ppc64el-cross: docker-image-debian10
|
|
docker-image-debian-riscv64-cross: docker-image-debian10
|
|
docker-image-debian-s390x-cross: docker-image-debian10
|
|
docker-image-debian-sh4-cross: docker-image-debian10
|
|
docker-image-debian-sparc64-cross: docker-image-debian10
|
|
|
|
docker-image-travis: NOUSER=1
|
|
|
|
# Specialist build images, sometimes very limited tools
|
|
docker-image-debian-tricore-cross: docker-image-debian9
|
|
docker-image-debian-arm64-test-cross: docker-image-debian11
|
|
|
|
# These images may be good enough for building tests but not for test builds
|
|
DOCKER_PARTIAL_IMAGES += debian-alpha-cross
|
|
DOCKER_PARTIAL_IMAGES += debian-arm64-test-cross
|
|
DOCKER_PARTIAL_IMAGES += debian-hppa-cross
|
|
DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross
|
|
DOCKER_PARTIAL_IMAGES += debian-powerpc-cross debian-ppc64-cross
|
|
DOCKER_PARTIAL_IMAGES += debian-riscv64-cross
|
|
DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross
|
|
DOCKER_PARTIAL_IMAGES += debian-tricore-cross
|
|
DOCKER_PARTIAL_IMAGES += debian-xtensa-cross
|
|
DOCKER_PARTIAL_IMAGES += fedora-i386-cross fedora-cris-cross
|
|
|
|
# Rules for building linux-user powered images
|
|
#
|
|
# These are slower than using native cross compiler setups but can
|
|
# work around issues with poorly working multi-arch systems and broken
|
|
# packages.
|
|
|
|
# Expand all the pre-requistes for each docker image and test combination
|
|
$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \
|
|
$(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \
|
|
$(eval .PHONY: docker-$t@$i) \
|
|
$(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \
|
|
) \
|
|
$(foreach t,$(DOCKER_TESTS), \
|
|
$(eval docker-all-tests: docker-$t@$i) \
|
|
$(eval docker-$t: docker-$t@$i) \
|
|
) \
|
|
)
|
|
|
|
docker:
|
|
@echo 'Build QEMU and run tests inside Docker or Podman containers'
|
|
@echo
|
|
@echo 'Available targets:'
|
|
@echo
|
|
@echo ' docker: Print this help.'
|
|
@echo ' docker-all-tests: Run all image/test combinations.'
|
|
@echo ' docker-TEST: Run "TEST" on all image combinations.'
|
|
@echo ' docker-clean: Kill and remove residual docker testing containers.'
|
|
@echo ' docker-TEST@IMAGE: Run "TEST" in container "IMAGE".'
|
|
@echo ' Note: "TEST" is one of the listed test name,'
|
|
@echo ' or a script name under $$QEMU_SRC/tests/docker/;'
|
|
@echo ' "IMAGE" is one of the listed container name.'
|
|
@echo ' docker-image: Build all images.'
|
|
@echo ' docker-image-IMAGE: Build image "IMAGE".'
|
|
@echo ' docker-run: For manually running a "TEST" with "IMAGE".'
|
|
@echo
|
|
@echo 'Available container images:'
|
|
@echo ' $(DOCKER_IMAGES)'
|
|
ifneq ($(DOCKER_USER_IMAGES),)
|
|
@echo
|
|
@echo 'Available linux-user images (docker-binfmt-image-debian-%):'
|
|
@echo ' $(DOCKER_USER_IMAGES)'
|
|
endif
|
|
@echo
|
|
@echo 'Available tests:'
|
|
@echo ' $(DOCKER_TESTS)'
|
|
@echo
|
|
@echo 'Available tools:'
|
|
@echo ' $(DOCKER_TOOLS)'
|
|
@echo
|
|
@echo 'Special variables:'
|
|
@echo ' TARGET_LIST=a,b,c Override target list in builds.'
|
|
@echo ' EXTRA_CONFIGURE_OPTS="..."'
|
|
@echo ' Extra configure options.'
|
|
@echo ' IMAGES="a b c ..": Filters which images to build or run.'
|
|
@echo ' TESTS="x y z .." Filters which tests to run (for docker-test).'
|
|
@echo ' J=[0..9]* Overrides the -jN parameter for make commands'
|
|
@echo ' (default is 1)'
|
|
@echo ' DEBUG=1 Stop and drop to shell in the created container'
|
|
@echo ' before running the command.'
|
|
@echo ' NETWORK=1 Enable virtual network interface with default backend.'
|
|
@echo ' NETWORK=$$BACKEND Enable virtual network interface with $$BACKEND.'
|
|
@echo ' NOUSER Define to disable adding current user to containers passwd.'
|
|
@echo ' NOCACHE=1 Ignore cache when build images.'
|
|
@echo ' EXECUTABLE=<path> Include executable in image.'
|
|
@echo ' EXTRA_FILES="<path> [... <path>]"'
|
|
@echo ' Include extra files in image.'
|
|
@echo ' ENGINE=auto/docker/podman'
|
|
@echo ' Specify which container engine to run.'
|
|
|
|
# This rule if for directly running against an arbitrary docker target.
|
|
# It is called by the expanded docker targets (e.g. make
|
|
# docker-test-foo@bar) which will do additional verification.
|
|
#
|
|
# 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)"
|
|
@if test -z "$(IMAGE)" || test -z "$(TEST)"; \
|
|
then echo "Invalid target $(IMAGE)/$(TEST)"; exit 1; \
|
|
fi
|
|
$(if $(EXECUTABLE), \
|
|
$(call quiet-command, \
|
|
$(DOCKER_SCRIPT) update \
|
|
$(IMAGE) $(EXECUTABLE), \
|
|
" COPYING $(EXECUTABLE) to $(IMAGE)"))
|
|
$(call quiet-command, \
|
|
$(DOCKER_SCRIPT) run \
|
|
$(if $(NOUSER),,--run-as-current-user) \
|
|
--security-opt seccomp=unconfined \
|
|
$(if $V,,--rm) \
|
|
$(if $(DEBUG),-ti,) \
|
|
$(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=$(NETWORK)),--net=none) \
|
|
-e TARGET_LIST=$(subst $(SPACE),$(COMMA),$(TARGET_LIST)) \
|
|
-e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \
|
|
-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 $$(readlink -e $(DOCKER_SRC_COPY)):/var/tmp/qemu:z$(COMMA)ro \
|
|
$(IMAGE) \
|
|
/var/tmp/qemu/run \
|
|
$(TEST), " RUN $(TEST) in ${IMAGE}")
|
|
$(call quiet-command, rm -r $(DOCKER_SRC_COPY), \
|
|
" CLEANUP $(DOCKER_SRC_COPY)")
|
|
|
|
# Run targets:
|
|
#
|
|
# Of the form docker-TEST-FOO@IMAGE-BAR which will then be expanded into a call to "make docker-run"
|
|
docker-run-%: CMD = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\1/')
|
|
docker-run-%: IMAGE = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\2/')
|
|
docker-run-%:
|
|
@$(MAKE) docker-run TEST=$(CMD) IMAGE=qemu:$(IMAGE)
|
|
|
|
docker-clean:
|
|
$(call quiet-command, $(DOCKER_SCRIPT) clean)
|