tests/vm: don't build using TCG by default

While it is useful to run these images using TCG their performance
will not be anything like the native guests. Don't do it by default.

Fixes: https://gitlab.com/qemu-project/qemu/-/issues/393
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20211115142915.3797652-4-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2021-11-15 14:29:12 +00:00
parent 81c9b06ea0
commit ebd654aabc

View file

@ -2,16 +2,24 @@
.PHONY: vm-build-all vm-clean-all .PHONY: vm-build-all vm-clean-all
HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m))
EFI_AARCH64 = $(wildcard $(BUILD_DIR)/pc-bios/edk2-aarch64-code.fd) EFI_AARCH64 = $(wildcard $(BUILD_DIR)/pc-bios/edk2-aarch64-code.fd)
IMAGES := freebsd netbsd openbsd centos fedora haiku.x86_64 X86_IMAGES := freebsd netbsd openbsd centos fedora haiku.x86_64
ifneq ($(GENISOIMAGE),) ifneq ($(GENISOIMAGE),)
IMAGES += ubuntu.i386 centos X86_IMAGES += ubuntu.i386 centos
ifneq ($(EFI_AARCH64),) ifneq ($(EFI_AARCH64),)
IMAGES += ubuntu.aarch64 centos.aarch64 ARM64_IMAGES += ubuntu.aarch64 centos.aarch64
endif endif
endif endif
ifeq ($(HOST_ARCH),x86_64)
IMAGES=$(X86_IMAGES) $(if $(USE_TCG),$(ARM64_IMAGES))
else ifeq ($(HOST_ARCH),aarch64)
IMAGES=$(ARM64_IMAGES) $(if $(USE_TCG),$(X86_IMAGES))
endif
IMAGES_DIR := $(HOME)/.cache/qemu-vm/images IMAGES_DIR := $(HOME)/.cache/qemu-vm/images
IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES)) IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES))
@ -43,7 +51,7 @@ else
endif endif
@echo " vm-build-haiku.x86_64 - Build QEMU in Haiku VM" @echo " vm-build-haiku.x86_64 - Build QEMU in Haiku VM"
@echo "" @echo ""
@echo " vm-build-all - Build QEMU in all VMs" @echo " vm-build-all - Build QEMU in: $(IMAGES)"
@echo " vm-clean-all - Clean up VM images" @echo " vm-clean-all - Clean up VM images"
@echo @echo
@echo "For trouble-shooting:" @echo "For trouble-shooting:"
@ -56,6 +64,7 @@ endif
@echo ' EXTRA_CONFIGURE_OPTS="..." - Pass to configure step' @echo ' EXTRA_CONFIGURE_OPTS="..." - Pass to configure step'
@echo " J=[0..9]* - Override the -jN parameter for make commands" @echo " J=[0..9]* - Override the -jN parameter for make commands"
@echo " LOG_CONSOLE=1 - Log console to file in: ~/.cache/qemu-vm " @echo " LOG_CONSOLE=1 - Log console to file in: ~/.cache/qemu-vm "
@echo " USE_TCG=1 - Use TCG for cross-arch images"
@echo " QEMU=/path/to/qemu - Change path to QEMU binary" @echo " QEMU=/path/to/qemu - Change path to QEMU binary"
ifeq ($(HAVE_PYTHON_YAML),yes) ifeq ($(HAVE_PYTHON_YAML),yes)
@echo " QEMU_CONFIG=/path/conf.yml - Change path to VM configuration .yml file." @echo " QEMU_CONFIG=/path/conf.yml - Change path to VM configuration .yml file."