From patchwork Thu Jul 5 16:03:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 141193 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2130348ljj; Thu, 5 Jul 2018 09:16:50 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf2sD7OTuTLOrE09UBOwXx6iSIJVjl6CVQMQvHnxMVBmewvQhnLftDf7DbA5T8J/TiqWXA0 X-Received: by 2002:a37:404c:: with SMTP id n73-v6mr5544082qka.250.1530807410084; Thu, 05 Jul 2018 09:16:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530807410; cv=none; d=google.com; s=arc-20160816; b=hRc5gufYj8zLGk2qAJpyTqr4LE3FvNrE6KZce/Cq70Mmfhzj/cVSDGYN7rv3turlWw RU4jFz3BvJd3S+773rzHgTn0oN+mhu78qpHn72MGU3k5O4Da7CorpLH9PynW3SY99Dz4 i6TnUsITSK9vmVmBgWo9nv6GKJ73u/6r+QVNUozUygnVLPZQ/1bhpfy0t/jyZ67McWhj 23qj7pSGGJmKcVLpEofj58d+Y2hPgbJRMmu/fyCTNpPy4E1wZ+M+MLILhUE9lgqFYda2 uq1medtBebC7Q68QweQ6LcGnzoTdGDzE4BOlHXpIzomqbdUHJWSp7s3SrFJbDcidPY4q CWmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=plFuftdP6AYiHiVrfdUCTmjERHyMul0/JUC9gR2qEnA=; b=ISUZRv3HWSePGBz+oNMbjFzXQUrh7gjJU/o92D04KghacMSL0iyYdOrNFJn7p0LEg/ txuU45SKMaE2jety3SqLZsbVe0s1NhDZ/gg6nfCePfQUKrTtXVKgD/jCcIvskFCIhDEu 734xpy/UPXZlc0aDetsNTmstTCvbXVILrGq4Jz+7+R8rDSPtlAQf0gESSFS/pBGxMXBT sZgzSKxLrGPEPfnWFfm50FV35hmWPoXE8ZOuVtf9MNqrN024xAK6umo+Of16V0rBoGae /q/AD9qFqqeJ5ZAGOzoPSkNYCrEOnOUbxGxHty3CBzL/eJtPqV5WNXn8UCZM4Oy7kuyQ SwZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=R466C+3y; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b4-v6si5973313qto.332.2018.07.05.09.16.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 05 Jul 2018 09:16:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=R466C+3y; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53578 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6w5-0001jj-HH for patch@linaro.org; Thu, 05 Jul 2018 12:16:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb6jH-0008KP-8M for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb6jE-0007vz-O8 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:35 -0400 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:38656) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fb6jE-0007vL-F7 for qemu-devel@nongnu.org; Thu, 05 Jul 2018 12:03:32 -0400 Received: by mail-wm0-x234.google.com with SMTP id 69-v6so11741927wmf.3 for ; Thu, 05 Jul 2018 09:03:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=plFuftdP6AYiHiVrfdUCTmjERHyMul0/JUC9gR2qEnA=; b=R466C+3ytMqdY2pFpOp6rtOeE6sgBy4bcsk12lZ1ftbRi74/BUthOJauahr/4Dtuuc DcHdzzf5YWcTWdyOxlT3ol8C9HCB9/n4U3xC14ox8SAv4DyyagFFexq4akdlvlKwzDXX R9n81SUojkI8vZEVV0vu3qR56LBSF5iBvoumI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=plFuftdP6AYiHiVrfdUCTmjERHyMul0/JUC9gR2qEnA=; b=Y6aaDFbPCaM6jHZIZGOOEYTEWkRl/FEoaFEjreFGR03pkP/qcprbgpj8FTRa7w8enL NUDrI37iN/VtTx/myIne3hfIoRDJSxWvCzVdD+JjTg0bLg6Y6AMJ9OAwWgDquxJgaQrb YlzTlLmDRw8E+kdigJZysEkBDr+GFHWgEgl4q9pFEtGsKnp4tXZO7WXQ3G0uI5sod2Pi wJeZKfj1WJhudCLaTpvkLHAYtmc9tM8n5nudMvSG/Bo4fp/qmvixQywYjYwRl0xLo9Yx 4As6XaVjC5JynDSnpLqceflCL7XbGYMgx0BmdiraEvmwkAV7ytKdX5TqFn4kq7+ijb51 VWxA== X-Gm-Message-State: APt69E0+aDLP+I1TqbBjf7fFZtNjVKgm4Av9KC9aLUi0H1HHw7KfniWS 6cDhXt8a8Sv0BgddwHdu/AV2og== X-Received: by 2002:a1c:ae8d:: with SMTP id x135-v6mr4361396wme.20.1530806611225; Thu, 05 Jul 2018 09:03:31 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y129-v6sm7364561wmy.4.2018.07.05.09.03.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Jul 2018 09:03:29 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6DA6A3E0229; Thu, 5 Jul 2018 17:03:29 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 5 Jul 2018 17:03:10 +0100 Message-Id: <20180705160329.30386-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180705160329.30386-1-alex.bennee@linaro.org> References: <20180705160329.30386-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::234 Subject: [Qemu-devel] [PULL v3 01/20] Revert "Makefile: Rename TARGET_DIRS to TARGET_LIST" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This reverts commit 208ecb3e1acc8d55dab49fdf721a86d513691688. This was causing problems by making DEF_TARGET_LIST pointless and having to jump through hoops to build on mingw with a dully enabled config. This includes a change to fix the per-guest TCG test probe which was added after 208ecb3 and used TARGET_LIST. Signed-off-by: Alex Bennée Cc: Paolo Bonzini -- 2.17.1 diff --git a/Makefile b/Makefile index 7ed9cc4a21..39fd4c0546 100644 --- a/Makefile +++ b/Makefile @@ -60,8 +60,8 @@ seems to have been used for an in-tree build. You can fix this by running \ endif endif -CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_LIST)),y) -CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_LIST)),y) +CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y) +CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y) CONFIG_XEN := $(CONFIG_XEN_BACKEND) CONFIG_ALL=y -include config-all-devices.mak @@ -365,8 +365,8 @@ DOCS= endif SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR) -SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_LIST)) -SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_LIST)) +SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS)) +SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS)) ifeq ($(SUBDIR_DEVICES_MAK),) config-all-devices.mak: @@ -469,7 +469,7 @@ config-host.h-timestamp: config-host.mak qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@") -SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_LIST)) +SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) $(SOFTMMU_SUBDIR_RULES): $(block-obj-y) @@ -513,7 +513,7 @@ ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) romsubdir-%: $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V="$(V)" TARGET_DIR="$*/" CFLAGS="$(filter -O% -g%,$(CFLAGS))",) -ALL_SUBDIRS=$(TARGET_LIST) $(patsubst %,pc-bios/%, $(ROMS)) +ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS)) recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) @@ -770,7 +770,7 @@ distclean: clean rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html rm -f docs/qemu-block-drivers.7 - for d in $(TARGET_LIST); do \ + for d in $(TARGET_DIRS); do \ rm -rf $$d || exit 1 ; \ done rm -Rf .sdk @@ -871,7 +871,7 @@ endif $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \ done $(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all" - for d in $(TARGET_LIST); do \ + for d in $(TARGET_DIRS); do \ $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \ done @@ -1066,9 +1066,9 @@ endif @echo ' ctags/TAGS - Generate tags file for editors' @echo ' cscope - Generate cscope index' @echo '' - @$(if $(TARGET_LIST), \ + @$(if $(TARGET_DIRS), \ echo 'Architecture specific targets:'; \ - $(foreach t, $(TARGET_LIST), \ + $(foreach t, $(TARGET_DIRS), \ printf " %-30s - Build for %s\\n" $(patsubst %,subdir-%,$(t)) $(t);) \ echo '') @echo 'Cleaning targets:' diff --git a/configure b/configure index b99ebdde24..2a7796ea80 100755 --- a/configure +++ b/configure @@ -6212,7 +6212,7 @@ qemu_version=$(head $source_path/VERSION) echo "VERSION=$qemu_version" >>$config_host_mak echo "PKGVERSION=$pkgversion" >>$config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak -echo "TARGET_LIST=$target_list" >> $config_host_mak +echo "TARGET_DIRS=$target_list" >> $config_host_mak if [ "$docs" = "yes" ] ; then echo "BUILD_DOCS=yes" >> $config_host_mak fi diff --git a/scripts/create_config b/scripts/create_config index 58948a67a4..d727e5e36e 100755 --- a/scripts/create_config +++ b/scripts/create_config @@ -107,7 +107,7 @@ case $line in target_name=${line#*=} echo "#define TARGET_NAME \"$target_name\"" ;; - TARGET_LIST=*) + TARGET_DIRS=*) # do nothing ;; TARGET_*=y) # configuration diff --git a/tests/Makefile.include b/tests/Makefile.include index 1affc49ca3..0c0f9509f5 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -874,7 +874,7 @@ endif # QTest rules -TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_LIST))) +TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) ifeq ($(CONFIG_POSIX),y) QTEST_TARGETS = $(TARGETS) check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y)) @@ -938,14 +938,14 @@ check-report.html: check-report.xml # Per guest TCG tests -LINUX_USER_TARGETS=$(filter %-linux-user,$(TARGET_LIST)) +LINUX_USER_TARGETS=$(filter %-linux-user,$(TARGET_DIRS)) BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(LINUX_USER_TARGETS)) CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(LINUX_USER_TARGETS)) RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(LINUX_USER_TARGETS)) ifeq ($(HAVE_USER_DOCKER),y) # Probe for the Docker Builds needed for each build -$(foreach PROBE_TARGET,$(TARGET_LIST), \ +$(foreach PROBE_TARGET,$(TARGET_DIRS), \ $(eval -include $(SRC_PATH)/tests/tcg/Makefile.probe) \ $(if $(DOCKER_PREREQ), \ $(eval build-tcg-tests-$(PROBE_TARGET): $(DOCKER_PREREQ))))