From nobody Sun Apr 28 03:14:31 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554128946819382.79357760460516; Mon, 1 Apr 2019 07:29:06 -0700 (PDT) Received: from localhost ([127.0.0.1]:38371 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAxvp-0004dH-LE for importer@patchew.org; Mon, 01 Apr 2019 10:29:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAxg3-0005jG-Q3 for qemu-devel@nongnu.org; Mon, 01 Apr 2019 10:12:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hAxg2-0006rb-HP for qemu-devel@nongnu.org; Mon, 01 Apr 2019 10:12:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50434) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hAxg2-0006rH-9D; Mon, 01 Apr 2019 10:12:42 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8A51B308FED4; Mon, 1 Apr 2019 14:12:41 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-116-235.ams2.redhat.com [10.36.116.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 161465D9C8; Mon, 1 Apr 2019 14:12:37 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 1 Apr 2019 16:12:18 +0200 Message-Id: <20190401141222.30034-2-lvivier@redhat.com> In-Reply-To: <20190401141222.30034-1-lvivier@redhat.com> References: <20190401141222.30034-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 01 Apr 2019 14:12:41 +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 v3 1/5] trace: only include trace-event-subdirs when they are needed 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: Laurent Vivier , Thomas Huth , David Hildenbrand , Cornelia Huck , qemu-s390x@nongnu.org, Gerd Hoffmann , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Some directories are built only for softmmu targets, and the related trace-event-subdirs must do the same Signed-off-by: Laurent Vivier Reviewed-by: Stefan Hajnoczi --- Makefile.objs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index cf065de5ed44..dda5bbc9101f 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -127,11 +127,12 @@ rdmacm-mux-obj-y =3D contrib/rdmacm-mux/ trace-events-subdirs =3D trace-events-subdirs +=3D accel/kvm trace-events-subdirs +=3D accel/tcg -trace-events-subdirs +=3D audio trace-events-subdirs +=3D authz trace-events-subdirs +=3D block trace-events-subdirs +=3D chardev trace-events-subdirs +=3D crypto +ifeq ($(CONFIG_SOFTMMU),y) +trace-events-subdirs +=3D audio trace-events-subdirs +=3D hw/9pfs trace-events-subdirs +=3D hw/acpi trace-events-subdirs +=3D hw/alpha @@ -140,7 +141,6 @@ trace-events-subdirs +=3D hw/audio trace-events-subdirs +=3D hw/block trace-events-subdirs +=3D hw/block/dataplane trace-events-subdirs +=3D hw/char -trace-events-subdirs +=3D hw/display trace-events-subdirs +=3D hw/dma trace-events-subdirs +=3D hw/hppa trace-events-subdirs +=3D hw/i2c @@ -173,11 +173,14 @@ trace-events-subdirs +=3D hw/virtio trace-events-subdirs +=3D hw/watchdog trace-events-subdirs +=3D hw/xen trace-events-subdirs +=3D hw/gpio +trace-events-subdirs +=3D migration +trace-events-subdirs +=3D net +trace-events-subdirs +=3D ui +endif +trace-events-subdirs +=3D hw/display trace-events-subdirs +=3D io trace-events-subdirs +=3D linux-user -trace-events-subdirs +=3D migration trace-events-subdirs +=3D nbd -trace-events-subdirs +=3D net trace-events-subdirs +=3D qapi trace-events-subdirs +=3D qom trace-events-subdirs +=3D scsi @@ -189,7 +192,6 @@ trace-events-subdirs +=3D target/ppc trace-events-subdirs +=3D target/riscv trace-events-subdirs +=3D target/s390x trace-events-subdirs +=3D target/sparc -trace-events-subdirs +=3D ui trace-events-subdirs +=3D util =20 trace-events-files =3D $(SRC_PATH)/trace-events $(trace-events-subdirs:%= =3D$(SRC_PATH)/%/trace-events) --=20 2.20.1 From nobody Sun Apr 28 03:14:31 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554129140974481.1339510690243; Mon, 1 Apr 2019 07:32:20 -0700 (PDT) Received: from localhost ([127.0.0.1]:39222 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAxyz-0007Hn-Tj for importer@patchew.org; Mon, 01 Apr 2019 10:32:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAxgM-00061U-63 for qemu-devel@nongnu.org; Mon, 01 Apr 2019 10:13:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hAxgG-0006v8-FG for qemu-devel@nongnu.org; Mon, 01 Apr 2019 10:13:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60662) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hAxgG-0006ul-58; Mon, 01 Apr 2019 10:12:56 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 72857C05683E; Mon, 1 Apr 2019 14:12:55 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-116-235.ams2.redhat.com [10.36.116.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id E63A95D9C8; Mon, 1 Apr 2019 14:12:41 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 1 Apr 2019 16:12:19 +0200 Message-Id: <20190401141222.30034-3-lvivier@redhat.com> In-Reply-To: <20190401141222.30034-1-lvivier@redhat.com> References: <20190401141222.30034-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 01 Apr 2019 14:12:55 +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 v3 2/5] build: replace GENERATED_FILES by generated-files-y 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: Laurent Vivier , Thomas Huth , David Hildenbrand , Cornelia Huck , qemu-s390x@nongnu.org, Gerd Hoffmann , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" When possible use generated-files-$(FLAG) to disable some targets (like KEYCODEMAP_FILES). Suggested-by: Paolo Bonzini Signed-off-by: Laurent Vivier --- Makefile | 36 +++++++++++++++++------------------- Makefile.target | 6 +++--- target/s390x/Makefile.objs | 2 +- tests/Makefile.include | 26 +++++++++++++------------- 4 files changed, 34 insertions(+), 36 deletions(-) diff --git a/Makefile b/Makefile index 04a0d4505085..10ae5e31fc0a 100644 --- a/Makefile +++ b/Makefile @@ -101,7 +101,7 @@ QEMU_PKGVERSION :=3D $(if $(PKGVERSION),$(PKGVERSION),$= (shell \ # Either "version (pkgversion)", or just "version" if pkgversion not set FULL_VERSION :=3D $(if $(QEMU_PKGVERSION),$(VERSION) ($(QEMU_PKGVERSION)),= $(VERSION)) =20 -GENERATED_FILES =3D qemu-version.h config-host.h qemu-options.def +generated-files-y =3D qemu-version.h config-host.h qemu-options.def =20 GENERATED_QAPI_FILES =3D qapi/qapi-builtin-types.h qapi/qapi-builtin-types= .c GENERATED_QAPI_FILES +=3D qapi/qapi-types.h qapi/qapi-types.c @@ -121,20 +121,18 @@ GENERATED_QAPI_FILES +=3D $(QAPI_MODULES:%=3Dqapi/qap= i-events-%.c) GENERATED_QAPI_FILES +=3D qapi/qapi-introspect.c qapi/qapi-introspect.h GENERATED_QAPI_FILES +=3D qapi/qapi-doc.texi =20 -GENERATED_FILES +=3D $(GENERATED_QAPI_FILES) +generated-files-y +=3D $(GENERATED_QAPI_FILES) =20 -GENERATED_FILES +=3D trace/generated-tcg-tracers.h +generated-files-y +=3D trace/generated-tcg-tracers.h =20 -GENERATED_FILES +=3D trace/generated-helpers-wrappers.h -GENERATED_FILES +=3D trace/generated-helpers.h -GENERATED_FILES +=3D trace/generated-helpers.c +generated-files-y +=3D trace/generated-helpers-wrappers.h +generated-files-y +=3D trace/generated-helpers.h +generated-files-y +=3D trace/generated-helpers.c =20 -ifdef CONFIG_TRACE_UST -GENERATED_FILES +=3D trace-ust-all.h -GENERATED_FILES +=3D trace-ust-all.c -endif +generated-files-$(CONFIG_TRACE_UST) +=3D trace-ust-all.h +generated-files-$(CONFIG_TRACE_UST) +=3D trace-ust-all.c =20 -GENERATED_FILES +=3D module_block.h +generated-files-y +=3D module_block.h =20 TRACE_HEADERS =3D trace-root.h $(trace-events-subdirs:%=3D%/trace.h) TRACE_SOURCES =3D trace-root.c $(trace-events-subdirs:%=3D%/trace.c) @@ -147,10 +145,10 @@ ifdef CONFIG_TRACE_UST TRACE_HEADERS +=3D trace-ust-root.h $(trace-events-subdirs:%=3D%/trace-ust= .h) endif =20 -GENERATED_FILES +=3D $(TRACE_HEADERS) -GENERATED_FILES +=3D $(TRACE_SOURCES) -GENERATED_FILES +=3D $(BUILD_DIR)/trace-events-all -GENERATED_FILES +=3D .git-submodule-status +generated-files-y +=3D $(TRACE_HEADERS) +generated-files-y +=3D $(TRACE_SOURCES) +generated-files-y +=3D $(BUILD_DIR)/trace-events-all +generated-files-y +=3D .git-submodule-status =20 trace-group-name =3D $(shell dirname $1 | sed -e 's/[^a-zA-Z0-9]/_/g') =20 @@ -281,7 +279,7 @@ KEYCODEMAP_FILES =3D \ ui/input-keymap-osx-to-qcode.c \ $(NULL) =20 -GENERATED_FILES +=3D $(KEYCODEMAP_FILES) +generated-files-$(CONFIG_SOFTMMU) +=3D $(KEYCODEMAP_FILES) =20 ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/Ma= kefile.objs $(call quiet-command,\ @@ -637,10 +635,10 @@ clean: rm -f fsdev/*.pod scsi/*.pod rm -f qemu-img-cmds.h rm -f ui/shader/*-vert.h ui/shader/*-frag.h - @# May not be present in GENERATED_FILES + @# May not be present in generated-files-y rm -f trace/generated-tracers-dtrace.dtrace* rm -f trace/generated-tracers-dtrace.h* - rm -f $(foreach f,$(GENERATED_FILES),$(f) $(f)-timestamp) + 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 \ @@ -1032,7 +1030,7 @@ endif # CONFIG_WIN # rebuilt before other object files ifneq ($(wildcard config-host.mak),) ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if $(MAKECMDGOAL= S),,fail)) -Makefile: $(GENERATED_FILES) +Makefile: $(generated-files-y) endif endif =20 diff --git a/Makefile.target b/Makefile.target index ae02495951df..fdbe7c89f4a0 100644 --- a/Makefile.target +++ b/Makefile.target @@ -166,7 +166,7 @@ else obj-y +=3D hw/$(TARGET_BASE_ARCH)/ endif =20 -GENERATED_FILES +=3D hmp-commands.h hmp-commands-info.h +generated-files-y +=3D hmp-commands.h hmp-commands-info.h =20 endif # CONFIG_SOFTMMU =20 @@ -236,5 +236,5 @@ ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_DATA) $(QEMU_PROG)-log.stp "$(DESTDIR)$(qemu_datadir)/../system= tap/tapset/$(QEMU_PROG)-log.stp" endif =20 -GENERATED_FILES +=3D config-target.h -Makefile: $(GENERATED_FILES) +generated-files-y +=3D config-target.h +Makefile: $(generated-files-y) diff --git a/target/s390x/Makefile.objs b/target/s390x/Makefile.objs index 68eeee3d2f9b..312bf4f6baa0 100644 --- a/target/s390x/Makefile.objs +++ b/target/s390x/Makefile.objs @@ -12,7 +12,7 @@ obj-$(call lnot,$(CONFIG_TCG)) +=3D tcg-stub.o feat-src =3D $(SRC_PATH)/target/$(TARGET_BASE_ARCH)/ feat-dst =3D $(BUILD_DIR)/$(TARGET_DIR) ifneq ($(MAKECMDGOALS),clean) -GENERATED_FILES +=3D $(feat-dst)gen-features.h +generated-files-y +=3D $(feat-dst)gen-features.h endif =20 $(feat-dst)gen-features.h: $(feat-dst)gen-features.h-timestamp diff --git a/tests/Makefile.include b/tests/Makefile.include index 6b904d74303c..428a9eaaf762 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -468,19 +468,19 @@ qapi-schema +=3D unknown-expr-key.json =20 check-qapi-schema-y :=3D $(addprefix tests/qapi-schema/, $(qapi-schema)) =20 -GENERATED_FILES +=3D tests/test-qapi-types.h \ - tests/include/test-qapi-types-sub-module.h \ - tests/test-qapi-types-sub-sub-module.h \ - tests/test-qapi-visit.h \ - tests/include/test-qapi-visit-sub-module.h \ - tests/test-qapi-visit-sub-sub-module.h \ - tests/test-qapi-commands.h \ - tests/include/test-qapi-commands-sub-module.h \ - tests/test-qapi-commands-sub-sub-module.h \ - tests/test-qapi-events.h \ - tests/include/test-qapi-events-sub-module.h \ - tests/test-qapi-events-sub-sub-module.h \ - tests/test-qapi-introspect.h +generated-files-y +=3D tests/test-qapi-types.h +generated-files-y +=3D tests/include/test-qapi-types-sub-module.h +generated-files-y +=3D tests/test-qapi-types-sub-sub-module.h +generated-files-y +=3D tests/test-qapi-visit.h +generated-files-y +=3D tests/include/test-qapi-visit-sub-module.h +generated-files-y +=3D tests/test-qapi-visit-sub-sub-module.h +generated-files-y +=3D tests/test-qapi-commands.h +generated-files-y +=3D tests/include/test-qapi-commands-sub-module.h +generated-files-y +=3D tests/test-qapi-commands-sub-sub-module.h +generated-files-y +=3D tests/test-qapi-events.h +generated-files-y +=3D tests/include/test-qapi-events-sub-module.h +generated-files-y +=3D tests/test-qapi-events-sub-sub-module.h +generated-files-y +=3D tests/test-qapi-introspect.h =20 test-obj-y =3D tests/check-qnum.o tests/check-qstring.o tests/check-qdict.= o \ tests/check-qlist.o tests/check-qnull.o tests/check-qobject.o \ --=20 2.20.1 From nobody Sun Apr 28 03:14:31 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15541293531998.050847795974846; Mon, 1 Apr 2019 07:35:53 -0700 (PDT) Received: from localhost ([127.0.0.1]:40030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAy2P-0001SE-94 for importer@patchew.org; Mon, 01 Apr 2019 10:35:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAxgO-00064l-TI for qemu-devel@nongnu.org; Mon, 01 Apr 2019 10:13:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hAxgJ-0006wD-LR for qemu-devel@nongnu.org; Mon, 01 Apr 2019 10:13:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58678) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hAxgJ-0006w0-EE; Mon, 01 Apr 2019 10:12:59 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C14313082B71; Mon, 1 Apr 2019 14:12:58 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-116-235.ams2.redhat.com [10.36.116.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id C841E5D9C8; Mon, 1 Apr 2019 14:12:55 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 1 Apr 2019 16:12:20 +0200 Message-Id: <20190401141222.30034-4-lvivier@redhat.com> In-Reply-To: <20190401141222.30034-1-lvivier@redhat.com> References: <20190401141222.30034-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 01 Apr 2019 14:12:58 +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 v3 3/5] configure: qemu-ga is only needed with softmmu targets 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: Laurent Vivier , Thomas Huth , David Hildenbrand , Cornelia Huck , qemu-s390x@nongnu.org, Gerd Hoffmann , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Remove it from the list of tools if --disable-system and --disable-tools are used as we don't need it for linux-user targets. Suggested-by: Paolo Bonzini [lv: I also disable it with disable-tools, not only with disable-system] Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth --- configure | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 1c563a70276a..b627efede6cf 100755 --- a/configure +++ b/configure @@ -6083,7 +6083,9 @@ fi # Probe for guest agent support/options =20 if [ "$guest_agent" !=3D "no" ]; then - if [ "$linux" =3D "yes" -o "$bsd" =3D "yes" -o "$solaris" =3D "yes" -o "= $mingw32" =3D "yes" ] ; then + if [ "$softmmu" =3D no -a "$want_tools" =3D no ] ; then + guest_agent=3Dno + elif [ "$linux" =3D "yes" -o "$bsd" =3D "yes" -o "$solaris" =3D "yes" -o= "$mingw32" =3D "yes" ] ; then tools=3D"qemu-ga $tools" guest_agent=3Dyes elif [ "$guest_agent" !=3D yes ]; then --=20 2.20.1 From nobody Sun Apr 28 03:14:31 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554129100501553.1685649896613; Mon, 1 Apr 2019 07:31:40 -0700 (PDT) Received: from localhost ([127.0.0.1]:39045 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAxyI-0006fG-BX for importer@patchew.org; Mon, 01 Apr 2019 10:31:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAxgQ-00066p-34 for qemu-devel@nongnu.org; Mon, 01 Apr 2019 10:13:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hAxgO-0006xH-TI for qemu-devel@nongnu.org; Mon, 01 Apr 2019 10:13:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48760) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hAxgN-0006wh-1Z; Mon, 01 Apr 2019 10:13:04 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 542CD308427E; Mon, 1 Apr 2019 14:13:02 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-116-235.ams2.redhat.com [10.36.116.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 405BE5D9C8; Mon, 1 Apr 2019 14:12:59 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 1 Apr 2019 16:12:21 +0200 Message-Id: <20190401141222.30034-5-lvivier@redhat.com> In-Reply-To: <20190401141222.30034-1-lvivier@redhat.com> References: <20190401141222.30034-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 01 Apr 2019 14:13:02 +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 v3 4/5] build: chardev is only needed for softmmu targets 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: Laurent Vivier , Thomas Huth , David Hildenbrand , Cornelia Huck , qemu-s390x@nongnu.org, Gerd Hoffmann , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Move the dependency from SUBDIR_RULES to SOFTMMU_SUBDIR_RULES Suggested-by: Paolo Bonzini Signed-off-by: Laurent Vivier --- Makefile | 3 ++- Makefile.objs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 10ae5e31fc0a..d2de0b6e56cc 100644 --- a/Makefile +++ b/Makefile @@ -440,6 +440,7 @@ SOFTMMU_SUBDIR_RULES=3D$(filter %-softmmu,$(SUBDIR_RULE= S)) =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 @@ -475,7 +476,7 @@ subdir-capstone: .git-submodule-status subdir-slirp: .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)") =20 -$(SUBDIR_RULES): libqemuutil.a $(common-obj-y) $(chardev-obj-y) \ +$(SUBDIR_RULES): libqemuutil.a $(common-obj-y) \ $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY)) =20 ROMSUBDIR_RULES=3D$(patsubst %,romsubdir-%, $(ROMS)) diff --git a/Makefile.objs b/Makefile.objs index dda5bbc9101f..43c9e4503297 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -129,9 +129,9 @@ trace-events-subdirs +=3D accel/kvm trace-events-subdirs +=3D accel/tcg trace-events-subdirs +=3D authz trace-events-subdirs +=3D block -trace-events-subdirs +=3D chardev trace-events-subdirs +=3D crypto ifeq ($(CONFIG_SOFTMMU),y) +trace-events-subdirs +=3D chardev trace-events-subdirs +=3D audio trace-events-subdirs +=3D hw/9pfs trace-events-subdirs +=3D hw/acpi --=20 2.20.1 From nobody Sun Apr 28 03:14:31 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554129504414639.4711711008882; Mon, 1 Apr 2019 07:38:24 -0700 (PDT) Received: from localhost ([127.0.0.1]:40731 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAy4r-0003P1-FI for importer@patchew.org; Mon, 01 Apr 2019 10:38:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAxgh-0006VD-Bs for qemu-devel@nongnu.org; Mon, 01 Apr 2019 10:13:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hAxgf-00072t-Ms for qemu-devel@nongnu.org; Mon, 01 Apr 2019 10:13:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46304) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hAxgf-00072L-D0; Mon, 01 Apr 2019 10:13:21 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3C633821CB; Mon, 1 Apr 2019 14:13:18 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-116-235.ams2.redhat.com [10.36.116.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD6035D9C8; Mon, 1 Apr 2019 14:13:02 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 1 Apr 2019 16:12:22 +0200 Message-Id: <20190401141222.30034-6-lvivier@redhat.com> In-Reply-To: <20190401141222.30034-1-lvivier@redhat.com> References: <20190401141222.30034-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 01 Apr 2019 14:13:20 +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 v3 5/5] build: don't build hardware objects with linux-user 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: Laurent Vivier , Thomas Huth , David Hildenbrand , Cornelia Huck , Laurent Vivier , qemu-s390x@nongnu.org, Gerd Hoffmann , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Some objects are only needed for system emulation and tools. We can ignore them for the user mode case Update tests to run accordingly: conditionally build some tests on CONFIG_BLOCK. Some tests use components that are only built when softmmu or block tools are enabled, not for linux-user. So, if these components are not available, disable the tests. Signed-off-by: Laurent Vivier --- Makefile | 4 ++ Makefile.objs | 14 ++++--- tests/Makefile.include | 90 +++++++++++++++++++++--------------------- 3 files changed, 58 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index d2de0b6e56cc..ab6e8d00979b 100644 --- a/Makefile +++ b/Makefile @@ -87,6 +87,10 @@ endif =20 include $(SRC_PATH)/rules.mak =20 +# notempy and lor are defined in rules.mak +CONFIG_TOOLS :=3D $(call notempty,$(TOOLS)) +CONFIG_BLOCK :=3D $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)) + # Create QEMU_PKGVERSION and FULL_VERSION strings # If PKGVERSION is set, use that; otherwise get version and -dirty status = from git QEMU_PKGVERSION :=3D $(if $(PKGVERSION),$(PKGVERSION),$(shell \ diff --git a/Makefile.objs b/Makefile.objs index 43c9e4503297..2b0793ecc9ff 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -127,9 +127,17 @@ rdmacm-mux-obj-y =3D contrib/rdmacm-mux/ trace-events-subdirs =3D trace-events-subdirs +=3D accel/kvm trace-events-subdirs +=3D accel/tcg +trace-events-subdirs +=3D crypto +ifeq ($(CONFIG_USER_ONLY),y) +trace-events-subdirs +=3D linux-user +endif +ifeq ($(CONFIG_BLOCK),y) trace-events-subdirs +=3D authz trace-events-subdirs +=3D block -trace-events-subdirs +=3D crypto +trace-events-subdirs +=3D io +trace-events-subdirs +=3D nbd +trace-events-subdirs +=3D scsi +endif ifeq ($(CONFIG_SOFTMMU),y) trace-events-subdirs +=3D chardev trace-events-subdirs +=3D audio @@ -178,12 +186,8 @@ trace-events-subdirs +=3D net trace-events-subdirs +=3D ui endif trace-events-subdirs +=3D hw/display -trace-events-subdirs +=3D io -trace-events-subdirs +=3D linux-user -trace-events-subdirs +=3D nbd trace-events-subdirs +=3D qapi trace-events-subdirs +=3D qom -trace-events-subdirs +=3D scsi trace-events-subdirs +=3D target/arm trace-events-subdirs +=3D target/hppa trace-events-subdirs +=3D target/i386 diff --git a/tests/Makefile.include b/tests/Makefile.include index 428a9eaaf762..3be3be0b13cb 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -45,7 +45,7 @@ SYSEMU_TARGET_LIST :=3D $(subst -softmmu.mak,,$(notdir \ =20 check-unit-y +=3D tests/check-qdict$(EXESUF) check-unit-y +=3D tests/check-block-qdict$(EXESUF) -check-unit-y +=3D tests/test-char$(EXESUF) +check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-char$(EXESUF) check-unit-y +=3D tests/check-qnum$(EXESUF) check-unit-y +=3D tests/check-qstring$(EXESUF) check-unit-y +=3D tests/check-qlist$(EXESUF) @@ -61,21 +61,21 @@ check-unit-y +=3D tests/test-string-input-visitor$(EXES= UF) check-unit-y +=3D tests/test-string-output-visitor$(EXESUF) check-unit-y +=3D tests/test-qmp-event$(EXESUF) check-unit-y +=3D tests/test-opts-visitor$(EXESUF) -check-unit-y +=3D tests/test-coroutine$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-coroutine$(EXESUF) check-unit-y +=3D tests/test-visitor-serialization$(EXESUF) check-unit-y +=3D tests/test-iov$(EXESUF) -check-unit-y +=3D tests/test-aio$(EXESUF) -check-unit-y +=3D tests/test-aio-multithread$(EXESUF) -check-unit-y +=3D tests/test-throttle$(EXESUF) -check-unit-y +=3D tests/test-thread-pool$(EXESUF) -check-unit-y +=3D tests/test-hbitmap$(EXESUF) -check-unit-y +=3D tests/test-bdrv-drain$(EXESUF) -check-unit-y +=3D tests/test-bdrv-graph-mod$(EXESUF) -check-unit-y +=3D tests/test-blockjob$(EXESUF) -check-unit-y +=3D tests/test-blockjob-txn$(EXESUF) -check-unit-y +=3D tests/test-block-backend$(EXESUF) -check-unit-y +=3D tests/test-block-iothread$(EXESUF) -check-unit-y +=3D tests/test-image-locking$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-aio$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-aio-multithread$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-throttle$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-thread-pool$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-hbitmap$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-bdrv-drain$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-bdrv-graph-mod$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-blockjob$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-blockjob-txn$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-block-backend$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-block-iothread$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-image-locking$(EXESUF) check-unit-y +=3D tests/test-x86-cpuid$(EXESUF) # all code tested by test-x86-cpuid is inside topology.h ifeq ($(CONFIG_SOFTMMU),y) @@ -101,40 +101,40 @@ check-unit-y +=3D tests/check-qom-interface$(EXESUF) check-unit-y +=3D tests/check-qom-proplist$(EXESUF) check-unit-y +=3D tests/test-qemu-opts$(EXESUF) check-unit-y +=3D tests/test-keyval$(EXESUF) -check-unit-y +=3D tests/test-write-threshold$(EXESUF) -check-unit-y +=3D tests/test-crypto-hash$(EXESUF) -check-speed-y +=3D tests/benchmark-crypto-hash$(EXESUF) -check-unit-y +=3D tests/test-crypto-hmac$(EXESUF) -check-speed-y +=3D tests/benchmark-crypto-hmac$(EXESUF) -check-unit-y +=3D tests/test-crypto-cipher$(EXESUF) -check-speed-y +=3D tests/benchmark-crypto-cipher$(EXESUF) -check-unit-y +=3D tests/test-crypto-secret$(EXESUF) -check-unit-$(CONFIG_GNUTLS) +=3D tests/test-crypto-tlscredsx509$(EXESUF) -check-unit-$(CONFIG_GNUTLS) +=3D tests/test-crypto-tlssession$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-write-threshold$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-hash$(EXESUF) +check-speed-$(CONFIG_BLOCK) +=3D tests/benchmark-crypto-hash$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-hmac$(EXESUF) +check-speed-$(CONFIG_BLOCK) +=3D tests/benchmark-crypto-hmac$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-cipher$(EXESUF) +check-speed-$(CONFIG_BLOCK) +=3D tests/benchmark-crypto-cipher$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-secret$(EXESUF) +check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) +=3D tests/test-c= rypto-tlscredsx509$(EXESUF) +check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) +=3D tests/test-c= rypto-tlssession$(EXESUF) ifneq (,$(findstring qemu-ga,$(TOOLS))) check-unit-$(call land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) +=3D tests= /test-qga$(EXESUF) endif check-unit-y +=3D tests/test-timed-average$(EXESUF) check-unit-$(CONFIG_INOTIFY1) +=3D tests/test-util-filemonitor$(EXESUF) check-unit-y +=3D tests/test-util-sockets$(EXESUF) -check-unit-y +=3D tests/test-authz-simple$(EXESUF) -check-unit-y +=3D tests/test-authz-list$(EXESUF) -check-unit-y +=3D tests/test-authz-listfile$(EXESUF) -check-unit-$(CONFIG_AUTH_PAM) +=3D tests/test-authz-pam$(EXESUF) -check-unit-y +=3D tests/test-io-task$(EXESUF) -check-unit-y +=3D tests/test-io-channel-socket$(EXESUF) -check-unit-y +=3D tests/test-io-channel-file$(EXESUF) -check-unit-$(CONFIG_GNUTLS) +=3D tests/test-io-channel-tls$(EXESUF) -check-unit-y +=3D tests/test-io-channel-command$(EXESUF) -check-unit-y +=3D tests/test-io-channel-buffer$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-authz-simple$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-authz-list$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-authz-listfile$(EXESUF) +check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_AUTH_PAM)) +=3D tests/test= -authz-pam$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-io-task$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-io-channel-socket$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-io-channel-file$(EXESUF) +check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) +=3D tests/test-i= o-channel-tls$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-io-channel-command$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-io-channel-buffer$(EXESUF) check-unit-y +=3D tests/test-base64$(EXESUF) -check-unit-$(if $(CONFIG_NETTLE),y,$(CONFIG_GCRYPT)) +=3D tests/test-crypt= o-pbkdf$(EXESUF) -check-unit-y +=3D tests/test-crypto-ivgen$(EXESUF) -check-unit-y +=3D tests/test-crypto-afsplit$(EXESUF) -check-unit-y +=3D tests/test-crypto-xts$(EXESUF) -check-unit-y +=3D tests/test-crypto-block$(EXESUF) +check-unit-$(call land,$(CONFIG_BLOCK),$(if $(CONFIG_NETTLE),y,$(CONFIG_GC= RYPT))) +=3D tests/test-crypto-pbkdf$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-ivgen$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-afsplit$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-xts$(EXESUF) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-block$(EXESUF) check-unit-y +=3D tests/test-logging$(EXESUF) -check-unit-$(CONFIG_REPLICATION) +=3D tests/test-replication$(EXESUF) +check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_REPLICATION)) +=3D tests/t= est-replication$(EXESUF) check-unit-y +=3D tests/test-bufferiszero$(EXESUF) check-unit-y +=3D tests/test-uuid$(EXESUF) check-unit-y +=3D tests/ptimer-test$(EXESUF) @@ -515,11 +515,11 @@ test-qapi-obj-y =3D tests/test-qapi-types.o \ tests/test-qapi-visit-sub-sub-module.o \ tests/test-qapi-introspect.o \ $(test-qom-obj-y) -benchmark-crypto-obj-y =3D $(authz-obj-y) $(crypto-obj-y) $(test-qom-obj-y) -test-crypto-obj-y =3D $(authz-obj-y) $(crypto-obj-y) $(test-qom-obj-y) -test-io-obj-y =3D $(io-obj-y) $(test-crypto-obj-y) -test-authz-obj-y =3D $(test-qom-obj-y) $(authz-obj-y) -test-block-obj-y =3D $(block-obj-y) $(test-io-obj-y) tests/iothread.o +benchmark-crypto-obj-$(CONFIG_BLOCK) =3D $(authz-obj-y) $(crypto-obj-y) $(= test-qom-obj-y) +test-crypto-obj-$(CONFIG_BLOCK) =3D $(authz-obj-y) $(crypto-obj-y) $(test-= qom-obj-y) +test-io-obj-$(CONFIG_BLOCK) =3D $(io-obj-y) $(test-crypto-obj-y) +test-authz-obj-$(CONFIG_BLOCK) =3D $(test-qom-obj-y) $(authz-obj-y) +test-block-obj-$(CONFIG_BLOCK) =3D $(block-obj-y) $(test-io-obj-y) tests/i= othread.o =20 tests/check-qnum$(EXESUF): tests/check-qnum.o $(test-util-obj-y) tests/check-qstring$(EXESUF): tests/check-qstring.o $(test-util-obj-y) --=20 2.20.1