From patchwork Thu Mar 21 12:46:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1060083 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Q65W4Fq9z9s7h for ; Thu, 21 Mar 2019 23:47:59 +1100 (AEDT) Received: from localhost ([127.0.0.1]:36694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6x6z-0007LO-I5 for incoming@patchwork.ozlabs.org; Thu, 21 Mar 2019 08:47:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6x6E-0007K2-Gq for qemu-devel@nongnu.org; Thu, 21 Mar 2019 08:47:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6x69-0004zL-D8 for qemu-devel@nongnu.org; Thu, 21 Mar 2019 08:47:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38208) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6x65-0004u7-To for qemu-devel@nongnu.org; Thu, 21 Mar 2019 08:47:02 -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 DB870308623F for ; Thu, 21 Mar 2019 12:46:59 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-116-22.ams2.redhat.com [10.36.116.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECF7D5D9C5; Thu, 21 Mar 2019 12:46:53 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 21 Mar 2019 13:46:21 +0100 Message-Id: <20190321124624.26131-2-lvivier@redhat.com> In-Reply-To: <20190321124624.26131-1-lvivier@redhat.com> References: <20190321124624.26131-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.42]); Thu, 21 Mar 2019 12:46:59 +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 1/4] 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 , Gerd Hoffmann , Stefan Hajnoczi , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index cf065de5ed44..d90123f1d0a3 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -127,11 +127,12 @@ rdmacm-mux-obj-y = contrib/rdmacm-mux/ trace-events-subdirs = trace-events-subdirs += accel/kvm trace-events-subdirs += accel/tcg -trace-events-subdirs += audio trace-events-subdirs += authz trace-events-subdirs += block trace-events-subdirs += chardev trace-events-subdirs += crypto +ifeq ($(CONFIG_SOFTMMU),y) +trace-events-subdirs += audio trace-events-subdirs += hw/9pfs trace-events-subdirs += hw/acpi trace-events-subdirs += hw/alpha @@ -173,11 +174,13 @@ trace-events-subdirs += hw/virtio trace-events-subdirs += hw/watchdog trace-events-subdirs += hw/xen trace-events-subdirs += hw/gpio +trace-events-subdirs += migration +trace-events-subdirs += net +trace-events-subdirs += ui +endif trace-events-subdirs += io trace-events-subdirs += linux-user -trace-events-subdirs += migration trace-events-subdirs += nbd -trace-events-subdirs += net trace-events-subdirs += qapi trace-events-subdirs += qom trace-events-subdirs += scsi @@ -189,7 +192,6 @@ trace-events-subdirs += target/ppc trace-events-subdirs += target/riscv trace-events-subdirs += target/s390x trace-events-subdirs += target/sparc -trace-events-subdirs += ui trace-events-subdirs += util trace-events-files = $(SRC_PATH)/trace-events $(trace-events-subdirs:%=$(SRC_PATH)/%/trace-events) From patchwork Thu Mar 21 12:46:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1060084 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Q67c1dGcz9s7h for ; Thu, 21 Mar 2019 23:49:48 +1100 (AEDT) Received: from localhost ([127.0.0.1]:36716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6x8k-00008F-9E for incoming@patchwork.ozlabs.org; Thu, 21 Mar 2019 08:49:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6x6X-0007SE-MD for qemu-devel@nongnu.org; Thu, 21 Mar 2019 08:47:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6x6D-00052g-To for qemu-devel@nongnu.org; Thu, 21 Mar 2019 08:47:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59620) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6x69-0004x2-Cg for qemu-devel@nongnu.org; Thu, 21 Mar 2019 08:47:06 -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 3443E308FC20 for ; Thu, 21 Mar 2019 12:47:02 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-116-22.ams2.redhat.com [10.36.116.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3AD145D9CC; Thu, 21 Mar 2019 12:47:00 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 21 Mar 2019 13:46:22 +0100 Message-Id: <20190321124624.26131-3-lvivier@redhat.com> In-Reply-To: <20190321124624.26131-1-lvivier@redhat.com> References: <20190321124624.26131-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.43]); Thu, 21 Mar 2019 12:47:02 +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 2/4] ui: build keymap only 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 , Gerd Hoffmann , Stefan Hajnoczi , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" we don't need to generate the files for linux-user or for the tools Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index d8dad39c5db1..609fac844637 100644 --- a/Makefile +++ b/Makefile @@ -261,6 +261,7 @@ trace-dtrace-root.o: trace-dtrace-root.dtrace KEYCODEMAP_GEN = $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen KEYCODEMAP_CSV = $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv +ifdef CONFIG_SOFTMMU KEYCODEMAP_FILES = \ ui/input-keymap-atset1-to-qcode.c \ ui/input-keymap-linux-to-qcode.c \ @@ -295,6 +296,7 @@ ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/Makefile $(KEYCODEMAP_GEN): .git-submodule-status $(KEYCODEMAP_CSV): .git-submodule-status +endif # Don't try to regenerate Makefile or configure # We don't generate any of them From patchwork Thu Mar 21 12:46:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1060085 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Q6925PyDz9sQy for ; Thu, 21 Mar 2019 23:51:02 +1100 (AEDT) Received: from localhost ([127.0.0.1]:36756 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6x9w-000106-OJ for incoming@patchwork.ozlabs.org; Thu, 21 Mar 2019 08:51:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6x6Z-0007SG-O3 for qemu-devel@nongnu.org; Thu, 21 Mar 2019 08:47:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6x6G-00054C-FY for qemu-devel@nongnu.org; Thu, 21 Mar 2019 08:47:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38700) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6x6B-0004z0-1X for qemu-devel@nongnu.org; Thu, 21 Mar 2019 08:47:08 -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 7B3AE66983 for ; Thu, 21 Mar 2019 12:47:04 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-116-22.ams2.redhat.com [10.36.116.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88B8F5D9D2; Thu, 21 Mar 2019 12:47:02 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 21 Mar 2019 13:46:23 +0100 Message-Id: <20190321124624.26131-4-lvivier@redhat.com> In-Reply-To: <20190321124624.26131-1-lvivier@redhat.com> References: <20190321124624.26131-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.38]); Thu, 21 Mar 2019 12:47:04 +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 3/4] tools: edid-generate.c is part of the tools 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 , Gerd Hoffmann , Stefan Hajnoczi , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We don't need it for softmmu targets. This is needed for next patch that will build hw/ directory only for softmmu and not for tools. Signed-off-by: Laurent Vivier --- Makefile.objs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile.objs b/Makefile.objs index d90123f1d0a3..3538789808af 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -87,6 +87,11 @@ common-obj-y += qmp.o hmp.o common-obj-y += qapi/ endif +ifneq ($(CONFIG_USER_ONLY),y) +# hw/display/edid-generate.c is needed by qemu-edid +common-obj-y += hw/display/ +endif + ####################################################################### # Target-independent parts used in system and user emulation common-obj-y += cpus-common.o From patchwork Thu Mar 21 12:46:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1060086 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Q6Bl2G62z9sN8 for ; Thu, 21 Mar 2019 23:52:31 +1100 (AEDT) Received: from localhost ([127.0.0.1]:36775 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6xBN-0001ru-C3 for incoming@patchwork.ozlabs.org; Thu, 21 Mar 2019 08:52:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6x6k-0007Xv-Ia for qemu-devel@nongnu.org; Thu, 21 Mar 2019 08:47:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6x6g-0005OM-5m for qemu-devel@nongnu.org; Thu, 21 Mar 2019 08:47:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59782) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6x6d-00056j-Ls for qemu-devel@nongnu.org; Thu, 21 Mar 2019 08:47:36 -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 80995308FC20 for ; Thu, 21 Mar 2019 12:47:16 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-116-22.ams2.redhat.com [10.36.116.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC7F55D9D2; Thu, 21 Mar 2019 12:47:04 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 21 Mar 2019 13:46:24 +0100 Message-Id: <20190321124624.26131-5-lvivier@redhat.com> In-Reply-To: <20190321124624.26131-1-lvivier@redhat.com> References: <20190321124624.26131-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.43]); Thu, 21 Mar 2019 12:47:16 +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] 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 , Gerd Hoffmann , Stefan Hajnoczi , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Some objects are only needed for system emulation and tools. We can ignore them for the user mode case Update tests to run accordingly. Signed-off-by: Laurent Vivier --- Makefile.objs | 33 ++++++++++++++++----------------- tests/Makefile.include | 26 +++++++++++++++----------- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 3538789808af..5d4585c8e2f5 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -5,6 +5,12 @@ util-obj-y = util/ qobject/ qapi/ chardev-obj-y = chardev/ +qom-obj-y = qom/ + +crypto-obj-y = crypto/ +crypto-aes-obj-y = crypto/ + +ifneq ($(CONFIG_USER_ONLY),y) ####################################################################### # authz-obj-y is code used by both qemu system emulation and qemu-img @@ -21,21 +27,11 @@ block-obj-$(CONFIG_REPLICATION) += replication.o block-obj-m = block/ -####################################################################### -# crypto-obj-y is code used by both qemu system emulation and qemu-img - -crypto-obj-y = crypto/ -crypto-aes-obj-y = crypto/ - -####################################################################### -# qom-obj-y is code used by both qemu system emulation and qemu-img - -qom-obj-y = qom/ - ####################################################################### # io-obj-y is code used by both qemu system emulation and qemu-img io-obj-y = io/ +endif ###################################################################### # Target independent part of system emulation. The long term path is to @@ -132,10 +128,18 @@ rdmacm-mux-obj-y = contrib/rdmacm-mux/ trace-events-subdirs = trace-events-subdirs += accel/kvm trace-events-subdirs += accel/tcg +ifeq ($(CONFIG_USER_ONLY),y) +trace-events-subdirs += linux-user +else trace-events-subdirs += authz +trace-events-subdirs += nbd trace-events-subdirs += block -trace-events-subdirs += chardev +trace-events-subdirs += scsi +trace-events-subdirs += io +trace-events-subdirs += hw/display # needed by qemu-edid +endif trace-events-subdirs += crypto +trace-events-subdirs += chardev ifeq ($(CONFIG_SOFTMMU),y) trace-events-subdirs += audio trace-events-subdirs += hw/9pfs @@ -146,7 +150,6 @@ trace-events-subdirs += hw/audio trace-events-subdirs += hw/block trace-events-subdirs += hw/block/dataplane trace-events-subdirs += hw/char -trace-events-subdirs += hw/display trace-events-subdirs += hw/dma trace-events-subdirs += hw/hppa trace-events-subdirs += hw/i2c @@ -183,12 +186,8 @@ trace-events-subdirs += migration trace-events-subdirs += net trace-events-subdirs += ui endif -trace-events-subdirs += io -trace-events-subdirs += linux-user -trace-events-subdirs += nbd trace-events-subdirs += qapi trace-events-subdirs += qom -trace-events-subdirs += scsi trace-events-subdirs += target/arm trace-events-subdirs += target/hppa trace-events-subdirs += target/i386 diff --git a/tests/Makefile.include b/tests/Makefile.include index 852f17b8c79c..c147182fb052 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -45,7 +45,6 @@ SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \ check-unit-y += tests/check-qdict$(EXESUF) check-unit-y += tests/check-block-qdict$(EXESUF) -check-unit-y += tests/test-char$(EXESUF) check-unit-y += tests/check-qnum$(EXESUF) check-unit-y += tests/check-qstring$(EXESUF) check-unit-y += tests/check-qlist$(EXESUF) @@ -61,9 +60,12 @@ check-unit-y += tests/test-string-input-visitor$(EXESUF) check-unit-y += tests/test-string-output-visitor$(EXESUF) check-unit-y += tests/test-qmp-event$(EXESUF) check-unit-y += tests/test-opts-visitor$(EXESUF) -check-unit-y += tests/test-coroutine$(EXESUF) check-unit-y += tests/test-visitor-serialization$(EXESUF) check-unit-y += tests/test-iov$(EXESUF) +check-unit-y += tests/test-x86-cpuid$(EXESUF) +ifneq ($(CONFIG_USER_ONLY),y) +check-unit-y += tests/test-char$(EXESUF) +check-unit-y += tests/test-coroutine$(EXESUF) check-unit-y += tests/test-aio$(EXESUF) check-unit-y += tests/test-aio-multithread$(EXESUF) check-unit-y += tests/test-throttle$(EXESUF) @@ -76,7 +78,7 @@ check-unit-y += tests/test-blockjob-txn$(EXESUF) check-unit-y += tests/test-block-backend$(EXESUF) check-unit-y += tests/test-block-iothread$(EXESUF) check-unit-y += tests/test-image-locking$(EXESUF) -check-unit-y += tests/test-x86-cpuid$(EXESUF) +endif # all code tested by test-x86-cpuid is inside topology.h ifeq ($(CONFIG_SOFTMMU),y) check-unit-y += tests/test-xbzrle$(EXESUF) @@ -101,6 +103,14 @@ check-unit-y += tests/check-qom-interface$(EXESUF) check-unit-y += tests/check-qom-proplist$(EXESUF) check-unit-y += tests/test-qemu-opts$(EXESUF) check-unit-y += tests/test-keyval$(EXESUF) +ifneq (,$(findstring qemu-ga,$(TOOLS))) +check-unit-$(call land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF) +endif +check-unit-y += tests/test-timed-average$(EXESUF) +check-unit-$(CONFIG_INOTIFY1) += tests/test-util-filemonitor$(EXESUF) +check-unit-y += tests/test-util-sockets$(EXESUF) +check-unit-y += tests/test-base64$(EXESUF) +ifneq ($(CONFIG_USER_ONLY),y) check-unit-y += tests/test-write-threshold$(EXESUF) check-unit-y += tests/test-crypto-hash$(EXESUF) check-speed-y += tests/benchmark-crypto-hash$(EXESUF) @@ -111,12 +121,6 @@ check-speed-y += tests/benchmark-crypto-cipher$(EXESUF) check-unit-y += tests/test-crypto-secret$(EXESUF) check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlscredsx509$(EXESUF) check-unit-$(CONFIG_GNUTLS) += tests/test-crypto-tlssession$(EXESUF) -ifneq (,$(findstring qemu-ga,$(TOOLS))) -check-unit-$(call land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF) -endif -check-unit-y += tests/test-timed-average$(EXESUF) -check-unit-$(CONFIG_INOTIFY1) += tests/test-util-filemonitor$(EXESUF) -check-unit-y += tests/test-util-sockets$(EXESUF) check-unit-y += tests/test-authz-simple$(EXESUF) check-unit-y += tests/test-authz-list$(EXESUF) check-unit-y += tests/test-authz-listfile$(EXESUF) @@ -127,14 +131,14 @@ check-unit-y += tests/test-io-channel-file$(EXESUF) check-unit-$(CONFIG_GNUTLS) += tests/test-io-channel-tls$(EXESUF) check-unit-y += tests/test-io-channel-command$(EXESUF) check-unit-y += tests/test-io-channel-buffer$(EXESUF) -check-unit-y += tests/test-base64$(EXESUF) check-unit-$(if $(CONFIG_NETTLE),y,$(CONFIG_GCRYPT)) += tests/test-crypto-pbkdf$(EXESUF) check-unit-y += tests/test-crypto-ivgen$(EXESUF) check-unit-y += tests/test-crypto-afsplit$(EXESUF) check-unit-y += tests/test-crypto-xts$(EXESUF) check-unit-y += tests/test-crypto-block$(EXESUF) -check-unit-y += tests/test-logging$(EXESUF) check-unit-$(CONFIG_REPLICATION) += tests/test-replication$(EXESUF) +endif +check-unit-y += tests/test-logging$(EXESUF) check-unit-y += tests/test-bufferiszero$(EXESUF) check-unit-y += tests/test-uuid$(EXESUF) check-unit-y += tests/ptimer-test$(EXESUF)