From patchwork Thu May 17 17:46:36 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: 136167 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp239609lji; Thu, 17 May 2018 10:51:17 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqv3SOlTSTksK2NLrwQzB48L+jjZgfFOm10v2a/JIS/hGtj4CQu1Whzs9NxAbIOAO7Zqdti X-Received: by 2002:ac8:2ce7:: with SMTP id 36-v6mr6277771qtx.375.1526579477665; Thu, 17 May 2018 10:51:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526579477; cv=none; d=google.com; s=arc-20160816; b=MeCCVrlMCCw4UCL1XrBieFUHSBaGmA6S0cdlF0NLgk0Tj0xY5LP6RkGuhU77zNzDq0 566Vhik22HSkc0Vs2vsQZvDQ1vmL47Tvp7RsCQ+rwpWqahWr3bT/zrfEZuf+ALPg2/Lv 7Ow4NgXWnTWzDnjfFV+cK93zajkZVLGb0DQK6fkH77MInhybGpvha+iG874xjReWqWok HN6TKfNpslEikXptBR/XI856VVMps1CrswHUDeURjINEzZRyHt7m/fZtW+UqvnCRTHYg N7QfvVFhJ+f2i15f7SuUZ+fifydcRWpmMH01bv8oAGtrL0HzWTTvm7AcJUmY0FUgfJ1s xRUA== 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=3QSuaK2iW4YrVO82JaVl/s8biSKlYx/drUF70h7nBdM=; b=ndVAqIyTBn60Y/bSrBn7VScwNIgOxPNv9t0ckwnGPtMEFBt03vIqjTwCCbopQd9dl3 7cUf2NLn/oPn1ikoAyaR0bJwe+hS2FFIM2wGa4mW1h09XUt+tVtl+XfCr5PBxSpEh2ZF OKsiAXjUazJMs7t0s4OfD+0XLs81NNy7YbDpqaW+aKjjUWSGKoEFBYDBO45W2riJZv45 EJR08wryGjQwyj1TQeeVAJeOIcKWrqTuaVBFjUPMMA75WgZzDqIENayNmsS8xjlNk5wz lI+PxJQUC2VsT38qaUgjjVni0CiHo+ieKSP0W+99kUrf98YOnppLXlarJSd/Ai9Cy+l+ YLIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=P1vK6HL7; 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 n39-v6si2173215qtn.62.2018.05.17.10.51.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 17 May 2018 10:51:17 -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=P1vK6HL7; 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]:38445 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJN3d-0000j9-4P for patch@linaro.org; Thu, 17 May 2018 13:51:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJN02-0006Hv-DH for qemu-devel@nongnu.org; Thu, 17 May 2018 13:47:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJN00-0003Y1-6o for qemu-devel@nongnu.org; Thu, 17 May 2018 13:47:34 -0400 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:39641) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJMzz-0003Xe-Tu for qemu-devel@nongnu.org; Thu, 17 May 2018 13:47:32 -0400 Received: by mail-wm0-x232.google.com with SMTP id f8-v6so10621961wmc.4 for ; Thu, 17 May 2018 10:47:31 -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=3QSuaK2iW4YrVO82JaVl/s8biSKlYx/drUF70h7nBdM=; b=P1vK6HL72i4JOLvj+bGcu2MY4htYQ62IipcBSB2q8j9ImLv0A32h22zKfj/n/dXGmF jdpqhKANLuKwvdGY6hHyccGO2i/jl6JixK257OQKDnEPWbOKTS7ZnydiwA9kjGIBjzob xP9SdDi9a39Y3vgsI5F2vvuZfzy1m+LCWAdDw= 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=3QSuaK2iW4YrVO82JaVl/s8biSKlYx/drUF70h7nBdM=; b=c4ZprNbQMMAIj3F9pbLF1wdlT4Fna8yq6+I3g9f9+FeqyUFW+NE+mo8mWrbPZ6V2sc iWmPAzt7+hCAZ/9NslSY+FcPZclbA2t3EsjNuCwK2XfAVd1qQ+Ka2QcEuducURE9DWfe 0baWcPH4+uDnxdq+hY87+serGtcw3tBM9kiUVAofDV4df99oTvYlrLi6/nMtzdckxqlA UyNz/odvud4pAxTtMdfsPKY2ArZ9K/maR6OYqig2ZqZBadAYNmx0QNVHVHtGl0w0XQed zsJC7PA5gPLsgofZUVOo+qiFCSEIt+jm0aDM6sH3DMaqk0HSbkBmisUHXjdN+lOPymEZ tIVA== X-Gm-Message-State: ALKqPwfq/bUnmHfZjDx39wl4wPqbzau4V3YTsURmFGHOEnbPeSrlraO6 MtvdJvKyzxrKk4Pk9oaZvk1CFQ== X-Received: by 2002:a1c:b4e:: with SMTP id 75-v6mr2364356wml.32.1526579250685; Thu, 17 May 2018 10:47:30 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 140-v6sm7630026wmi.9.2018.05.17.10.47.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 May 2018 10:47:25 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 545B13E0DA1; Thu, 17 May 2018 18:47:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Thu, 17 May 2018 18:46:36 +0100 Message-Id: <20180517174718.10107-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180517174718.10107-1-alex.bennee@linaro.org> References: <20180517174718.10107-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::232 Subject: [Qemu-devel] [PATCH v4 07/49] 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: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Fam Zheng To be more accurate on its purpose and make code that looks for a certain target out of this variable more readable. Signed-off-by: Fam Zheng Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- Makefile | 20 ++++++++++---------- configure | 2 +- scripts/create_config | 2 +- tests/Makefile.include | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) -- 2.17.0 diff --git a/Makefile b/Makefile index 35554b5bef..52cd83f7fd 100644 --- a/Makefile +++ b/Makefile @@ -62,8 +62,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_DIRS)),y) -CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y) +CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_LIST)),y) +CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_LIST)),y) CONFIG_XEN := $(CONFIG_XEN_BACKEND) CONFIG_ALL=y -include config-all-devices.mak @@ -362,8 +362,8 @@ DOCS= endif SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR) -SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS)) -SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS)) +SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_LIST)) +SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_LIST)) ifeq ($(SUBDIR_DEVICES_MAK),) config-all-devices.mak: @@ -466,7 +466,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_DIRS)) +SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_LIST)) SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) $(SOFTMMU_SUBDIR_RULES): $(block-obj-y) @@ -510,7 +510,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_DIRS) $(patsubst %,pc-bios/%, $(ROMS)) +ALL_SUBDIRS=$(TARGET_LIST) $(patsubst %,pc-bios/%, $(ROMS)) recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) @@ -763,7 +763,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_DIRS); do \ + for d in $(TARGET_LIST); do \ rm -rf $$d || exit 1 ; \ done rm -Rf .sdk @@ -864,7 +864,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_DIRS); do \ + for d in $(TARGET_LIST); do \ $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \ done @@ -1062,9 +1062,9 @@ endif @echo ' ctags/TAGS - Generate tags file for editors' @echo ' cscope - Generate cscope index' @echo '' - @$(if $(TARGET_DIRS), \ + @$(if $(TARGET_LIST), \ echo 'Architecture specific targets:'; \ - $(foreach t, $(TARGET_DIRS), \ + $(foreach t, $(TARGET_LIST), \ printf " %-30s - Build for %s\\n" $(patsubst %,subdir-%,$(t)) $(t);) \ echo '') @echo 'Cleaning targets:' diff --git a/configure b/configure index 01b20355ca..8a73dbab1d 100755 --- a/configure +++ b/configure @@ -6168,7 +6168,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_DIRS=$target_list" >> $config_host_mak +echo "TARGET_LIST=$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 d727e5e36e..58948a67a4 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_DIRS=*) + TARGET_LIST=*) # do nothing ;; TARGET_*=y) # configuration diff --git a/tests/Makefile.include b/tests/Makefile.include index 3b9a5e31a2..3d2f0458ab 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -854,7 +854,7 @@ endif # QTest rules -TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) +TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_LIST))) ifeq ($(CONFIG_POSIX),y) QTEST_TARGETS = $(TARGETS) check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))