From nobody Mon May 6 04:00:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559031897; cv=none; d=zoho.com; s=zohoarc; b=RnilbhvCmQ065zjAAzDKvWKQT+E/dU9MWIu/rToN/Xlh+7l6fE8p9cJlArGa5HK8UarQNNLr2WsqqIPjxYpdhdL5F092tNejvQnTh8ZxY07dE8c0b4k2RNUD6+l7ci8lcQJlswevS2OKzfMwdaOUyyxJKQnxWoWpkoK1qtzPsyg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559031897; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=X05UyC1+8dOI8k+h51alpYp5/YnGQUMYW5MRRBAXD8Y=; b=dlNq/JML6QLEITFtGccv+C78c5glefuklU78mx9CMvCIRyoTzrv7wMRwg+gVhWtSAo+Rz0fI/hcWhaET8esd2aUZSEuJHYPI19FausxTuNX05xwITLCecOpjB0PyGjPyI8f9gZW6quiTIsWH1IaxOTpKvXEBaQyvyxTo2I7zPXs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 155903189706927.403087935291296; Tue, 28 May 2019 01:24:57 -0700 (PDT) Received: from localhost ([127.0.0.1]:58997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVXPe-0007Ay-1M for importer@patchew.org; Tue, 28 May 2019 04:24:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVXO6-0006Kw-I0 for qemu-devel@nongnu.org; Tue, 28 May 2019 04:23:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVXO5-0002pr-J0 for qemu-devel@nongnu.org; Tue, 28 May 2019 04:23:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58288) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVXO5-0002p0-ET for qemu-devel@nongnu.org; Tue, 28 May 2019 04:23:13 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BF2B83179150; Tue, 28 May 2019 08:23:12 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-117-250.ams2.redhat.com [10.36.117.250]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 56FFE5C8B4; Tue, 28 May 2019 08:23:10 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DEA0911384AA; Tue, 28 May 2019 10:23:08 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 28 May 2019 10:23:05 +0200 Message-Id: <20190528082308.22032-2-armbru@redhat.com> In-Reply-To: <20190528082308.22032-1-armbru@redhat.com> References: <20190528082308.22032-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 28 May 2019 08:23:12 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/4] Makefile: Remove code to smooth transition to config.status 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: pbonzini@redhat.com, richard.henderson@linaro.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" When commit bdf523e6923 made configure generate config.status, it added a fallback to Makefile to smooth the transition, with a TODO "code can be removed after QEMU 1.7." It's been more than five years. Remove it. Signed-off-by: Markus Armbruster Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Makefile b/Makefile index e02b88bcb1..940594cc7c 100644 --- a/Makefile +++ b/Makefile @@ -69,14 +69,7 @@ CONFIG_ALL=3Dy =20 config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VER= SION @echo $@ is out-of-date, running configure - @# TODO: The next lines include code which supports a smooth - @# transition from old configurations without config.status. - @# This code can be removed after QEMU 1.7. - @if test -x config.status; then \ - ./config.status; \ - else \ - sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh; \ - fi + @./config.status else config-host.mak: ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if $(MAKECMDGOAL= S),,fail)) --=20 2.17.2 From nobody Mon May 6 04:00:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559031900; cv=none; d=zoho.com; s=zohoarc; b=PUHLO7L2PDuOZyLk0ZDq2VEVzyn7J3s8iDDqvuBfzgAGvAXdrcOQJ7L3oq0NV/aUdcUh4eiZsGJI3VQ3O9QSvlKqG1g4LV8fkgrTnX0oP/7AJCJcmZbKQW3fwK2moKKKf6H9UbXj1pifXd1QZtOUeemGedcVG9m2WvyuQoSh/sY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559031900; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=PMkA3CpkhuPZUMuuGKpAEHeqgJ8J1fHj0+UDSwxLv+A=; b=EGUBaTvjRDSll2y+y47UC7xD6Zm+OSEm48OMup5C6BP5AYmi4O06RJu22ubiyNkNwtELswliEMyjOxYX7kT1e895rBmnjZYi5vdbblg5CUP5mlb1Bi8mHC8lQsUcRZbi4k9J/JoAR8ekN8mVW1aswcPYQxrKG4sMRfxhVlFW8M8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 155903190001443.03761225044161; Tue, 28 May 2019 01:25:00 -0700 (PDT) Received: from localhost ([127.0.0.1]:59000 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVXPf-0007B1-3f for importer@patchew.org; Tue, 28 May 2019 04:24:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVXO6-0006Ku-Eh for qemu-devel@nongnu.org; Tue, 28 May 2019 04:23:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVXO5-0002pd-Hx for qemu-devel@nongnu.org; Tue, 28 May 2019 04:23:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58448) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVXO5-0002ou-Cq for qemu-devel@nongnu.org; Tue, 28 May 2019 04:23:13 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AED1930833C1; Tue, 28 May 2019 08:23:12 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-117-250.ams2.redhat.com [10.36.117.250]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5A24E6C35B; Tue, 28 May 2019 08:23:10 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E288D1132BB6; Tue, 28 May 2019 10:23:08 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 28 May 2019 10:23:06 +0200 Message-Id: <20190528082308.22032-3-armbru@redhat.com> In-Reply-To: <20190528082308.22032-1-armbru@redhat.com> References: <20190528082308.22032-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 28 May 2019 08:23:12 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/4] Makefile: Drop bogus cleaning of $(ALL_SUBDIRS)/qemu-options.def 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: pbonzini@redhat.com, richard.henderson@linaro.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" When commit df2943ba3c7 moved "rm -f qemu-options.def" from distclean to clean, it also added "rm -f $$d/qemu-options.def" to the for d in $(ALL_SUBDIRS) loop. That file doesn't exist. Remove the mistaken rm. Signed-off-by: Markus Armbruster Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 940594cc7c..80c9c6416f 100644 --- a/Makefile +++ b/Makefile @@ -658,7 +658,6 @@ clean: rm -rf qga/qapi-generated for d in $(ALL_SUBDIRS); do \ if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \ - rm -f $$d/qemu-options.def; \ done rm -f config-all-devices.mak =20 --=20 2.17.2 From nobody Mon May 6 04:00:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559032053; cv=none; d=zoho.com; s=zohoarc; b=SPvwk76S6ktVZnfxsKtzHT35ijmjyLa76e7i8iqZkBbCwQtCHVmxLB38Ly43zvQrP0c9gwfhxExoCMIvkfK4VauY5O3C1jQ2c4NraChvLS3v1UAMN6rQBsaXmuPLMqhlP0C2AbeVfssiKnER2lbTve/wEAM0MFQsz7tfVHzYep0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559032053; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=SACfl6xEFqyt888VYF48Z9uiTQvsGZgjslh1I6TpEeI=; b=e0xP8YXGrAyS3ee6+OIwfbWd0Rt4o5DgeFr4NaWEbTupzXYMy9XyYnQeyx3BLkRkB5hQqQiKGjo4xWJEV//p1Simljwyho5gKlWtsw3yqIwbFt/VL1hQjOoTuWnE5fQZIg3NAIGSAzmTxKK2bI8r8ZPzVV0ATUCInnY16tnjpko= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559032053613638.5015682033836; Tue, 28 May 2019 01:27:33 -0700 (PDT) Received: from localhost ([127.0.0.1]:59048 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVXSE-0000qv-KW for importer@patchew.org; Tue, 28 May 2019 04:27:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVXO7-0006LB-Mi for qemu-devel@nongnu.org; Tue, 28 May 2019 04:23:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVXO6-0002qN-2U for qemu-devel@nongnu.org; Tue, 28 May 2019 04:23:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58456) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVXO5-0002pK-SN for qemu-devel@nongnu.org; Tue, 28 May 2019 04:23:14 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 35EA630833C0; Tue, 28 May 2019 08:23:13 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-117-250.ams2.redhat.com [10.36.117.250]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 611FA1001E80; Tue, 28 May 2019 08:23:10 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id EA4B61132BD3; Tue, 28 May 2019 10:23:08 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 28 May 2019 10:23:07 +0200 Message-Id: <20190528082308.22032-4-armbru@redhat.com> In-Reply-To: <20190528082308.22032-1-armbru@redhat.com> References: <20190528082308.22032-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 28 May 2019 08:23:13 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/4] Makefile: Rename targets for make recursion 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: pbonzini@redhat.com, richard.henderson@linaro.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" We make a few sub-directories recursively, in particular $(TARGET_DIRS). For goal "all", we do it the nice way: "all" has a prerequisite subdir-T for each T in $(TARGET_DIRS), and T's recipe runs make recursively. Behaves nicely with -j and -k. For other goals such as "clean" and "install", the recipe runs make recursively in a for loop. Ignores -j and -k. The next commit will fix that for "clean" and "install". This commit prepares the ground by renaming the targets we use for "all" to include the goal for the sub-make. This will permit reusing them for goals other than "all". Targets subdir-T for T in $(TARGET_DIRS) run "make all" in T. Rename to T/all, and declare phony. Targets romsubdir-R for R in $(ROMS) run "make" in pc-bios/R. Default goal is "all" for all R. Rename to pc-bios/R/all, and declare phony. The remainder are renamed just for consistency. Target subdir-dtc runs "make libbft/libfdt.a" in dtc. Rename to dtc/all, and declare phony. Target subdir-capstone runs make $(BUILD_DIR)/capstone/$(LIBCAPSTONE) in $(SRC_PATH)/capstone. Rename to capstone/all, and declare phony. Target subdir-slirp runs "make" in $(SRC_PATH)/slirp. Default goal is all, which builds $(BUILD_DIR)/libslirp.a. Rename to slirp/all, and declare phony. Signed-off-by: Markus Armbruster Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- Makefile | 30 ++++++++++++++++++------------ configure | 6 +++--- tests/Makefile.include | 5 +++-- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 80c9c6416f..42930b7749 100644 --- a/Makefile +++ b/Makefile @@ -437,8 +437,8 @@ 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","$@= ") =20 -SUBDIR_RULES=3D$(patsubst %,subdir-%, $(TARGET_DIRS)) -SOFTMMU_SUBDIR_RULES=3D$(filter %-softmmu,$(SUBDIR_RULES)) +SUBDIR_RULES=3D$(addsuffix /all, $(TARGET_DIRS)) +SOFTMMU_SUBDIR_RULES=3D$(filter %-softmmu/all,$(SUBDIR_RULES)) =20 $(SOFTMMU_SUBDIR_RULES): $(authz-obj-y) $(SOFTMMU_SUBDIR_RULES): $(block-obj-y) @@ -448,14 +448,16 @@ $(SOFTMMU_SUBDIR_RULES): $(io-obj-y) $(SOFTMMU_SUBDIR_RULES): config-all-devices.mak $(SOFTMMU_SUBDIR_RULES): $(edk2-decompressed) =20 -subdir-%: - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V=3D"$(V)" TARGET_= DIR=3D"$*/" all,) +.PHONY: $(SUBDIR_RULES) +$(SUBDIR_RULES): + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V=3D"$(V)" = TARGET_DIR=3D"$(dir $@)" all,) =20 DTC_MAKE_ARGS=3D-I$(SRC_PATH)/dtc VPATH=3D$(SRC_PATH)/dtc -C dtc V=3D"$(V)= " LIBFDT_srcdir=3D$(SRC_PATH)/dtc/libfdt DTC_CFLAGS=3D$(CFLAGS) $(QEMU_CFLAGS) DTC_CPPFLAGS=3D-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libf= dt =20 -subdir-dtc: .git-submodule-status dtc/libfdt dtc/tests +.PHONY: dtc/all +dtc/all: .git-submodule-status dtc/libfdt dtc/tests $(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS=3D"$(DTC_CPPFLAGS)= " CFLAGS=3D"$(DTC_CFLAGS)" LDFLAGS=3D"$(LDFLAGS)" ARFLAGS=3D"$(ARFLAGS)" CC= =3D"$(CC)" AR=3D"$(AR)" LD=3D"$(LD)" $(SUBDIR_MAKEFLAGS) libfdt/libfdt.a,) =20 dtc/%: .git-submodule-status @@ -473,21 +475,25 @@ CAP_CFLAGS +=3D -DCAPSTONE_HAS_ARM64 CAP_CFLAGS +=3D -DCAPSTONE_HAS_POWERPC CAP_CFLAGS +=3D -DCAPSTONE_HAS_X86 =20 -subdir-capstone: .git-submodule-status +.PHONY: capstone/all +capstone/all: .git-submodule-status $(call quiet-command,$(MAKE) -C $(SRC_PATH)/capstone CAPSTONE_SHARED=3Dno= BUILDDIR=3D"$(BUILD_DIR)/capstone" CC=3D"$(CC)" AR=3D"$(AR)" LD=3D"$(LD)" = RANLIB=3D"$(RANLIB)" CFLAGS=3D"$(CAP_CFLAGS)" $(SUBDIR_MAKEFLAGS) $(BUILD_D= IR)/capstone/$(LIBCAPSTONE)) =20 -subdir-slirp: .git-submodule-status +.PHONY: slirp/all +slirp/all: .git-submodule-status $(call quiet-command,$(MAKE) -C $(SRC_PATH)/slirp BUILD_DIR=3D"$(BUILD_DI= R)/slirp" CC=3D"$(CC)" AR=3D"$(AR)" LD=3D"$(LD)" RANLIB=3D"$(RANLIB)" CFLAG= S=3D"$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS=3D"$(LDFLAGS)") =20 $(SUBDIR_RULES): libqemuutil.a $(common-obj-y) \ $(qom-obj-y) $(crypto-user-obj-$(CONFIG_USER_ONLY)) =20 -ROMSUBDIR_RULES=3D$(patsubst %,romsubdir-%, $(ROMS)) +ROM_DIRS =3D $(addprefix pc-bios/, $(ROMS)) +ROMSUBDIR_RULES=3D$(addsuffix /all, $(ROM_DIRS)) # Only keep -O and -g cflags -romsubdir-%: - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V=3D"$(V)"= TARGET_DIR=3D"$*/" CFLAGS=3D"$(filter -O% -g%,$(CFLAGS))",) +.PHONY: $(ROMSUBDIR_RULES) +$(ROMSUBDIR_RULES): + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V=3D"$(V)" = TARGET_DIR=3D"$(dir $@)" CFLAGS=3D"$(filter -O% -g%,$(CFLAGS))",) =20 -ALL_SUBDIRS=3D$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS)) +ALL_SUBDIRS=3D$(TARGET_DIRS) $(ROM_DIRS) =20 recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) =20 @@ -1098,7 +1104,7 @@ endif @$(if $(TARGET_DIRS), \ echo 'Architecture specific targets:'; \ $(foreach t, $(TARGET_DIRS), \ - printf " %-30s - Build for %s\\n" $(patsubst %,subdir-%,$(t)) $(t);) \ + printf " %-30s - Build for %s\\n" $(t)/all $(t);) \ echo '') @echo 'Cleaning targets:' @echo ' clean - Remove most generated files but keep the conf= ig' diff --git a/configure b/configure index 528b9ff705..effd943a05 100755 --- a/configure +++ b/configure @@ -6597,7 +6597,7 @@ if test "$slirp" !=3D "no"; then echo "SLIRP_LIBS=3D$slirp_libs" >> $config_host_mak fi if [ "$slirp" =3D "git" -o "$slirp" =3D "internal" ]; then - echo "config-host.h: subdir-slirp" >> $config_host_mak + echo "config-host.h: slirp/all" >> $config_host_mak fi if test "$vde" =3D "yes" ; then echo "CONFIG_VDE=3Dy" >> $config_host_mak @@ -7865,10 +7865,10 @@ if test -n "$enabled_cross_compilers"; then fi =20 if [ "$fdt" =3D "git" ]; then - echo "config-host.h: subdir-dtc" >> $config_host_mak + echo "config-host.h: dtc/all" >> $config_host_mak fi if [ "$capstone" =3D "git" -o "$capstone" =3D "internal" ]; then - echo "config-host.h: subdir-capstone" >> $config_host_mak + echo "config-host.h: capstone/all" >> $config_host_mak fi if test -n "$LIBCAPSTONE"; then echo "LIBCAPSTONE=3D$LIBCAPSTONE" >> $config_host_mak diff --git a/tests/Makefile.include b/tests/Makefile.include index 1865f6b322..1a3f17faa9 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1,3 +1,4 @@ +# -*- Mode: makefile -*- =20 .PHONY: check-help check-help: @@ -880,7 +881,7 @@ define do_test_tap endef =20 .PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS)) -$(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: subdir-%-so= ftmmu $(check-qtest-y) +$(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: %-softmmu/a= ll $(check-qtest-y) $(call do_test_human,$(check-qtest-$*-y) $(check-qtest-generic-y), \ QTEST_QEMU_BINARY=3D$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=3Dqemu-img$(EXESUF)) @@ -893,7 +894,7 @@ check-speed: $(check-speed-y) =20 # gtester tests with TAP output =20 -$(patsubst %, check-report-qtest-%.tap, $(QTEST_TARGETS)): check-report-qt= est-%.tap: subdir-%-softmmu $(check-qtest-y) +$(patsubst %, check-report-qtest-%.tap, $(QTEST_TARGETS)): check-report-qt= est-%.tap: %-softmmu/all $(check-qtest-y) $(call do_test_tap, $(check-qtest-$*-y) $(check-qtest-generic-y), \ QTEST_QEMU_BINARY=3D$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=3Dqemu-img$(EXESUF)) --=20 2.17.2 From nobody Mon May 6 04:00:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559031898; cv=none; d=zoho.com; s=zohoarc; b=ZnWQgtjTDs7Fna7l90szkF53XgO00qUDYRCluPVwwzkvOmWAHveukOqq57v9weKr6r+plF4yicIwU1Lw6KAh0wiucses/4hJvX1D6hrSS6OYEV1IITOTIwRWUSUNLn5xKc2wbcN6SOhxvf8CwBpvo1LpVgpbVZ5L9uVEN6JxHK0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559031898; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=GMkFtKUPjDZYrCu4oZYFh1/1z0H0ZD3+WDYrCb0a2Aw=; b=faT5i60y+HzHMd+oSuS6EjK9hrfMAmDzS/zz8gpgIvWvVifwe8fSuPbKf8EV+HfgBJ7+ArxA+AEojydFTxWHiHlfZijJjXIEglH8LNq+jRPRtFSEXu7Mz8u1QJo/Zl2I7Hb/tns85wYXAtFiDtVi4Jo88h0c/rNBbui+KP64EvM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559031898981320.8300771096226; Tue, 28 May 2019 01:24:58 -0700 (PDT) Received: from localhost ([127.0.0.1]:59002 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVXPg-0007DJ-UC for importer@patchew.org; Tue, 28 May 2019 04:24:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVXO7-0006Kx-87 for qemu-devel@nongnu.org; Tue, 28 May 2019 04:23:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVXO5-0002q5-SU for qemu-devel@nongnu.org; Tue, 28 May 2019 04:23:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42042) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVXO5-0002pA-K4 for qemu-devel@nongnu.org; Tue, 28 May 2019 04:23:13 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EDDA081E06; Tue, 28 May 2019 08:23:12 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-117-250.ams2.redhat.com [10.36.117.250]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 63BD27D583; Tue, 28 May 2019 08:23:10 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id ECD641132B6C; Tue, 28 May 2019 10:23:08 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 28 May 2019 10:23:08 +0200 Message-Id: <20190528082308.22032-5-armbru@redhat.com> In-Reply-To: <20190528082308.22032-1-armbru@redhat.com> References: <20190528082308.22032-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 28 May 2019 08:23:12 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/4] Makefile: Reuse all's recursion machinery for clean and install 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: pbonzini@redhat.com, richard.henderson@linaro.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Targets "clean" and "install" run make recursively in a for loop. This ignores -j and -k. Target "all" depends on SUBDIR/all to recurse into each SUBDIR. Behaves nicely with -j and -k. Put that to use for "clean" and "install": depend on SUBDIR/clean or SUBDIR/install, respectively, and delete the loop. Signed-off-by: Markus Armbruster Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Makefile | 53 +++++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index 42930b7749..f194c61122 100644 --- a/Makefile +++ b/Makefile @@ -437,20 +437,22 @@ 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","$@= ") =20 -SUBDIR_RULES=3D$(addsuffix /all, $(TARGET_DIRS)) -SOFTMMU_SUBDIR_RULES=3D$(filter %-softmmu/all,$(SUBDIR_RULES)) +TARGET_DIRS_RULES :=3D $(foreach t, all clean install, $(addsuffix /$(t), = $(TARGET_DIRS))) =20 -$(SOFTMMU_SUBDIR_RULES): $(authz-obj-y) -$(SOFTMMU_SUBDIR_RULES): $(block-obj-y) -$(SOFTMMU_SUBDIR_RULES): $(chardev-obj-y) -$(SOFTMMU_SUBDIR_RULES): $(crypto-obj-y) -$(SOFTMMU_SUBDIR_RULES): $(io-obj-y) -$(SOFTMMU_SUBDIR_RULES): config-all-devices.mak -$(SOFTMMU_SUBDIR_RULES): $(edk2-decompressed) +SOFTMMU_ALL_RULES=3D$(filter %-softmmu/all, $(TARGET_DIRS_RULES)) +$(SOFTMMU_ALL_RULES): $(authz-obj-y) +$(SOFTMMU_ALL_RULES): $(block-obj-y) +$(SOFTMMU_ALL_RULES): $(chardev-obj-y) +$(SOFTMMU_ALL_RULES): $(crypto-obj-y) +$(SOFTMMU_ALL_RULES): $(io-obj-y) +$(SOFTMMU_ALL_RULES): config-all-devices.mak +$(SOFTMMU_ALL_RULES): $(edk2-decompressed) =20 -.PHONY: $(SUBDIR_RULES) -$(SUBDIR_RULES): - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V=3D"$(V)" = TARGET_DIR=3D"$(dir $@)" all,) +.PHONY: $(TARGET_DIRS_RULES) +# The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so that +# $(dir $@) yields the sub-directory, and $(notdir $@) yields the sub-goal +$(TARGET_DIRS_RULES): + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V=3D"$(V)" = TARGET_DIR=3D"$(dir $@)" $(notdir $@),) =20 DTC_MAKE_ARGS=3D-I$(SRC_PATH)/dtc VPATH=3D$(SRC_PATH)/dtc -C dtc V=3D"$(V)= " LIBFDT_srcdir=3D$(SRC_PATH)/dtc/libfdt DTC_CFLAGS=3D$(CFLAGS) $(QEMU_CFLAGS) @@ -483,19 +485,19 @@ capstone/all: .git-submodule-status slirp/all: .git-submodule-status $(call quiet-command,$(MAKE) -C $(SRC_PATH)/slirp BUILD_DIR=3D"$(BUILD_DI= R)/slirp" CC=3D"$(CC)" AR=3D"$(AR)" LD=3D"$(LD)" RANLIB=3D"$(RANLIB)" CFLAG= S=3D"$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS=3D"$(LDFLAGS)") =20 -$(SUBDIR_RULES): libqemuutil.a $(common-obj-y) \ +$(filter %/all, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \ $(qom-obj-y) $(crypto-user-obj-$(CONFIG_USER_ONLY)) =20 ROM_DIRS =3D $(addprefix pc-bios/, $(ROMS)) -ROMSUBDIR_RULES=3D$(addsuffix /all, $(ROM_DIRS)) +ROM_DIRS_RULES=3D$(foreach t, all clean, $(addsuffix /$(t), $(ROM_DIRS))) # Only keep -O and -g cflags -.PHONY: $(ROMSUBDIR_RULES) -$(ROMSUBDIR_RULES): - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V=3D"$(V)" = TARGET_DIR=3D"$(dir $@)" CFLAGS=3D"$(filter -O% -g%,$(CFLAGS))",) +.PHONY: $(ROM_DIRS_RULES) +$(ROM_DIRS_RULES): + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V=3D"$(V)" = TARGET_DIR=3D"$(dir $@)" CFLAGS=3D"$(filter -O% -g%,$(CFLAGS))" $(notdir $@= ),) =20 -ALL_SUBDIRS=3D$(TARGET_DIRS) $(ROM_DIRS) - -recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) +recurse-all: $(addsuffix /all, $(TARGET_DIRS) $(ROM_DIRS)) +recurse-clean: $(addsuffix /clean, $(TARGET_DIRS) $(ROM_DIRS)) +recurse-install: $(addsuffix /install, $(TARGET_DIRS)) =20 $(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<,"RC","version.o") @@ -641,7 +643,7 @@ clean-coverage: "CLEAN", "coverage files") endif =20 -clean: +clean: recurse-clean # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h ge= n-op-arm.h rm -f qemu-options.def @@ -662,9 +664,6 @@ clean: rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp) rm -f qapi-gen-timestamp rm -rf qga/qapi-generated - for d in $(ALL_SUBDIRS); do \ - if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \ - done rm -f config-all-devices.mak =20 VERSION ?=3D $(shell cat VERSION) @@ -810,7 +809,8 @@ endif ICON_SIZES=3D16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 =20 install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-local= statedir \ - $(if $(INSTALL_BLOBS),$(edk2-decompressed)) + $(if $(INSTALL_BLOBS),$(edk2-decompressed)) \ + recurse-install ifneq ($(TOOLS),) $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)= $(bindir)) endif @@ -870,9 +870,6 @@ endif $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadi= r)/keymaps"; \ done $(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/= trace-events-all" - for d in $(TARGET_DIRS); do \ - $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=3D$$d/ -C $$d $@ || exit 1 ; \ - done =20 .PHONY: ctags ctags: --=20 2.17.2