From nobody Fri Dec 19 20:13:38 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.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=1599220205; cv=none; d=zohomail.com; s=zohoarc; b=G5/+sHppVD+zIUDfRACwLIJgBDpl8f9xw8R0Vr/5LCdDwSQtYmfAchCULTwgSPJv5wkseMU5RoXMYWz8bXmaUkPACe/3LN6Hyf7eyNXrXB8Tyqwp/u6TbkV5FlDqg0JW4FWkjmEQZZGGLHP9lZniP1Ehq4lB8lLBd8e4HOpvHec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599220205; h=Content-Type:Content-Transfer-Encoding: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; bh=2b6suSUQoUCdu/svLeROGq1EoTJ292BuA8aeHzcUKCw=; b=cW4yF/tRiA/tldNo+t05fFe226iHI58jKPc8uxptX4keRpeVI1w/+pjGpk2KUOxEsbAFk7EJXfnfuDmQpjP9B5Y85cvJXMemVCEOksv3cBckPB/51FjPHVO9g+2QQX4J7JAvUq+3RSU+DzE+Vbp7qFHevfOcmybjSFWWSsEtbYc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.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 1599220205331140.95105348385698; Fri, 4 Sep 2020 04:50:05 -0700 (PDT) Received: from localhost ([::1]:40132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kEAEF-00078G-Uj for importer@patchew.org; Fri, 04 Sep 2020 07:50:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kEA6f-0000mq-39 for qemu-devel@nongnu.org; Fri, 04 Sep 2020 07:42:13 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:42648 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kEA6b-0005Gi-Hr for qemu-devel@nongnu.org; Fri, 04 Sep 2020 07:42:12 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-564-coPPJfs4PLmP8JrbdxfuLg-1; Fri, 04 Sep 2020 07:42:07 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 809F1425ED for ; Fri, 4 Sep 2020 11:41:40 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FEC660BEC for ; Fri, 4 Sep 2020 11:41:40 +0000 (UTC) X-MC-Unique: coPPJfs4PLmP8JrbdxfuLg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 29/46] Makefile: remove dead variables and includes Date: Fri, 4 Sep 2020 07:41:05 -0400 Message-Id: <20200904114122.31307-30-pbonzini@redhat.com> In-Reply-To: <20200904114122.31307-1-pbonzini@redhat.com> References: <20200904114122.31307-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/04 01:57:12 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Makefile.objs, the .d files and various CONFIG_* symbols are not used anymore by the Make side of the build; they are only processed by Meson. We can delete them. Signed-off-by: Paolo Bonzini --- Makefile | 20 -------------------- Makefile.objs | 34 ---------------------------------- tests/Makefile.include | 40 ---------------------------------------- 3 files changed, 94 deletions(-) delete mode 100644 Makefile.objs diff --git a/Makefile b/Makefile index d4d6a67d96..9bdf5fc072 100644 --- a/Makefile +++ b/Makefile @@ -80,13 +80,6 @@ seems to have been used for an in-tree build. You can fi= x this by running \ endif endif =20 -CONFIG_SOFTMMU :=3D $(if $(filter %-softmmu,$(TARGET_DIRS)),y) -CONFIG_USER_ONLY :=3D $(if $(filter %-user,$(TARGET_DIRS)),y) -CONFIG_XEN :=3D $(CONFIG_XEN_BACKEND) -CONFIG_ALL=3Dy --include config-all-devices.mak --include config-all-disas.mak - config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VER= SION @echo $@ is out-of-date, running configure @if test -f meson-private/coredata.dat; then \ @@ -117,9 +110,6 @@ build.ninja: config-host.mak =20 include $(SRC_PATH)/rules.mak =20 -# lor is defined in rules.mak -CONFIG_BLOCK :=3D $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)) - generated-files-y +=3D .git-submodule-status =20 # Don't try to regenerate Makefile or configure @@ -132,14 +122,8 @@ configure: ; =20 $(call set-vpath, $(SRC_PATH)) =20 -LIBS+=3D-lz $(LIBS_TOOLS) - SUBDIR_MAKEFLAGS=3D$(if $(V),,--no-print-directory --quiet) BUILD_DIR=3D$(= BUILD_DIR) =20 -ifneq ($(wildcard config-host.mak),) -include $(SRC_PATH)/Makefile.objs -endif - include $(SRC_PATH)/tests/Makefile.include =20 all: recurse-all @@ -256,10 +240,6 @@ Makefile: $(generated-files-y) endif endif =20 -# Include automatically generated dependency files -# Dependencies in Makefile.objs files come from our recursive subdir rules --include $(wildcard *.d tests/*.d) - include $(SRC_PATH)/tests/docker/Makefile.include include $(SRC_PATH)/tests/vm/Makefile.include =20 diff --git a/Makefile.objs b/Makefile.objs deleted file mode 100644 index c351b59641..0000000000 --- a/Makefile.objs +++ /dev/null @@ -1,34 +0,0 @@ -####################################################################### -# Common libraries for tools and emulators -qom-obj-y =3D qom/libqom.fa - -####################################################################### -# code used by both qemu system emulation and qemu-img - -ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y) - -authz-obj-y =3D authz/libauthz.fa -authz/libauthz.fa-libs =3D $(if $(CONFIG_AUTH_PAM),-lpam) - -block-obj-y +=3D libblock.fa - -libblock.fa-libs =3D $(ZSTD_LIBS) -libblock.fa-libs +=3D $(LIBNFS_LIBS) -libblock.fa-libs +=3D $(LIBISCSI_LIBS) -libblock.fa-libs +=3D $(CURL_LIBS) -libblock.fa-libs +=3D $(RBD_LIBS) -libblock.fa-libs +=3D $(GLUSTERFS_LIBS) -libblock.fa-libs +=3D $(VXHS_LIBS) -libblock.fa-libs +=3D $(LIBSSH_LIBS) -libblock.fa-libs +=3D $(BZIP2_LIBS) -libblock.fa-libs +=3D $(LZFSE_LIBS) -libblock.fa-libs +=3D $(if $(CONFIG_LINUX_AIO),-laio) -libblock.fa-libs +=3D $(LIBXML2_LIBS) - -chardev-obj-y =3D chardev/libchardev.fa - -crypto-obj-y =3D crypto/libcrypto.fa - -io-obj-y =3D io/libio.fa - -endif # CONFIG_SOFTMMU or CONFIG_TOOLS diff --git a/tests/Makefile.include b/tests/Makefile.include index 1592a647f4..f93e611220 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -40,41 +40,6 @@ SYSEMU_TARGET_LIST :=3D $(subst -softmmu.mak,,$(notdir \ =20 SPEED =3D quick =20 -# gtester tests, possibly with verbose output -# do_test_tap runs all tests, even if some of them fail, while do_test_hum= an -# stops at the first failure unless -k is given on the command line - -define do_test_human_k - $(quiet-@)rc=3D0; $(foreach COMMAND, $1, \ - $(call quiet-command-run, \ - export MALLOC_PERTURB_=3D$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0= } % 255 + 1))} $2; \ - $(COMMAND) -m=3D$(SPEED) -k --tap < /dev/null \ - | ./scripts/tap-driver.pl --test-name=3D"$(notdir $(COMMAND)= )" $(if $(V),, --show-failures-only) \ - || rc=3D$$?;, "TEST", "$@: $(COMMAND)")) exit $$rc -endef -define do_test_human_no_k - $(foreach COMMAND, $1, \ - $(call quiet-command, \ - MALLOC_PERTURB_=3D$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 255= + 1))} $2 \ - $(COMMAND) -m=3D$(SPEED) -k --tap < /dev/null \ - | ./scripts/tap-driver.pl --test-name=3D"$(notdir $(COMMAND)= )" $(if $(V),, --show-failures-only), \ - "TEST", "$@: $(COMMAND)") -) -endef -do_test_human =3D \ - $(if $(findstring k, $(MAKEFLAGS)), $(do_test_human_k), $(do_test_= human_no_k)) - -define do_test_tap - $(call quiet-command, \ - { export MALLOC_PERTURB_=3D$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0= } % 255 + 1))} $2; \ - $(foreach COMMAND, $1, \ - $(COMMAND) -m=3D$(SPEED) -k --tap < /dev/null \ - | sed "s/^\(not \)\?ok [0-9]* /&$(notdir $(COMMAND)) /" || true; ) = } \ - | ./scripts/tap-merge.pl | tee "$@" \ - | ./scripts/tap-driver.pl $(if $(V),, --show-failures-only), \ - "TAP","$@") -endef - # Per guest TCG tests =20 BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS)) @@ -182,7 +147,6 @@ endif check-build: $(QEMU_IOTESTS_HELPERS-y) =20 check-clean: - rm -rf tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) =20 clean: check-clean @@ -191,8 +155,4 @@ clean: check-clean =20 check-speed: bench-speed =20 -# Build the help program automatically - --include $(wildcard tests/*.d) - endif --=20 2.26.2