From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599051659; cv=none; d=zohomail.com; s=zohoarc; b=KDPV73ruRuAs7FAJlcuuaJc3CPi1KBO2I2aT6K0AHdOFoO+k+R+I4G0Wr70H5bmUi1XzBmVoBD4wMAHGWItG/O0VlWE0fzg4i5qXviFIO/KCiLK/j1S1E6GpYuKF2WQkoBi43Ofl945rXJgfVCIvkP93a88MX06vXNVJWFmbzjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599051659; 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; bh=ToVJIl/N/QJy1DVq9D07nTMl7p5rtFZIuuC+zFhQ+SA=; b=R7BdnXcZXyB8Ec87eZycj/JLD9AVXYS60cEikC6JyJHN20idTqCj7UG9rz7VFehNRR8Yclrz1VZplhmbShm1i8L2NLjjfoS35XbquXzIzYvafdcpoqJcfb67UNtGG2F1mDPIZAoHuq8PXNQc+bsgAPWNpfcqTsUDp+eRASRlhJI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599051659027603.826340225418; Wed, 2 Sep 2020 06:00:59 -0700 (PDT) Received: from localhost ([::1]:49176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSNm-0007ep-6j for importer@patchew.org; Wed, 02 Sep 2020 09:00:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSML-0005sF-6a for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:28148 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 1kDSMJ-00074C-1d for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:28 -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-484-KB_KvkfVNJa05stwYzr3dA-1; Wed, 02 Sep 2020 08:59:23 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 266F55703E for ; Wed, 2 Sep 2020 12:59:19 +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 B978F5D9CC; Wed, 2 Sep 2020 12:59:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ToVJIl/N/QJy1DVq9D07nTMl7p5rtFZIuuC+zFhQ+SA=; b=F0eY0Qh//Whv/FYIdrdvoDLelK/w4NqYmnc6xWTucEEG57qPOdqGkznu34qf5BtwKD9cfs A7KKnJAIfA2d4SIcFaGgex3r5BTYmmL2hCa0fg+u0Z2Eq+3DROhWDOWCyNE2RwKt+nbh+9 gFbjv6Q6ojffx4o8psZoMXO8blTjiXs= X-MC-Unique: KB_KvkfVNJa05stwYzr3dA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 01/39] configure: Add system = 'linux' for meson when cross-compiling Date: Wed, 2 Sep 2020 08:58:39 -0400 Message-Id: <20200902125917.26021-2-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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/02 02:26:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: , Cc: Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Thomas Huth Meson needs the "system =3D xyz" line when cross-compiling. We are already adding a "system =3D 'windows'" for the MinGW cross-compilation case here, so let's add a "system =3D 'linux'" now for Linux hosts, too. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20200823111757.72002-2-thuth@redhat.com> Signed-off-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e --- configure | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure b/configure index 8a3acef89d..b58627f4aa 100755 --- a/configure +++ b/configure @@ -8163,6 +8163,9 @@ if test -n "$cross_prefix"; then ?:*) pre_prefix=3D/ ;; esac fi + if test "$linux" =3D "yes" ; then + echo "system =3D 'linux'" >> $cross + fi case "$ARCH" in i386|x86_64) echo "cpu_family =3D 'x86'" >> $cross --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599051782; cv=none; d=zohomail.com; s=zohoarc; b=BH0XcMx7fVsdf4lfMAkdFROQOodHqIijU4AbiqLMp0Lu9ooWIuSllq50Bj3q5x/RTnkwBSPgra03KIffoFyNpmo1CXVPG6LcnTNLR/PqAGwYxgRaV7oZ7oyc138p0ExWY4Aj/GBcucmClLdPXeTEhGAOD8hxiCTOnUn8S4Gl0CM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599051782; 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=f20Kgd0fTQlhIaQNRx25vbOQH4ri8oVzi6n+td6YziY=; b=K86bjYk/ilsTLIhPandhvqAT4eJJpuvtJh0aZLDOIwhpsdQrAZOwYE0dEO26O7Dplgobn6mUUiTiQoro4xr5SGr9gfdURMU5tFEQzVMUrgxdJEU5RU4zNbcEg+GqdIjuR/RJqyrlhw4W0Af1D5JM/KziwaVKTMijo22Lz1DfayU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599051782484302.2621214773503; Wed, 2 Sep 2020 06:03:02 -0700 (PDT) Received: from localhost ([::1]:57586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSPk-0002qo-V1 for importer@patchew.org; Wed, 02 Sep 2020 09:03:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSML-0005sG-8Y for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:41053 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 1kDSMJ-00074D-0M for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:28 -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-180-CFfeJOI4Mqiw9w_aTFSZsA-1; Wed, 02 Sep 2020 08:59:23 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 829685705B for ; Wed, 2 Sep 2020 12:59:19 +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 4720C5D9CC for ; Wed, 2 Sep 2020 12:59:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f20Kgd0fTQlhIaQNRx25vbOQH4ri8oVzi6n+td6YziY=; b=UMKXS/dUf1HzN/fe5KybpO5afJUomoqrKxVwvEE9c7GVr/p3DqUqE10rxfKQVxotVOXPEM vGB+SjzVkR84w6x1BUrbXdUn1At1aRHv/xsqiyTfVf9o+fVO1yhhhPBsKgMopi54tU2nM6 uSWoSbGL7yiDK0urt17F65uoVvMv2+w= X-MC-Unique: CFfeJOI4Mqiw9w_aTFSZsA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 02/39] mtest2make: split environment from test command Date: Wed, 2 Sep 2020 08:58:40 -0400 Message-Id: <20200902125917.26021-3-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 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/02 02:26:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Pass the environment and test command in separate macro arguments, so that we will be able to insert a test driver in the next patch. Signed-off-by: Paolo Bonzini --- scripts/mtest2make.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index d7a51bf97e..f4ee4d3994 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -19,16 +19,16 @@ class Suite(object): print(''' SPEED =3D quick =20 -# $1 =3D test command, $2 =3D test name -.test-human-tap =3D $1 < /dev/null | ./scripts/tap-driver.pl --test-name= =3D"$2" $(if $(V),,--show-failures-only) -.test-human-exitcode =3D $1 < /dev/null -.test-tap-tap =3D $1 < /dev/null | sed "s/^[a-z][a-z]* [0-9]*/& $2/" || tr= ue -.test-tap-exitcode =3D printf "%s\\n" 1..1 "`$1 < /dev/null > /dev/null ||= echo "not "`ok 1 $2" -.test.print =3D echo $(if $(V),'$1','Running test $2') >&3 +# $1 =3D environment, $2 =3D test command, $3 =3D test name +.test-human-tap =3D $1 $2 < /dev/null | ./scripts/tap-driver.pl --test-nam= e=3D"$3" $(if $(V),,--show-failures-only) +.test-human-exitcode =3D $1 $2 < /dev/null +.test-tap-tap =3D $1 $2 < /dev/null | sed "s/^[a-z][a-z]* [0-9]*/& $3/" ||= true +.test-tap-exitcode =3D printf "%s\\n" 1..1 "`$1 $2 < /dev/null > /dev/null= || echo "not "`ok 1 $3" +.test.print =3D echo $(if $(V),'$1 $2','Running test $3') >&3 .test.env =3D MALLOC_PERTURB_=3D$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 2= 55 + 1))} =20 # $1 =3D test name, $2 =3D test target (human or tap) -.test.run =3D $(call .test.print,$(.test.cmd.$1),$(.test.name.$1)) && $(ca= ll .test-$2-$(.test.driver.$1),$(.test.cmd.$1),$(.test.name.$1)) +.test.run =3D $(call .test.print,$(.test.env.$1),$(.test.cmd.$1),$(.test.n= ame.$1)) && $(call .test-$2-$(.test.driver.$1),$(.test.env.$1),$(.test.cmd.= $1),$(.test.name.$1)) =20 define .test.human_k @exec 3>&1; rc=3D0; $(foreach TEST, $1, $(call .test.run,$(TEST),h= uman) || rc=3D$$?;) \\ @@ -65,7 +65,7 @@ for test in json.load(sys.stdin): test['cmd'][0] =3D executable else: test['cmd'][0] =3D executable - cmd =3D '$(.test.env) %s %s' % (env, ' '.join((shlex.quote(x) for x in= test['cmd']))) + cmd =3D ' '.join((shlex.quote(x) for x in test['cmd'])) if test['workdir'] is not None: cmd =3D '(cd %s && %s)' % (shlex.quote(test['workdir']), cmd) driver =3D test['protocol'] if 'protocol' in test else 'exitcode' @@ -73,6 +73,7 @@ for test in json.load(sys.stdin): i +=3D 1 print('.test.name.%d :=3D %s' % (i, test['name'])) print('.test.driver.%d :=3D %s' % (i, driver)) + print('.test.env.%d :=3D $(.test.env) %s' % (i, env)) print('.test.cmd.%d :=3D %s' % (i, cmd)) =20 test_suites =3D test['suite'] or ['default'] --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599051665; cv=none; d=zohomail.com; s=zohoarc; b=nis6HrvJHk4wG7gAZDlAshYZoqId3+5WsqsrMQ8DleNalGt/NsctMONVEIgBFp39QSvLw/KzkFiNHhvD6ZveW/WF1NbpbkZK1J7igQzjKzqt94oaGt+hVBh/eSKWKoUMFhWOvIbjG5JlF7sS8Kv3JMXcI6GJdAi9SBVihTb5DbE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599051665; 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=/9kMc9+jF8y1oa6oa9FhwzamoYL7mMegG8SjpygQ5/Q=; b=FqAmZfy4QuwExiSmdeC10/SCbpUdTwXPsrQ3eP3XxIogXvjr0bO5CZm8mOxBhk1s1WKvH4RT3WF+PU35/kVlMcYZj3Oi4HAvL4vNzfBOpoEsD2JR1R2iG6eCXkOHeYE1ClL+aouciXHXJAgDq8/o2+92K+hLx+NM9xEHpUh36MI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599051665302307.7441531504253; Wed, 2 Sep 2020 06:01:05 -0700 (PDT) Received: from localhost ([::1]:49306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSNn-0007o8-Si for importer@patchew.org; Wed, 02 Sep 2020 09:00:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36642) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMM-0005sc-O3 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:24970) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDSMK-00074Q-IT for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:30 -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-528-_aHFBcV5OFSX2-ebmZ4IPw-1; Wed, 02 Sep 2020 08:59:25 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id DE257107466C for ; Wed, 2 Sep 2020 12:59:19 +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 A32E25D9CC for ; Wed, 2 Sep 2020 12:59:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/9kMc9+jF8y1oa6oa9FhwzamoYL7mMegG8SjpygQ5/Q=; b=dzmb5api9S55Wg8hhrUTpTAjfayKz8HN7XpT9h3CY1XTiP9rOLNRvSGkK/iOYEaQ7oFtdW AdfK3FQk2hMF+80ORIUoa2jpb1AgNHvvPjXcEeMBmSo/O7NMcmqHOKKMyG6bcLQ00lmcMM 9cl/b4HGWewt/NAZUq39vB0ZlVUL52E= X-MC-Unique: _aHFBcV5OFSX2-ebmZ4IPw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 03/39] mtest2make: split working directory from test command Date: Wed, 2 Sep 2020 08:58:41 -0400 Message-Id: <20200902125917.26021-4-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:42:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Pass the working directory and test command in separate macro arguments, so that we will be able to insert a test driver in the next patch. Signed-off-by: Paolo Bonzini --- scripts/mtest2make.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index f4ee4d3994..c709b37f28 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -19,16 +19,16 @@ class Suite(object): print(''' SPEED =3D quick =20 -# $1 =3D environment, $2 =3D test command, $3 =3D test name -.test-human-tap =3D $1 $2 < /dev/null | ./scripts/tap-driver.pl --test-nam= e=3D"$3" $(if $(V),,--show-failures-only) -.test-human-exitcode =3D $1 $2 < /dev/null -.test-tap-tap =3D $1 $2 < /dev/null | sed "s/^[a-z][a-z]* [0-9]*/& $3/" ||= true -.test-tap-exitcode =3D printf "%s\\n" 1..1 "`$1 $2 < /dev/null > /dev/null= || echo "not "`ok 1 $3" +# $1 =3D environment, $2 =3D test command, $3 =3D test name, $4 =3D dir +.test-human-tap =3D $1 $(if $4,(cd $4 && $2),$2) < /dev/null | ./scripts/t= ap-driver.pl --test-name=3D"$3" $(if $(V),,--show-failures-only) +.test-human-exitcode =3D $1 $(if $4,(cd $4 && $2),$2) < /dev/null +.test-tap-tap =3D $1 $(if $4,(cd $4 && $2),$2) < /dev/null | sed "s/^[a-z]= [a-z]* [0-9]*/& $3/" || true +.test-tap-exitcode =3D printf "%s\\n" 1..1 "`$1 $(if $4,(cd $4 && $2),$2) = < /dev/null > /dev/null || echo "not "`ok 1 $3" .test.print =3D echo $(if $(V),'$1 $2','Running test $3') >&3 .test.env =3D MALLOC_PERTURB_=3D$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 2= 55 + 1))} =20 # $1 =3D test name, $2 =3D test target (human or tap) -.test.run =3D $(call .test.print,$(.test.env.$1),$(.test.cmd.$1),$(.test.n= ame.$1)) && $(call .test-$2-$(.test.driver.$1),$(.test.env.$1),$(.test.cmd.= $1),$(.test.name.$1)) +.test.run =3D $(call .test.print,$(.test.env.$1),$(.test.cmd.$1),$(.test.n= ame.$1)) && $(call .test-$2-$(.test.driver.$1),$(.test.env.$1),$(.test.cmd.= $1),$(.test.name.$1),$(.test.dir.$1)) =20 define .test.human_k @exec 3>&1; rc=3D0; $(foreach TEST, $1, $(call .test.run,$(TEST),h= uman) || rc=3D$$?;) \\ @@ -66,11 +66,11 @@ for test in json.load(sys.stdin): else: test['cmd'][0] =3D executable cmd =3D ' '.join((shlex.quote(x) for x in test['cmd'])) - if test['workdir'] is not None: - cmd =3D '(cd %s && %s)' % (shlex.quote(test['workdir']), cmd) driver =3D test['protocol'] if 'protocol' in test else 'exitcode' =20 i +=3D 1 + if test['workdir'] is not None: + print('.test.dir.%d :=3D %s' % (i, shlex.quote(test['workdir']))) print('.test.name.%d :=3D %s' % (i, test['name'])) print('.test.driver.%d :=3D %s' % (i, driver)) print('.test.env.%d :=3D $(.test.env) %s' % (i, env)) --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052374; cv=none; d=zohomail.com; s=zohoarc; b=lvq833Kyy71xappUjhrdrBHYpWE0LvsvzF8bIQ2K07X8IkPW+AKdl1KuTJDbWfL1nh4x44pzSQrBJhRE72ViVGjjnssCNKclre3Gh0Leep1IPxLAjhDqv+dG6KRu2maB2zQFfMPunO9tzMdM2E3SVCv2+oXR/B1JHGvkIkf/1Oc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052374; 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=gnhNI53pp0I160tRA3kVNiu0HLRb2ej6NXMxcodi4J4=; b=NKFXS6dqUGXm6D8fWADoi9X8Jxczs03fj3aQIT0Ngs/6ZI5n6r4p66LSwMcHI85KbUYsr1S8VBisyIWfIhBFzl04oxsTTsIzkT6UjHJZNUvff4fP+vDVgNbbJpw/PMK9IM59V4NFoCZKT/x38BCt2OOcI3KGocvnkGkIMr2qwYk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052374066970.9326585693332; Wed, 2 Sep 2020 06:12:54 -0700 (PDT) Received: from localhost ([::1]:52284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSZJ-0006zx-4Y for importer@patchew.org; Wed, 02 Sep 2020 09:12:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMW-0006F5-DC for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53052) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDSMT-00079N-8B for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:40 -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-499-0rE1HoluPYy_z2gOAYiQOw-1; Wed, 02 Sep 2020 08:59:25 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 485CC80046A for ; Wed, 2 Sep 2020 12:59:20 +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 0ABE65D9CC for ; Wed, 2 Sep 2020 12:59:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gnhNI53pp0I160tRA3kVNiu0HLRb2ej6NXMxcodi4J4=; b=c1WAq9gS69lh8JRmE60FHf8hkKZDGBZ4KcpdnWMMWkPcna9OCE/pzM7Frs6Cy6R8eKp9u7 X4XxAc5lCD45hR32OBCMwsfylxnqarCf67ujg1h67RNhJo19LpPEbExuCJRSIsv2FHy3k4 RUVaefrpBWcfj/hBIqFEC2JlRuUqWUQ= X-MC-Unique: 0rE1HoluPYy_z2gOAYiQOw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 04/39] mtest2make: hide output of successful tests Date: Wed, 2 Sep 2020 08:58:42 -0400 Message-Id: <20200902125917.26021-5-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 01:13:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The softfloat tests are quite noisy; before the Meson conversion they buffered the output in a file and emitted the output only if the test failed. Tweak mtest2make.py so that the courtesy is extended to all non-TAP tests. Signed-off-by: Paolo Bonzini --- scripts/mtest2make.py | 2 +- scripts/test-driver.py | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 scripts/test-driver.py diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index c709b37f28..27425080cf 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -21,7 +21,7 @@ SPEED =3D quick =20 # $1 =3D environment, $2 =3D test command, $3 =3D test name, $4 =3D dir .test-human-tap =3D $1 $(if $4,(cd $4 && $2),$2) < /dev/null | ./scripts/t= ap-driver.pl --test-name=3D"$3" $(if $(V),,--show-failures-only) -.test-human-exitcode =3D $1 $(if $4,(cd $4 && $2),$2) < /dev/null +.test-human-exitcode =3D $1 $(PYTHON) scripts/test-driver.py $(if $4,-C$4)= $(if $(V),--verbose) -- $2 < /dev/null .test-tap-tap =3D $1 $(if $4,(cd $4 && $2),$2) < /dev/null | sed "s/^[a-z]= [a-z]* [0-9]*/& $3/" || true .test-tap-exitcode =3D printf "%s\\n" 1..1 "`$1 $(if $4,(cd $4 && $2),$2) = < /dev/null > /dev/null || echo "not "`ok 1 $3" .test.print =3D echo $(if $(V),'$1 $2','Running test $3') >&3 diff --git a/scripts/test-driver.py b/scripts/test-driver.py new file mode 100644 index 0000000000..eef74b29a8 --- /dev/null +++ b/scripts/test-driver.py @@ -0,0 +1,35 @@ +#! /usr/bin/env python3 + +# Wrapper for tests that hides the output if they succeed. +# Used by "make check" +# +# Copyright (C) 2020 Red Hat, Inc. +# +# Author: Paolo Bonzini + +import subprocess +import sys +import os +import argparse + +parser =3D argparse.ArgumentParser(description=3D'Test driver for QEMU') +parser.add_argument('-C', metavar=3D'DIR', dest=3D'dir', default=3D'.', + help=3D'change to DIR before doing anything else') +parser.add_argument('-v', '--verbose', dest=3D'verbose', action=3D'store_t= rue', + help=3D'be more verbose') +parser.add_argument('test_args', nargs=3Dargparse.REMAINDER) + +args =3D parser.parse_args() +os.chdir(args.dir) + +test_args =3D args.test_args +if test_args[0] =3D=3D '--': + test_args =3D test_args[1:] + +if args.verbose: + result =3D subprocess.run(test_args, stdout=3DNone, stderr=3DNone) +else: + result =3D subprocess.run(test_args, stdout=3Dsubprocess.PIPE, stderr= =3Dsubprocess.STDOUT) + if result.returncode: + sys.stdout.buffer.write(result.stdout) +sys.exit(result.returncode) --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599051887; cv=none; d=zohomail.com; s=zohoarc; b=aGJCzDY5fokWG02Cx27Ju8xApXsQNw3iojCWNqe1tFDgZP+u2nd7B/EKSRKU1iNQSumhXpsmebBjw7O5dWT4speZSU3h9TuTh3wH5sMpjzRiGUPaCHZJjC+wfzYpTmJ28Htz9gvDz2CgasKTaPZGhCeOEjbcmiZQL6yZiv3aI40= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599051887; 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=R/KpsoOA/jYXuLHzmNIdRXqyeSpxnSoo7Xv2fhUCAzM=; b=b5DPDalhBdQ8LOTxHafEBa/PE3Vn592Fnwsh5+qlzFTEnwOoOpcvVq2lpf0dXiSv9mZf0vZIGSDIW4buC+XklvK1VX/BhU2xpRMgKVw4aS3WN6tY+KlHxfa9xEut22k6dtlIzB+vsDgTZ9aRKJMEWENcFoeUjYxKy1AZWkEbfso= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599051887765366.53118354622904; Wed, 2 Sep 2020 06:04:47 -0700 (PDT) Received: from localhost ([::1]:38480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSRS-0006hx-Pk for importer@patchew.org; Wed, 02 Sep 2020 09:04:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMQ-0005zn-NU for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:34 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:56810 helo=us-smtp-delivery-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 1kDSMM-000759-Oj for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:34 -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-457-lEwFHslZNxG6lM9i6Ex73A-1; Wed, 02 Sep 2020 08:59:26 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id A49ED1084CA6 for ; Wed, 2 Sep 2020 12:59:20 +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 692A55D9CC for ; Wed, 2 Sep 2020 12:59:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R/KpsoOA/jYXuLHzmNIdRXqyeSpxnSoo7Xv2fhUCAzM=; b=GHrEZouFTbDxRDpEdRwr8pO5QCAprQ14A4d+b6WYtG+SRKmyoMPT1nuSTaeLCzpmcmocvi ehLbP1ft+dj/nocKpARmhjT+o7TBlSPmZX9JPqtAnnjPXJ9vMitZU5VaJeNCW98EAsBwHq VG4NrUhyeuR+ACmUV4Gwh+5SIlNnfbA= X-MC-Unique: lEwFHslZNxG6lM9i6Ex73A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 05/39] mtest2make: unify tests that appear in multiple suites Date: Wed, 2 Sep 2020 08:58:43 -0400 Message-Id: <20200902125917.26021-6-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 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=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:33:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Whenever a test appears in multiple suites, the rules generated by mtest2make are currently running it twice. Instead, after this patch we generate a phony target for each test and we have a generic "run-tests" target depend on all the tests that were chosen on the command line. Tests that appear in multiple suites will be added to the prerequisites just once. This has other advantages: it removes the handling of -k and it increases parallelism. Signed-off-by: Paolo Bonzini --- scripts/mtest2make.py | 69 ++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 27425080cf..e5dcb66bf7 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -24,33 +24,20 @@ SPEED =3D quick .test-human-exitcode =3D $1 $(PYTHON) scripts/test-driver.py $(if $4,-C$4)= $(if $(V),--verbose) -- $2 < /dev/null .test-tap-tap =3D $1 $(if $4,(cd $4 && $2),$2) < /dev/null | sed "s/^[a-z]= [a-z]* [0-9]*/& $3/" || true .test-tap-exitcode =3D printf "%s\\n" 1..1 "`$1 $(if $4,(cd $4 && $2),$2) = < /dev/null > /dev/null || echo "not "`ok 1 $3" -.test.print =3D echo $(if $(V),'$1 $2','Running test $3') >&3 +.test.human-print =3D echo $(if $(V),'$1 $2','Running test $3') && .test.env =3D MALLOC_PERTURB_=3D$${MALLOC_PERTURB_:-$$(( $${RANDOM:-0} % 2= 55 + 1))} =20 # $1 =3D test name, $2 =3D test target (human or tap) -.test.run =3D $(call .test.print,$(.test.env.$1),$(.test.cmd.$1),$(.test.n= ame.$1)) && $(call .test-$2-$(.test.driver.$1),$(.test.env.$1),$(.test.cmd.= $1),$(.test.name.$1),$(.test.dir.$1)) +.test.run =3D $(call .test.$2-print,$(.test.env.$1),$(.test.cmd.$1),$(.tes= t.name.$1)) $(call .test-$2-$(.test.driver.$1),$(.test.env.$1),$(.test.cmd.= $1),$(.test.name.$1),$(.test.dir.$1)) =20 -define .test.human_k - @exec 3>&1; rc=3D0; $(foreach TEST, $1, $(call .test.run,$(TEST),h= uman) || rc=3D$$?;) \\ - exit $$rc -endef -define .test.human_no_k - $(foreach TEST, $1, @exec 3>&1; $(call .test.run,$(TEST),human) -) -endef -.test.human =3D \\ - $(if $(findstring k, $(MAKEFLAGS)), $(.test.human_k), $(.test.huma= n_no_k)) - -define .test.tap - @exec 3>&1; { $(foreach TEST, $1, $(call .test.run,$(TEST),tap); )= } \\ - | ./scripts/tap-merge.pl | tee "$@" \\ - | ./scripts/tap-driver.pl $(if $(V),, --show-failures-only) -endef +.test.output-format =3D human ''') =20 -suites =3D defaultdict(Suite) +introspect =3D json.load(sys.stdin) i =3D 0 -for test in json.load(sys.stdin): + +def process_tests(test, suites): + global i env =3D ' '.join(('%s=3D%s' % (shlex.quote(k), shlex.quote(v)) for k, v in test['env'].items())) executable =3D test['cmd'][0] @@ -89,22 +76,36 @@ for test in json.load(sys.stdin): suites[s].tests.append(i) suites[s].executables.add(executable) =20 -print('.PHONY: check check-report.tap') -print('check:') -print('check-report.tap:') -print('\t@cat $^ | scripts/tap-merge.pl >$@') -for name, suite in suites.items(): +def emit_prolog(suites, prefix): + all_tap =3D ' '.join(('%s-report-%s.tap' % (prefix, k) for k in suites= .keys())) + print('.PHONY: %s %s-report.tap %s' % (prefix, prefix, all_tap)) + print('%s: run-tests' % (prefix,)) + print('%s-report.tap %s: %s-report%%.tap:' % (prefix, all_tap, prefix)) + print('''\t$(MAKE) .test.output-format=3Dtap -Otarget check$* | ./scri= pts/tap-merge.pl | tee "$@" \\ + | ./scripts/tap-driver.pl $(if $(V),, --show-failures-only)'= '') + +def emit_suite(name, suite, prefix): executables =3D ' '.join(suite.executables) slow_test_numbers =3D ' '.join((str(x) for x in suite.slow_tests)) test_numbers =3D ' '.join((str(x) for x in suite.tests)) print('.test.suite-quick.%s :=3D %s' % (name, test_numbers)) print('.test.suite-slow.%s :=3D $(.test.suite-quick.%s) %s' % (name, n= ame, slow_test_numbers)) - print('check-build: %s' % executables) - print('.PHONY: check-%s' % name) - print('.PHONY: check-report-%s.tap' % name) - print('check: check-%s' % name) - print('check-%s: all %s' % (name, executables)) - print('\t$(call .test.human, $(.test.suite-$(SPEED).%s))' % (name, )) - print('check-report.tap: check-report-%s.tap' % name) - print('check-report-%s.tap: %s' % (name, executables)) - print('\t$(call .test.tap, $(.test.suite-$(SPEED).%s))' % (name, )) + print('%s-build: %s' % (prefix, executables)) + print('.PHONY: %s-%s' % (prefix, name)) + print('.PHONY: %s-report-%s.tap' % (prefix, name)) + print('%s-%s: run-tests' % (prefix, name)) + print('ifneq ($(filter check check-%s, $(MAKECMDGOALS)),)' % name) + print('.tests +=3D $(.test.suite-$(SPEED).%s)' % name) + print('endif') + +testsuites =3D defaultdict(Suite) +for test in introspect: + process_tests(test, testsuites) +emit_prolog(testsuites, 'check') +for name, suite in testsuites.items(): + emit_suite(name, suite, 'check') + +print('.PHONY: $(patsubst %, run-test-%, $(.tests))') +print('$(patsubst %, run-test-%, $(sort $(.tests))): run-test-%: all') +print('\t@$(call .test.run,$*,$(.test.output-format))') +print('run-tests: $(patsubst %, run-test-%, $(.tests))') --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599051867; cv=none; d=zohomail.com; s=zohoarc; b=lpsUxvUo18bDjTz/XpWSaJLNtS2no0/ByoUF1PGmwz+8EW7ji57seJI6YMr69XGZdOnNFRSNBu1z5tzOkNyPqjHBweXl8/7PcqFGA2132wX/NuMndoEazTKKS3KeWvSTMNPq+7S+4eTKHQBNeCmRUScy8uiFSWQhsvqaar6+WC0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599051867; 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=rn8x2b+cH/3wuinFOjLrmOQ6nTygcEc4MOrlfPs/lwo=; b=X5xYNkIbBPDWfH9ZrjYXE8o3VMyZE/HJ7TYZpL39O7ubqg2q64tCfLIY8g4CKkLGLrvjejn00Qs3Xrm3kxAa4sAUlG3k99lgIoxB7fJnwuwBZnU53P+Kiumd57sFBJjJXvt6UQAJfOg4ibybgS6UZPAkRSevM2lAKd7O8c2HOOI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 159905186764798.02665982076871; Wed, 2 Sep 2020 06:04:27 -0700 (PDT) Received: from localhost ([::1]:37956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSR8-0006V1-HV for importer@patchew.org; Wed, 02 Sep 2020 09:04:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMP-0005w8-3H for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:33 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:48420 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 1kDSMM-00075Q-Sb for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:32 -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-457-2-JTgJH_OKO_Ig4KfFndrw-1; Wed, 02 Sep 2020 08:59:26 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0C4C51084CA7 for ; Wed, 2 Sep 2020 12:59:21 +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 C55455D9CC for ; Wed, 2 Sep 2020 12:59:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rn8x2b+cH/3wuinFOjLrmOQ6nTygcEc4MOrlfPs/lwo=; b=XBsxsAImga5V0xl3DWNY1gJGm2NT4jJ17FkYAQ/GHPwpbCjGqKwk/ClEtc/ZIe6KhDiYwN 1HYTbcC7rUAGOp0xZnO65rrYtDKOexWptbvz7R9U//0S4mOm0eTKlpYyKET7QQ5t/WQ13r 7BvuxSuLBpDN9sCas8wAL2hB1hEgcY4= X-MC-Unique: 2-JTgJH_OKO_Ig4KfFndrw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 06/39] meson: remove b_lundef option Date: Wed, 2 Sep 2020 08:58:44 -0400 Message-Id: <20200902125917.26021-7-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 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=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:07:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Meson automatically adds "-undefined dynamic_lookup" to shared_module build targets; b_lundef is only needed for executables. Therefore, we can remove this option. Signed-off-by: Paolo Bonzini --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 356af9142c..f7b57315ef 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('qemu', ['c'], meson_version: '>=3D0.55.0', default_options: ['warning_level=3D1', 'c_std=3Dgnu99', 'cpp_std= =3Dgnu++11', - 'b_lundef=3Dfalse','b_colorout=3Dauto'], + 'b_colorout=3Dauto'], version: run_command('head', meson.source_root() / 'VERSION').stdo= ut().strip()) =20 not_found =3D dependency('', required: false) --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599051783; cv=none; d=zohomail.com; s=zohoarc; b=a/DnHgWUeu8Kuw+8nlyp5M78rU06iZUPs6rQQIQJv1O5L806Ga4tnK1IywPMnNH5BhLvvMnRfC/1wYbFUa2om8NUTxUMEXxdj+SuIQxIA6qziMWVH7aIg74Ay76XYZwJpYZrmB3tlrwSVDnw1IEqj9yzamhbexLIHoEAUrQMAus= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599051783; 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; bh=zt1rvWNfvYUTrIRS6rmWcmMR6imDHaK2I051ZPscHHc=; b=WDHrNtOctbab1XmDwnnjDxcXI4JQmU9Jcwcov/lwMI7NuWPAsmyig+QCk34JpQSe1LfDT1Ux/RUPF2WdmClC/F1DJw0CByZk6t/Bmv+KOho1qDD/H5DFyoJTMFDOUjfcyKTknqr/XGdppjI4hrdWaGwpsMB4/CpUvG490aUcBjU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599051783362507.91805026318264; Wed, 2 Sep 2020 06:03:03 -0700 (PDT) Received: from localhost ([::1]:57754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSPm-0002uu-IE for importer@patchew.org; Wed, 02 Sep 2020 09:03:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMN-0005tM-B1 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:31 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:48560 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 1kDSML-00074W-07 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:31 -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-338-XnpwqAxwOkqwBFtYpIRgBQ-1; Wed, 02 Sep 2020 08:59:26 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7AB071084CA9; Wed, 2 Sep 2020 12:59:21 +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 2D39A5D9CC; Wed, 2 Sep 2020 12:59:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zt1rvWNfvYUTrIRS6rmWcmMR6imDHaK2I051ZPscHHc=; b=Tr47aTGF8X4NCudZgGgLVFgi5sYVfePuFGDusAEjPy7JadgynhZw+tfknx0ci7sa6LQxtf FYwOwOycL7M7/CNt/TILExRlwpuXvPuVgClybHYayL7867bYGvuB+pPAfUrJXjTj9967Et GdgkUDXwrj2cAT0Vc3rf3/uQ+TTMsr4= X-MC-Unique: XnpwqAxwOkqwBFtYpIRgBQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 07/39] configure: do not include absolute paths in -I and -L paths Date: Wed, 2 Sep 2020 08:58:45 -0400 Message-Id: <20200902125917.26021-8-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 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/02 02:26:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: , Cc: Mark Cave-Ayland Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" On msys2, paths such as -L/e/path/to/qemu are not recognized by the linker. Fortunately we do not need absolute paths at all in a non-recursive build system. Tested-by: Mark Cave-Ayland Signed-off-by: Paolo Bonzini --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index b58627f4aa..131a9e518b 100755 --- a/configure +++ b/configure @@ -943,7 +943,7 @@ Linux) linux=3D"yes" linux_user=3D"yes" kvm=3D"yes" - QEMU_INCLUDES=3D"-isystem ${source_path}/linux-headers -I$PWD/linux-head= ers $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-isystem ${source_path}/linux-headers -Ilinux-headers $= QEMU_INCLUDES" libudev=3D"yes" ;; esac @@ -4265,7 +4265,7 @@ EOF symlink "$source_path/dtc/Makefile" "dtc/Makefile" fi fdt_cflags=3D"-I${source_path}/dtc/libfdt" - fdt_ldflags=3D"-L$PWD/dtc/libfdt" + fdt_ldflags=3D"-Ldtc/libfdt" fdt_libs=3D"$fdt_libs" elif test "$fdt" =3D "yes" ; then # Not a git build & no libfdt found, prompt for system install @@ -5250,7 +5250,7 @@ case "$capstone" in else LIBCAPSTONE=3Dlibcapstone.a fi - capstone_libs=3D"-L$PWD/capstone -lcapstone" + capstone_libs=3D"-Lcapstone -lcapstone" capstone_cflags=3D"-I${source_path}/capstone/include" ;; =20 @@ -6250,8 +6250,8 @@ case "$slirp" in git_submodules=3D"${git_submodules} slirp" fi mkdir -p slirp - slirp_cflags=3D"-I${source_path}/slirp/src -I$PWD/slirp/src" - slirp_libs=3D"-L$PWD/slirp -lslirp" + slirp_cflags=3D"-I${source_path}/slirp/src -Islirp/src" + slirp_libs=3D"-Lslirp -lslirp" if test "$mingw32" =3D "yes" ; then slirp_libs=3D"$slirp_libs -lws2_32 -liphlpapi" fi --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599051787; cv=none; d=zohomail.com; s=zohoarc; b=U98lD89HvdY/fCuHM0AUXW+pH5A80ZX1ZutHrHRvBN5wmVLI5Dasql3qMZmQ6yWT6bWJ3ihru4yznToqbsnwpRhZT/JYJBmz7u87Dj15NJ5MV0SWJ7zIwwacbGyxN0DKPe23HASHWOEZ+NNlxVZTSN4mcNnkgPZVbffUnlTFeHk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599051787; 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=qpt4czLx2tmu9iRB1NMLp80kdhBl897DufdhqCweXbI=; b=PGCWBjb9efpAAFryC4fIbZ+L+ARktVFHmbNZLwwU4V7sHKWFpw02PvvPCBhsBNQ351ZaTXifuVkWqDbzudGNUKw3NnceMkdYru9zltxglUCz3/pWmB2BgEZklEQGaKD1SU+ZCFjd3ZiEGa+i9m6Wqmkq3DvPnkNmmE5gxK2tHhk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 159905178763040.517425813998784; Wed, 2 Sep 2020 06:03:07 -0700 (PDT) Received: from localhost ([::1]:58280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSPq-00037l-Sa for importer@patchew.org; Wed, 02 Sep 2020 09:03:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMP-0005xP-P6 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59566) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDSMM-000757-QS for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:33 -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-540-CECoF0b6NKaa8_BnVKGMpA-1; Wed, 02 Sep 2020 08:59:26 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id D783D107B277 for ; Wed, 2 Sep 2020 12:59:21 +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 9BAF65D9CC for ; Wed, 2 Sep 2020 12:59:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qpt4czLx2tmu9iRB1NMLp80kdhBl897DufdhqCweXbI=; b=KohIN72yvOgfmbeUeWlOkjnglwRBh4r0pinmGhDujAoRqKiGB7sUJvdIfPKrNgwQAQra4J rOD1nHXzfHCMF2o5gqpsRDGAAanhpN/Gib/KD2VYpO05IVC/u1Mp3I145rL1v8CE8bkixw jLFSfWthW4l75sFAeHdaTe4bro5J3eM= X-MC-Unique: CECoF0b6NKaa8_BnVKGMpA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 08/39] configure: include cross sdl2-config in meson cross file Date: Wed, 2 Sep 2020 08:58:46 -0400 Message-Id: <20200902125917.26021-9-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:42:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- configure | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure b/configure index 131a9e518b..2790cf15d7 100755 --- a/configure +++ b/configure @@ -8147,6 +8147,9 @@ echo "ar =3D $(meson_quote $ar)" >> $cross echo "nm =3D $(meson_quote $nm)" >> $cross echo "pkgconfig =3D $(meson_quote $pkg_config_exe)" >> $cross echo "ranlib =3D $(meson_quote $ranlib)" >> $cross +if has $sdl2_config; then + echo "sdl2-config =3D $(meson_quote $sdl2_config)" >> $cross +fi echo "strip =3D $(meson_quote $strip)" >> $cross echo "windres =3D $(meson_quote $windres)" >> $cross if test -n "$cross_prefix"; then --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599051911; cv=none; d=zohomail.com; s=zohoarc; b=hthhf6SlWl7i4Kc94BB1p7o5IHHHLz5+og4SVQJSG1aYU26MH+DHVdJ3cKcxV1XtK5uE7L5t6+gTYhRFUwWobyvu+ojH0FvMS8IS73eNzYB88EzXfQBTMtbTLhioyZ1ESSUOtqRZlAhKgTVsk438S2wLrEjmUQ1aNZ5ux1zfds8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599051911; 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=j3b2k/ACQofE8pTVL55ApXrAJngPSilZmR+GnhBL4Bw=; b=antT9qygi/o7gtuj9qtOqO65WxfeZnuSICwgNEexQItcENonQhmymKzUvmP6EGlphLg2+sAj4jrlSAZT9AmhXtAhGnZ9IQwFC6XwgQI1SlNmr02mjMd+2skelc4BwNcnOGrclgksvUV437Vg9mlEm/uxwl2VqqqIRK597Ts68hQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599051911105862.0887522676013; Wed, 2 Sep 2020 06:05:11 -0700 (PDT) Received: from localhost ([::1]:40700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSRq-0007bE-7q for importer@patchew.org; Wed, 02 Sep 2020 09:05:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMQ-00060P-U7 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24905) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDSMN-00076G-Rz for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:34 -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-97-THNNEqj3ME6Owtyg_vWOsw-1; Wed, 02 Sep 2020 08:59:28 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 408868A6F0E for ; Wed, 2 Sep 2020 12:59:22 +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 040315D9CC for ; Wed, 2 Sep 2020 12:59:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j3b2k/ACQofE8pTVL55ApXrAJngPSilZmR+GnhBL4Bw=; b=afutbfJgwD039Er8whfZv4LUxBi/pDghdvIe2nyp5OCZu50nD4dxB9S8Rs4JreNI6PMwzF juczlHLYghInkRW1OGVcJ1SHticJht89TPKfHfPozVl8NylQAIw1p5xJ97A24VEESCWFTN FRx+c/OyGNIl/tt7GGGsRyhwT+wPmK8= X-MC-Unique: THNNEqj3ME6Owtyg_vWOsw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 09/39] ninjatool: use constant names for stamp files Date: Wed, 2 Sep 2020 08:58:47 -0400 Message-Id: <20200902125917.26021-10-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 01:13:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Numbering files according to rules causes confusion, because CUSTOM_COMMAND3.stamp from a previous build might represent completely different targets after Makefile.ninja is regenerated. As a result, the new targets are not rebuilt and compilation fails. Use the targets to build a SHA1 hash; the chances for collision are one in 2^24 even with a 12-character prefix of the hash. Signed-off-by: Paolo Bonzini --- scripts/ninjatool.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/ninjatool.py b/scripts/ninjatool.py index ba6bd9a2a6..627a1cab45 100755 --- a/scripts/ninjatool.py +++ b/scripts/ninjatool.py @@ -34,6 +34,7 @@ import os import re import json import argparse +import hashlib import shutil =20 =20 @@ -51,6 +52,9 @@ else: normpath =3D os.path.normpath =20 =20 +def sha1_text(text): + return hashlib.sha1(text.encode()).hexdigest() + # ---- lexer and parser ---- =20 PATH_RE =3D r"[^$\s:|]+|\$[$ :]|\$[a-zA-Z0-9_-]+|\$\{[a-zA-Z0-9_.-]+\}" @@ -767,7 +771,6 @@ class Ninja2Make(NinjaParserEventsWithVars): self.build_vars =3D defaultdict(lambda: dict()) self.rule_targets =3D defaultdict(lambda: list()) self.stamp_targets =3D defaultdict(lambda: list()) - self.num_stamp =3D defaultdict(lambda: 0) self.all_outs =3D set() self.all_ins =3D set() self.all_phony =3D set() @@ -903,8 +906,7 @@ class Ninja2Make(NinjaParserEventsWithVars): if len(out) =3D=3D 1: stamp =3D out[0] + '.stamp' else: - stamp =3D '%s%d.stamp' %(rule, self.num_stamp[rule]) - self.num_stamp[rule] +=3D 1 + stamp =3D '%s@%s.stamp' % (rule, sha1_text(targets)[0:11]) self.print('%s: %s; @:' % (targets, stamp)) self.print('%s: %s | %s; ${ninja-command-restat}' % (stamp, in= puts, orderonly)) self.rule_targets[rule].append(stamp) --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=1599052105; cv=none; d=zohomail.com; s=zohoarc; b=TBax5tnjIdS9R21hKfIfR1j6XcrMKuRtIuXt4/RlPJduzlYOLig6ce95eWdjXSWsgbD/H3aDfYNQGSroJ6mzfuIPDnefgRvPIx/CgbbiVrsfUyNEPoWlu/7H4bOajJ7aQu8SkIY4j+j+VqXVCLHx74jfT/LMSXoJ0XI08BoZaAI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052105; 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; bh=Ote373+rr37GfoSVxXxgWrx4xpHJ21H9c/MjWrwzfNA=; b=j0LIZDg/KUx8s7vQcVaOUpEa8AV1UB/44xcaVpUqOsTrUVXqKmiNMWcods4fvVF2ZsCz6aB7SFwJCrltTZWSyjyO/tnlbuqwujOhUghsxgpeTmpJJWTP0CphrAq+c91iHW/e85Bv2vIteQbeq7bxZKpkXq2IUUd5ORYG+KBTaIs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 1599052105640421.50913959880234; Wed, 2 Sep 2020 06:08:25 -0700 (PDT) Received: from localhost ([::1]:55322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSUw-0005Fy-Rc for importer@patchew.org; Wed, 02 Sep 2020 09:08:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMR-00063S-Tf for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:40484) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDSMO-00076a-NF for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:35 -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-506-xfjfRgM2NKGNbpVommp92g-1; Wed, 02 Sep 2020 08:59:28 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 26EA1107B7C4; Wed, 2 Sep 2020 12:59:23 +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 A9D1D76E01; Wed, 2 Sep 2020 12:59:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ote373+rr37GfoSVxXxgWrx4xpHJ21H9c/MjWrwzfNA=; b=JM3sEwJHQkco7ZTN3ccDO65RE3bc3FaXfr+9GN3lcpylMqO0TrHp28J9kvTg/W8kc+DYzx dRKs/Oy4kb65eYuBH38gaBcF8Z3AziiFj7GlcJfwS+sVzGeC9PPLvL9ax+OgqQXsm68A9l HIN8gkbh5bnUOf1HPDcpPa6h1ezOU5U= X-MC-Unique: xfjfRgM2NKGNbpVommp92g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 10/39] meson: fix libqos linking Date: Wed, 2 Sep 2020 08:58:48 -0400 Message-Id: <20200902125917.26021-11-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:42:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: Alexander Bulekov , Claudio Fontana Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Add genh to the sources to avoid race conditions between QAPI file generation and libqos compilation. Make the name_suffix .fa for consistency with other link_whole static libraries and to work around a Meson issue where lots of linker flags are placed between -Wl,--start-group and -Wl,--end-group and this breaks the fork-fuzz.ld linker script. Reported-by: Claudio Fontana Reported-by: Alexander Bulekov Signed-off-by: Paolo Bonzini --- tests/qtest/libqos/meson.build | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build index 19931b9248..1cddf5bdaa 100644 --- a/tests/qtest/libqos/meson.build +++ b/tests/qtest/libqos/meson.build @@ -1,5 +1,4 @@ -libqos =3D static_library('qos', - files('../libqtest.c', +libqos_srcs =3D files('../libqtest.c', 'qgraph.c', 'qos_external.c', 'pci.c', @@ -52,6 +51,10 @@ libqos =3D static_library('qos', 'arm-xilinx-zynq-a9-machine.c', 'ppc64_pseries-machine.c', 'x86_64_pc-machine.c', -), build_by_default: false) +) + +libqos =3D static_library('qos', libqos_srcs + genh, + name_suffix: 'fa', + build_by_default: false) =20 qos =3D declare_dependency(link_whole: libqos) --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599051672; cv=none; d=zohomail.com; s=zohoarc; b=jkVPHFcrU+KfA02XdaubSqL5v3c3xcjSVZLfsOoipfU2lxLQSwv7qUZz17OZQCiSHDT0gBE/Z1UFjkrpI6NWCHOKztnLQmX0LRk+6geNNHmIL1NQnzJWsPJkUCn7qb70Z3V6x9fVU4AFrjcMMlXb5byU83RY+ZKRSRU6qKlHDzM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599051672; 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; bh=BQauWJN/HKduuv8ZqPq3NvYMU5P3oNkSl7OjSzlPxcQ=; b=KjkK4ieBhaGYkDzgdggEuK+1EQvwH/6Lngog+xsOYDNxWb/je2XW5nFOyLRZZJso3Vz0g55nZy4c/EXro1SMBx4okAIljdZziLJCU5zzbYUdPMVilqhY+D/b7DVk8FD1g27TzFsDEajNfMRmmip7AdAeaWYGbfy3g/fPRr8W9lE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599051672009708.7744428537148; Wed, 2 Sep 2020 06:01:12 -0700 (PDT) Received: from localhost ([::1]:49836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSNt-00085T-Al for importer@patchew.org; Wed, 02 Sep 2020 09:01:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMP-0005x4-I0 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:33 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:35323 helo=us-smtp-delivery-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 1kDSMM-00075D-TH for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:33 -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-162-GhmW88NHN_WM9XaMCQ5VmQ-1; Wed, 02 Sep 2020 08:59:28 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 99FD4107B7D2 for ; Wed, 2 Sep 2020 12:59:23 +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 487DD76E01; Wed, 2 Sep 2020 12:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BQauWJN/HKduuv8ZqPq3NvYMU5P3oNkSl7OjSzlPxcQ=; b=OP/yeYmgeSXRTBBWxmQeVZ6AMZBkw4PPi1srAx+rVVhHWYaGlDE+2WeCCZVhq2yyoRbGWO QAxOu9ep9I+sBYlqS14pma2qQEweL4SS8pFHGa3n8zyn2YhQ96nzGb08K7YyinmB6il9bB eeRPgWnduCu1+bNGvB7zjzg+IuOqnQs= X-MC-Unique: GhmW88NHN_WM9XaMCQ5VmQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 11/39] meson: build qapi tests library Date: Wed, 2 Sep 2020 08:58:49 -0400 Message-Id: <20200902125917.26021-12-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 03:24:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau - builds QAPI builtins types/visitor to fix a linking issue with unresolved symbols in the static library. - work around a meson limitation on generated file output directories. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200828110734.1638685-2-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 79 +-------------------------------------- tests/include/meson.build | 16 ++++++++ tests/meson.build | 45 ++++++++++++++++++++++ 3 files changed, 62 insertions(+), 78 deletions(-) create mode 100644 tests/include/meson.build diff --git a/tests/Makefile.include b/tests/Makefile.include index 45cc71c737..1451f64df7 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -34,23 +34,6 @@ endif ifneq ($(wildcard config-host.mak),) export SRC_PATH =20 -# TODO don't duplicate $(SRC_PATH)/Makefile's qapi-py here -qapi-py =3D $(SRC_PATH)/scripts/qapi/__init__.py \ -$(SRC_PATH)/scripts/qapi/commands.py \ -$(SRC_PATH)/scripts/qapi/common.py \ -$(SRC_PATH)/scripts/qapi/doc.py \ -$(SRC_PATH)/scripts/qapi/error.py \ -$(SRC_PATH)/scripts/qapi/events.py \ -$(SRC_PATH)/scripts/qapi/expr.py \ -$(SRC_PATH)/scripts/qapi/gen.py \ -$(SRC_PATH)/scripts/qapi/introspect.py \ -$(SRC_PATH)/scripts/qapi/parser.py \ -$(SRC_PATH)/scripts/qapi/schema.py \ -$(SRC_PATH)/scripts/qapi/source.py \ -$(SRC_PATH)/scripts/qapi/types.py \ -$(SRC_PATH)/scripts/qapi/visit.py \ -$(SRC_PATH)/scripts/qapi-gen.py - # Get the list of all supported sysemu targets SYSEMU_TARGET_LIST :=3D $(subst -softmmu.mak,,$(notdir \ $(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak))) @@ -164,36 +147,13 @@ ifeq ($(CONFIG_BLOCK)$(CONFIG_REPLICATION)$(CONFIG_PO= SIX),yyy) check-unit-y +=3D tests/test-replication$(EXESUF) endif =20 -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/test-qapi-init-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-emit-events.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 - QEMU_CFLAGS +=3D -I$(SRC_PATH)/tests -I$(SRC_PATH)/tests/qtest =20 =20 # Deps that are common to various different sets of tests below test-util-obj-y =3D libqemuutil.a test-qom-obj-y =3D $(qom-obj-y) $(test-util-obj-y) -test-qapi-obj-y =3D tests/test-qapi-types.o \ - tests/include/test-qapi-types-sub-module.o \ - tests/test-qapi-types-sub-sub-module.o \ - tests/test-qapi-visit.o \ - tests/include/test-qapi-visit-sub-module.o \ - tests/test-qapi-visit-sub-sub-module.o \ - tests/test-qapi-introspect.o \ - $(test-qom-obj-y) +test-qapi-obj-y =3D $(test-qom-obj-y) tests/libtestqapi.a 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) @@ -264,42 +224,6 @@ tests/test-logging$(EXESUF): tests/test-logging.o $(te= st-util-obj-y) tests/test-replication$(EXESUF): tests/test-replication.o $(test-util-obj-= y) \ $(test-block-obj-y) =20 -tests/test-qapi-types.c tests/test-qapi-types.h \ -tests/include/test-qapi-types-sub-module.c \ -tests/include/test-qapi-types-sub-module.h \ -tests/test-qapi-types-sub-sub-module.c \ -tests/test-qapi-types-sub-sub-module.h \ -tests/test-qapi-visit.c tests/test-qapi-visit.h \ -tests/include/test-qapi-visit-sub-module.c \ -tests/include/test-qapi-visit-sub-module.h \ -tests/test-qapi-visit-sub-sub-module.c \ -tests/test-qapi-visit-sub-sub-module.h \ -tests/test-qapi-commands.h tests/test-qapi-commands.c \ -tests/include/test-qapi-commands-sub-module.h \ -tests/include/test-qapi-commands-sub-module.c \ -tests/test-qapi-commands-sub-sub-module.h \ -tests/test-qapi-commands-sub-sub-module.c \ -tests/test-qapi-emit-events.c tests/test-qapi-emit-events.h \ -tests/test-qapi-events.c tests/test-qapi-events.h \ -tests/test-qapi-init-commands.c \ -tests/test-qapi-init-commands.h \ -tests/include/test-qapi-events-sub-module.c \ -tests/include/test-qapi-events-sub-module.h \ -tests/test-qapi-events-sub-sub-module.c \ -tests/test-qapi-events-sub-sub-module.h \ -tests/test-qapi-introspect.c tests/test-qapi-introspect.h: \ -tests/test-qapi-gen-timestamp ; -tests/test-qapi-gen-timestamp: \ - $(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json \ - $(SRC_PATH)/tests/qapi-schema/include/sub-module.json \ - $(SRC_PATH)/tests/qapi-schema/sub-sub-module.json \ - $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \ - -o tests -p "test-" $<, \ - "GEN","$(@:%-timestamp=3D%)") - @rm -f tests/test-qapi-doc.texi - @>$@ - tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visito= r.o $(test-qapi-obj-y) tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.= o $(test-qapi-obj-y) tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $(test-qapi-obj-y) t= ests/test-qapi-emit-events.o tests/test-qapi-events.o @@ -541,7 +465,6 @@ check-build: build-unit $(QEMU_IOTESTS_HELPERS-y) =20 check-clean: rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) - rm -f tests/test-qapi-gen-timestamp rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) =20 check: check-unit diff --git a/tests/include/meson.build b/tests/include/meson.build new file mode 100644 index 0000000000..fea3a6342f --- /dev/null +++ b/tests/include/meson.build @@ -0,0 +1,16 @@ +# an extra target to workaround meson limitation on output files location +test_qapi_outputs_extra =3D [ + 'test-qapi-commands-sub-module.c', + 'test-qapi-commands-sub-module.h', + 'test-qapi-events-sub-module.c', + 'test-qapi-events-sub-module.h', + 'test-qapi-types-sub-module.c', + 'test-qapi-types-sub-module.h', + 'test-qapi-visit-sub-module.c', + 'test-qapi-visit-sub-module.h', +] + +test_qapi_outputs_extra =3D custom_target('QAPI test (include)', + output: test_qapi_outputs_extra, + input: test_qapi_files, + command: 'true') diff --git a/tests/meson.build b/tests/meson.build index fe2c6d8e6b..ab09a8d845 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,3 +1,48 @@ +test_qapi_outputs =3D [ + 'qapi-builtin-types.c', + 'qapi-builtin-types.h', + 'qapi-builtin-visit.c', + 'qapi-builtin-visit.h', + 'test-qapi-commands-sub-sub-module.c', + 'test-qapi-commands-sub-sub-module.h', + 'test-qapi-commands.c', + 'test-qapi-commands.h', + 'test-qapi-emit-events.c', + 'test-qapi-emit-events.h', + 'test-qapi-events-sub-sub-module.c', + 'test-qapi-events-sub-sub-module.h', + 'test-qapi-events.c', + 'test-qapi-events.h', + 'test-qapi-init-commands.c', + 'test-qapi-init-commands.h', + 'test-qapi-introspect.c', + 'test-qapi-introspect.h', + 'test-qapi-types-sub-sub-module.c', + 'test-qapi-types-sub-sub-module.h', + 'test-qapi-types.c', + 'test-qapi-types.h', + 'test-qapi-visit-sub-sub-module.c', + 'test-qapi-visit-sub-sub-module.h', + 'test-qapi-visit.c', + 'test-qapi-visit.h', +] + +test_qapi_files =3D custom_target('Test QAPI files', + output: test_qapi_outputs, + input: files('qapi-schema/qapi-schema-test= .json', + 'qapi-schema/include/sub-modu= le.json', + 'qapi-schema/sub-sub-module.j= son'), + command: [ qapi_gen, '-o', meson.current_b= uild_dir(), + '-b', '-p', 'test-', '@INPUT0@'= ], + depend_files: qapi_gen_depends) + +# meson doesn't like generated output in other directories +# perhaps change qapi_gen to replace / with _, like Meson itself does? +subdir('include') + +libtestqapi =3D static_library('testqapi', sources: [test_qapi_files, test= _qapi_outputs_extra]) +testqapi =3D declare_dependency(link_with: libtestqapi) + if have_system and 'CONFIG_POSIX' in config_host subdir('qemu-iotests') endif --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599051785; cv=none; d=zohomail.com; s=zohoarc; b=foR96FYgV4uCinUMl8ulMBcY+x+MCe8h/Nx16lRIVFhvwpsoXQFiXulyaLjwfF48TijHvS3YMGTKaf7Ld3+yl+G8qupjVjkpgaW4keC4cuKlMEoQrUMdf4QWoHxxdFmlisgh3mDgzEre4zZT3HsKx54OFmqOl2UfhKok1G3l2KQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599051785; 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; bh=i/TUpq63LluI2zEmKjxo5BeZjz9hoA7RJp+L4iy1i5I=; b=ivkyxL4RtjUwFuzB0FQQ5TWjjgZtT3NSFn+hMPRyIRaPFrySzt0gtzjk0KqtKRo1Sm1W2uXHEkDEAK8FvrkRh68qBk0FRsqc//j0Ur0lh/g59W1cX+M/d2za2FDsPBTCJZU3K1zYu7rQ3RupdMgTNImfa8gc8bpS1ZS8cepa6gc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599051784997829.6895549448589; Wed, 2 Sep 2020 06:03:04 -0700 (PDT) Received: from localhost ([::1]:58002 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSPo-00030t-04 for importer@patchew.org; Wed, 02 Sep 2020 09:03:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMR-00061x-Fc for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:35 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:33940 helo=us-smtp-delivery-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 1kDSMO-00076Z-NC for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:35 -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-559-ElJLsRohNpCh7znjH4thqw-1; Wed, 02 Sep 2020 08:59:29 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1888410ABDB1 for ; Wed, 2 Sep 2020 12:59:24 +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 BB08A76E01; Wed, 2 Sep 2020 12:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i/TUpq63LluI2zEmKjxo5BeZjz9hoA7RJp+L4iy1i5I=; b=Elav+PCdKh2PBP/BU1q+g+oSmr7BrysiQplaXRtX97v7y556sJ4dR4iabcP5wsYKlKXVKh NkFwDKuHmwOIaC+SiSMNeltQW0l379LbSdrc2D3SOS8Yg6/rAwiFnJ3z+JaPNi3oE1BFg/ DZ2eo8/mTRSbkJx32X7Hra0KL5WFIAI= X-MC-Unique: ElJLsRohNpCh7znjH4thqw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 12/39] meson: declare tasn1 dependency Date: Wed, 2 Sep 2020 08:58:50 -0400 Message-Id: <20200902125917.26021-13-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:33:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200828110734.1638685-3-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- meson.build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meson.build b/meson.build index f7b57315ef..b2d1a909b6 100644 --- a/meson.build +++ b/meson.build @@ -405,6 +405,11 @@ libdaxctl =3D not_found if 'CONFIG_LIBDAXCTL' in config_host libdaxctl =3D declare_dependency(link_args: config_host['LIBDAXCTL_LIBS'= ].split()) endif +tasn1 =3D not_found +if 'CONFIG_TASN1' in config_host + tasn1 =3D declare_dependency(compile_args: config_host['TASN1_CFLAGS'].s= plit(), + link_args: config_host['TASN1_LIBS'].split()) +endif =20 # Create config-host.h =20 --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052295; cv=none; d=zohomail.com; s=zohoarc; b=ZCa/YIhFv1p2n6ScmdeBYg7f7QonNLDD5C+NGdWzZsKC+etcl3N87xCw3n7I1eSv/QZfVIP3rtNqxPZnSTyzlRwxAZIf057OBAUqNuiqgkbe6MshjftLU9cMcpdtd14tRi5MeVzjli4vIwAcSPyx4BKHJ7gbPF71+mECcL8qizw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052295; 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; bh=Cn9Y0k8ZBU+n39Ura5BFh068S8/Q9sQTbvMa1fTi4rY=; b=nAD+Z8B1KtxAcM3xGem4qzjqxO8KCzp1fvf2tC0eCw38qfZQ86qMgj7JEXpFGe7Cuq0Luvg8Uj1eyCibIIfzqlPO1QAGNnEbeKC2uZ7sSbTX+6PKv3+92dXv8V33EnWYJTHjTteRElFrMUfAxpJakzynxGbdN3cad7LXLE8rVFs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052295448204.33697997626143; Wed, 2 Sep 2020 06:11:35 -0700 (PDT) Received: from localhost ([::1]:43834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSY2-0003cC-Ly for importer@patchew.org; Wed, 02 Sep 2020 09:11:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMV-0006C2-Aq for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:39 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:57361 helo=us-smtp-delivery-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 1kDSMS-00078k-AS for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:38 -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-548-AasspEF-MRiGEj_1RZv-eQ-1; Wed, 02 Sep 2020 08:59:28 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D759E81F00A for ; Wed, 2 Sep 2020 12:59:24 +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 39B5576E01; Wed, 2 Sep 2020 12:59:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Cn9Y0k8ZBU+n39Ura5BFh068S8/Q9sQTbvMa1fTi4rY=; b=F5rpgIRqXdwFnFiZXCleocvdxVY+XveIjyGG6xRy5pzCDunABEE0pOFF96nsN6Fq4WMlI0 UK1/NgBFlZD/uP9BiudB8ZoYk5cfJ/rZ6qOkPa/tyUd1tFJBBl+k0+bpCfHUX7SRQlyy9Y +VT1FleGf2CxUs4PhW4frOAP0v0ZBfM= X-MC-Unique: AasspEF-MRiGEj_1RZv-eQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 13/39] meson: declare keyutils dependency Date: Wed, 2 Sep 2020 08:58:51 -0400 Message-Id: <20200902125917.26021-14-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 03:24:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Rename the variable to be more explicit. A further clean-up patch will move the actual to dependency check to meson entirely. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200828110734.1638685-4-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 2 +- meson.build | 4 ++++ tests/Makefile.include | 2 +- tests/test-crypto-secret.c | 10 +++++----- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 2790cf15d7..6a43ef6c2d 100755 --- a/configure +++ b/configure @@ -7511,7 +7511,7 @@ fi if test "$secret_keyring" =3D "yes" ; then echo "CONFIG_SECRET_KEYRING=3Dy" >> $config_host_mak if test "$have_keyutils" =3D "yes" ; then - echo "CONFIG_TEST_SECRET_KEYRING=3Dy" >> $config_host_mak + echo "CONFIG_KEYUTILS=3Dy" >> $config_host_mak fi fi =20 diff --git a/meson.build b/meson.build index b2d1a909b6..fc46273491 100644 --- a/meson.build +++ b/meson.build @@ -410,6 +410,10 @@ if 'CONFIG_TASN1' in config_host tasn1 =3D declare_dependency(compile_args: config_host['TASN1_CFLAGS'].s= plit(), link_args: config_host['TASN1_LIBS'].split()) endif +keyutils =3D not_found +if 'CONFIG_KEYUTILS' in config_host + keyutils =3D declare_dependency(link_args: '-lkeyutils') +endif =20 # Create config-host.h =20 diff --git a/tests/Makefile.include b/tests/Makefile.include index 1451f64df7..addeafafd4 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -248,7 +248,7 @@ tests/benchmark-crypto-cipher$(EXESUF): tests/benchmark= -crypto-cipher.o $(test-c tests/test-crypto-secret$(EXESUF): tests/test-crypto-secret.o $(test-crypt= o-obj-y) tests/test-crypto-xts$(EXESUF): tests/test-crypto-xts.o $(test-crypto-obj-= y) =20 -ifeq ($(CONFIG_TEST_SECRET_KEYRING),y) +ifeq ($(CONFIG_KEYUTILS),y) tests/test-crypto-secret.o-libs :=3D -lkeyutils endif =20 diff --git a/tests/test-crypto-secret.c b/tests/test-crypto-secret.c index 603a093f10..9d06176663 100644 --- a/tests/test-crypto-secret.c +++ b/tests/test-crypto-secret.c @@ -24,7 +24,7 @@ #include "crypto/secret.h" #include "qapi/error.h" #include "qemu/module.h" -#ifdef CONFIG_TEST_SECRET_KEYRING +#ifdef CONFIG_KEYUTILS #include "crypto/secret_keyring.h" #include #endif @@ -128,7 +128,7 @@ static void test_secret_indirect_emptyfile(void) g_free(fname); } =20 -#ifdef CONFIG_TEST_SECRET_KEYRING +#ifdef CONFIG_KEYUTILS =20 #define DESCRIPTION "qemu_test_secret" #define PAYLOAD "Test Payload" @@ -268,7 +268,7 @@ static void test_secret_keyring_bad_key_access_right(vo= id) keyctl_unlink(key, KEY_SPEC_PROCESS_KEYRING); } =20 -#endif /* CONFIG_TEST_SECRET_KEYRING */ +#endif /* CONFIG_KEYUTILS */ =20 static void test_secret_noconv_base64_good(void) { @@ -571,7 +571,7 @@ int main(int argc, char **argv) g_test_add_func("/crypto/secret/indirect/emptyfile", test_secret_indirect_emptyfile); =20 -#ifdef CONFIG_TEST_SECRET_KEYRING +#ifdef CONFIG_KEYUTILS g_test_add_func("/crypto/secret/keyring/good", test_secret_keyring_good); g_test_add_func("/crypto/secret/keyring/revoked_key", @@ -582,7 +582,7 @@ int main(int argc, char **argv) test_secret_keyring_bad_serial_key); g_test_add_func("/crypto/secret/keyring/bad_key_access_right", test_secret_keyring_bad_key_access_right); -#endif /* CONFIG_TEST_SECRET_KEYRING */ +#endif /* CONFIG_KEYUTILS */ =20 g_test_add_func("/crypto/secret/noconv/base64/good", test_secret_noconv_base64_good); --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599051665; cv=none; d=zohomail.com; s=zohoarc; b=dqjwPSjfWqtAtI4deMGBCOzbykZrQ5oiUbqnnwHxzCNhWRX71bl0P1dMKcmAAa2gmI/NCGmRq8dR71IPcuvgxWpQ2nGliW0MYogUtCvUZKsFv75ZSVs5ThbFwUnezDDMDSnjdWQ0hntJeRE0Sa/T5+t09NlH7kqZjh+McEblAgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599051665; 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; bh=4VZHaHCbIAkuoNHs/mObP9XTL13rHjSdOCdxLP9Zwyw=; b=E63KDo6e/z3+u0a47I7n163rEYMauSlNSEc6+Dxto6xlPEyDGrd2fRV7WF+1rqPn7YYkax1I75U3bavcs/bUyNLvF03QfR7r9q4KGlm7mg9wcZcBxxEiKgNpFsRD2VzvEcGXAH6ODXuyEfhQ1M1demRk+w5bTVVv06FZTzwwnHE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599051665700237.84924298504518; Wed, 2 Sep 2020 06:01:05 -0700 (PDT) Received: from localhost ([::1]:49506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSNp-0007vh-MU for importer@patchew.org; Wed, 02 Sep 2020 09:01:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMO-0005vV-FO for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:32 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:43558 helo=us-smtp-delivery-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 1kDSMM-00075A-Oj for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:32 -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-25-gz-X2QYVOfi0-3gdbKo-EA-1; Wed, 02 Sep 2020 08:59:28 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 64521107B7E3 for ; Wed, 2 Sep 2020 12:59:25 +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 03A067B41F; Wed, 2 Sep 2020 12:59:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4VZHaHCbIAkuoNHs/mObP9XTL13rHjSdOCdxLP9Zwyw=; b=HC6mBdyAUu13YEUKq1LW++QaMVovGsLKib/l9Rkjk4seqGOMonuNJyzs2edFGz4aRy5OFb m8raOIKgAqwm5ftexKWh+wvoDADATOH8FyTpbB+fQx8AKNQ2I8uJSku1DZyGsfg6GwVXBh iMAjXnFkOjuq+diI1CqZpnBpxijIp20= X-MC-Unique: gz-X2QYVOfi0-3gdbKo-EA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 14/39] meson: convert qht-bench Date: Wed, 2 Sep 2020 08:58:52 -0400 Message-Id: <20200902125917.26021-15-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:33:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau This is required by test-qht-par unit test. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200828110734.1638685-5-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 1 - tests/meson.build | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index addeafafd4..9c30949adf 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -201,7 +201,6 @@ tests/test-rcu-slist$(EXESUF): tests/test-rcu-slist.o $= (test-util-obj-y) tests/test-qdist$(EXESUF): tests/test-qdist.o $(test-util-obj-y) tests/test-qht$(EXESUF): tests/test-qht.o $(test-util-obj-y) tests/test-qht-par$(EXESUF): tests/test-qht-par.o tests/qht-bench$(EXESUF)= $(test-util-obj-y) -tests/qht-bench$(EXESUF): tests/qht-bench.o $(test-util-obj-y) tests/test-bufferiszero$(EXESUF): tests/test-bufferiszero.o $(test-util-ob= j-y) tests/atomic_add-bench$(EXESUF): tests/atomic_add-bench.o $(test-util-obj-= y) tests/atomic64-bench$(EXESUF): tests/atomic64-bench.o $(test-util-obj-y) diff --git a/tests/meson.build b/tests/meson.build index ab09a8d845..3aeae23d54 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,3 +1,7 @@ +qht_bench =3D executable('qht-bench', + sources: files('qht-bench.c'), + dependencies: [qemuutil]) + test_qapi_outputs =3D [ 'qapi-builtin-types.c', 'qapi-builtin-types.h', --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052006; cv=none; d=zohomail.com; s=zohoarc; b=RTaMCeC8H1HeSspLcCnrOSsAqaiRRqC1S5I3Aj0LI2u6Tf51P3jUJpUeD+MGSXJSSlRFwqVMPGiq9DQpJElIwaNU3fMVUVpjhtznsl8l/3++BEO/vDZREOKBCg75L3WE0NCOfZSsJvvv0DEjvr+LWtMQTHP0UjZPVW+Nycv+A9c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052006; 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; bh=dbGTsYCaohFTZAHmgt2Z8zrHh8YMczAD832vvLYsmIw=; b=EWzz5CcDVFhLr6dSZmctkuFPXTn0e1/LUo0wluz2CfAxEeQmcQSRyA4WDLBAhl89b7mjuM+oUDj0Bhuo9501vDsol2EL/+mwdRsUNQrNWq8pOaMKlA7UdBY4qghU81J3L+Ej5EgG4tECDWviAOUGKa2Ted6FGui8jAKxZ7YtN9g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052006822874.8698647302186; Wed, 2 Sep 2020 06:06:46 -0700 (PDT) Received: from localhost ([::1]:46930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSTO-0001t3-0J for importer@patchew.org; Wed, 02 Sep 2020 09:06:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMR-00061E-6e for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:35 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:41705 helo=us-smtp-delivery-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 1kDSMN-00075r-TW for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:34 -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-302-Gx5iuMrtPYaMYHuvgh-AFQ-1; Wed, 02 Sep 2020 08:59:29 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D683A884E4C for ; Wed, 2 Sep 2020 12:59:25 +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 851487AEFC; Wed, 2 Sep 2020 12:59:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dbGTsYCaohFTZAHmgt2Z8zrHh8YMczAD832vvLYsmIw=; b=PO3EnnU+0Ft5xC08AHWK2IvsaY7KQ/nn82gRCSY1waXECmrrZkuhceMs5UUcbeWpH0iHps 05p8+jFsfGfyG8xu3LpUy7uUXrX7O6qONa31ibEh2UNA3RFP+0PImSJl8ltSh2jb9XKd/U DBpNKOqk2mqe6A2tVgOSotmFt4AOtZ0= X-MC-Unique: Gx5iuMrtPYaMYHuvgh-AFQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 15/39] tests: qga has virtio-serial by default when host has it Date: Wed, 2 Sep 2020 08:58:53 -0400 Message-Id: <20200902125917.26021-16-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 03:24:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau When dumping the default configuration, don't expect virtio-serial as the configured method, unless the host has CONFIG_VIRTIO_SERIAL. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200828110734.1638685-6-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- tests/test-qga.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test-qga.c b/tests/test-qga.c index 4ac4c22109..122730d326 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -728,10 +728,12 @@ static void test_qga_config(gconstpointer data) g_assert_false(g_key_file_get_boolean(kf, "general", "daemon", &error)= ); g_assert_no_error(error); =20 +#ifdef CONFIG_VIRTIO_SERIAL str =3D g_key_file_get_string(kf, "general", "method", &error); g_assert_no_error(error); g_assert_cmpstr(str, =3D=3D, "virtio-serial"); g_free(str); +#endif =20 str =3D g_key_file_get_string(kf, "general", "path", &error); g_assert_no_error(error); --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052370; cv=none; d=zohomail.com; s=zohoarc; b=B6M9sI8VVPrjTJtDuFGwmBkNF+fSwW9FYY4zXDnUjkBLwL/m2KWmc/OsLzodZuibeckX/XmeaoVS4Ep9izPR/sgXphao4cjZmt3tOO/rk2i0cnUCMAOJzY0IJB6GgHql/wX2NkGQXFayP2mT3XFKa3lm6a5YscP5SaI9QKlKNAY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052370; 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; bh=9rcNcfNmBvJj7xlxKdI/XhLpGCnWhWuk9deAUuTkng8=; b=mMXSgb5Mub1SBJeKsvHZTsvtsYKNE7wBu12feMZD4rM/IJtWXDSKKeRNn7eL56iVQFSfbSI1W8R/FgZutQG4tmICW21gbGCubmO3br11iUyhQFkn/vUMSabeUyYbSB9fC6FKw8fZFG5Dc1c4mOs393RBo5hlI9pv4XiMvEv9dY0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 159905237087888.22220023911098; Wed, 2 Sep 2020 06:12:50 -0700 (PDT) Received: from localhost ([::1]:51794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSZF-0006nh-Ub for importer@patchew.org; Wed, 02 Sep 2020 09:12:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMX-0006Iy-TA for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:41 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:21669 helo=us-smtp-delivery-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 1kDSMS-000795-Pp for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:41 -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-473-fAGMGxlZN06FMQs_Rqvo0w-1; Wed, 02 Sep 2020 08:59:31 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ED3C781F021 for ; Wed, 2 Sep 2020 12:59:26 +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 037B076E01; Wed, 2 Sep 2020 12:59:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9rcNcfNmBvJj7xlxKdI/XhLpGCnWhWuk9deAUuTkng8=; b=L0uHdyki640XY13mLUWlNZmLWhQbXFdOmEJkICkBoAJ84yIuFMMfIbAzNSeRAxRLnlTTKL rcQ2aJfWPBWsPiO/DIaty5ItHxH7Pk9Is6Iq7trym07nLgXgqo7MkmlufxO60B2TqyTUNa 3MmytdIfo1DeZCr2O3ByhHjFRPGYD8g= X-MC-Unique: fAGMGxlZN06FMQs_Rqvo0w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 16/39] meson: convert the unit tests Date: Wed, 2 Sep 2020 08:58:54 -0400 Message-Id: <20200902125917.26021-17-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:33:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200828110734.1638685-7-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 256 +---------------------------------------- tests/meson.build | 176 +++++++++++++++++++++++++++- tests/test-qga.c | 2 +- 3 files changed, 179 insertions(+), 255 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 9c30949adf..ce0a9fd780 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -38,256 +38,20 @@ export SRC_PATH SYSEMU_TARGET_LIST :=3D $(subst -softmmu.mak,,$(notdir \ $(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak))) =20 -check-unit-y +=3D tests/check-qdict$(EXESUF) -check-unit-y +=3D tests/check-block-qdict$(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) -check-unit-y +=3D tests/check-qnull$(EXESUF) -check-unit-y +=3D tests/check-qobject$(EXESUF) -check-unit-y +=3D tests/check-qjson$(EXESUF) -check-unit-y +=3D tests/check-qlit$(EXESUF) -check-unit-y +=3D tests/test-qobject-output-visitor$(EXESUF) -check-unit-y +=3D tests/test-clone-visitor$(EXESUF) -check-unit-y +=3D tests/test-qobject-input-visitor$(EXESUF) -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-qmp-cmds$(EXESUF) -check-unit-y +=3D tests/test-string-input-visitor$(EXESUF) -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-$(CONFIG_BLOCK) +=3D tests/test-coroutine$(EXESUF) -check-unit-y +=3D tests/test-visitor-serialization$(EXESUF) -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-iov$(EXESUF) -check-unit-y +=3D tests/test-bitmap$(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) -ifeq ($(CONFIG_POSIX),y) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-image-locking$(EXESUF) -endif -check-unit-y +=3D tests/test-x86-cpuid$(EXESUF) -# all code tested by test-x86-cpuid is inside topology.h -ifeq ($(CONFIG_SOFTMMU),y) -check-unit-y +=3D tests/test-xbzrle$(EXESUF) -check-unit-$(CONFIG_POSIX) +=3D tests/test-vmstate$(EXESUF) -endif -check-unit-y +=3D tests/test-cutils$(EXESUF) -check-unit-y +=3D tests/test-shift128$(EXESUF) -check-unit-y +=3D tests/test-mul64$(EXESUF) -check-unit-y +=3D tests/test-int128$(EXESUF) -# all code tested by test-int128 is inside int128.h -check-unit-y +=3D tests/rcutorture$(EXESUF) -check-unit-y +=3D tests/test-rcu-list$(EXESUF) -check-unit-y +=3D tests/test-rcu-simpleq$(EXESUF) -check-unit-y +=3D tests/test-rcu-tailq$(EXESUF) -check-unit-y +=3D tests/test-rcu-slist$(EXESUF) -check-unit-y +=3D tests/test-qdist$(EXESUF) -check-unit-y +=3D tests/test-qht$(EXESUF) -check-unit-y +=3D tests/test-qht-par$(EXESUF) -check-unit-y +=3D tests/test-bitops$(EXESUF) -check-unit-y +=3D tests/test-bitcnt$(EXESUF) -check-unit-y +=3D tests/test-qgraph$(EXESUF) -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-$(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) -ifndef CONFIG_TSAN -# Some tests: test-char, test-qdev-global-props, and test-qga, -# are not runnable under TSan due to a known issue. -# https://github.com/google/sanitizers/issues/1116 -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-char$(EXESUF) -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-qdev-global-props$(EXESUF) -ifeq ($(CONFIG_GUEST_AGENT),y) -check-unit-$(call land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) +=3D tests= /test-qga$(EXESUF) -endif -endif -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-timed-average$(EXESUF) -check-unit-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_INOTIFY1)) +=3D tests/te= st-util-filemonitor$(EXESUF) -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-util-sockets$(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-$(CONFIG_SOFTMMU) +=3D tests/test-base64$(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-$(call land,$(CONFIG_BLOCK),$(CONFIG_QEMU_PRIVATE_XTS)) +=3D te= sts/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_SOFTMMU) +=3D tests/test-bufferiszero$(EXESUF) -check-unit-y +=3D tests/test-uuid$(EXESUF) -check-unit-y +=3D tests/ptimer-test$(EXESUF) -check-unit-y +=3D tests/test-qapi-util$(EXESUF) -ifeq ($(CONFIG_BLOCK)$(CONFIG_REPLICATION)$(CONFIG_POSIX),yyy) -check-unit-y +=3D tests/test-replication$(EXESUF) -endif =20 QEMU_CFLAGS +=3D -I$(SRC_PATH)/tests -I$(SRC_PATH)/tests/qtest =20 - # Deps that are common to various different sets of tests below test-util-obj-y =3D libqemuutil.a -test-qom-obj-y =3D $(qom-obj-y) $(test-util-obj-y) -test-qapi-obj-y =3D $(test-qom-obj-y) tests/libtestqapi.a -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 - -tests/check-qnum$(EXESUF): tests/check-qnum.o $(test-util-obj-y) -tests/check-qstring$(EXESUF): tests/check-qstring.o $(test-util-obj-y) -tests/check-qdict$(EXESUF): tests/check-qdict.o $(test-util-obj-y) -tests/check-block-qdict$(EXESUF): tests/check-block-qdict.o $(test-util-ob= j-y) -tests/check-qlist$(EXESUF): tests/check-qlist.o $(test-util-obj-y) -tests/check-qnull$(EXESUF): tests/check-qnull.o $(test-util-obj-y) -tests/check-qobject$(EXESUF): tests/check-qobject.o $(test-util-obj-y) -tests/check-qjson$(EXESUF): tests/check-qjson.o $(test-util-obj-y) -tests/check-qlit$(EXESUF): tests/check-qlit.o $(test-util-obj-y) -tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(test-qom= -obj-y) -tests/check-qom-proplist$(EXESUF): tests/check-qom-proplist.o $(test-qom-o= bj-y) - -tests/test-char$(EXESUF): tests/test-char.o $(test-util-obj-y) $(test-io-o= bj-y) $(chardev-obj-y) tests/socket-helpers.o -tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(test-block-obj-y) -tests/test-aio$(EXESUF): tests/test-aio.o $(test-block-obj-y) -tests/test-aio-multithread$(EXESUF): tests/test-aio-multithread.o $(test-b= lock-obj-y) -tests/test-throttle$(EXESUF): tests/test-throttle.o $(test-block-obj-y) -tests/test-bdrv-drain$(EXESUF): tests/test-bdrv-drain.o $(test-block-obj-y= ) $(test-util-obj-y) -tests/test-bdrv-graph-mod$(EXESUF): tests/test-bdrv-graph-mod.o $(test-blo= ck-obj-y) $(test-util-obj-y) -tests/test-blockjob$(EXESUF): tests/test-blockjob.o $(test-block-obj-y) $(= test-util-obj-y) -tests/test-blockjob-txn$(EXESUF): tests/test-blockjob-txn.o $(test-block-o= bj-y) $(test-util-obj-y) -tests/test-block-backend$(EXESUF): tests/test-block-backend.o $(test-block= -obj-y) $(test-util-obj-y) -tests/test-block-iothread$(EXESUF): tests/test-block-iothread.o $(test-blo= ck-obj-y) $(test-util-obj-y) -tests/test-image-locking$(EXESUF): tests/test-image-locking.o $(test-block= -obj-y) $(test-util-obj-y) -tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(test-block-obj= -y) -tests/test-iov$(EXESUF): tests/test-iov.o $(test-util-obj-y) -tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o $(test-util-obj-y) $(tes= t-crypto-obj-y) -tests/test-bitmap$(EXESUF): tests/test-bitmap.o $(test-util-obj-y) -tests/test-x86-cpuid$(EXESUF): tests/test-x86-cpuid.o -tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o migration/libmigration.fa = $(test-util-obj-y) \ - $(test-io-obj-y) -tests/test-cutils$(EXESUF): tests/test-cutils.o util/cutils.o $(test-util-= obj-y) -tests/test-int128$(EXESUF): tests/test-int128.o -tests/rcutorture$(EXESUF): tests/rcutorture.o $(test-util-obj-y) -tests/test-rcu-list$(EXESUF): tests/test-rcu-list.o $(test-util-obj-y) -tests/test-rcu-simpleq$(EXESUF): tests/test-rcu-simpleq.o $(test-util-obj-= y) -tests/test-rcu-tailq$(EXESUF): tests/test-rcu-tailq.o $(test-util-obj-y) -tests/test-rcu-slist$(EXESUF): tests/test-rcu-slist.o $(test-util-obj-y) -tests/test-qdist$(EXESUF): tests/test-qdist.o $(test-util-obj-y) -tests/test-qht$(EXESUF): tests/test-qht.o $(test-util-obj-y) -tests/test-qht-par$(EXESUF): tests/test-qht-par.o tests/qht-bench$(EXESUF)= $(test-util-obj-y) -tests/test-bufferiszero$(EXESUF): tests/test-bufferiszero.o $(test-util-ob= j-y) tests/atomic_add-bench$(EXESUF): tests/atomic_add-bench.o $(test-util-obj-= y) tests/atomic64-bench$(EXESUF): tests/atomic64-bench.o $(test-util-obj-y) =20 -tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o hw/c= ore/libhwcore.fa \ - $(test-qapi-obj-y) -tests/test-vmstate$(EXESUF): tests/test-vmstate.o migration/libmigration.f= a \ - $(test-io-obj-y) -tests/test-timed-average$(EXESUF): tests/test-timed-average.o $(test-util-= obj-y) -tests/test-base64$(EXESUF): tests/test-base64.o $(test-util-obj-y) -tests/ptimer-test$(EXESUF): tests/ptimer-test.o tests/ptimer-test-stubs.o = hw/core/ptimer.o -tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y) -tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) $(test-= qapi-obj-y) -tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-b= lock-obj-y) -tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y) -tests/test-qapi-util$(EXESUF): tests/test-qapi-util.o $(test-util-obj-y) - -tests/test-logging$(EXESUF): tests/test-logging.o $(test-util-obj-y) - -tests/test-replication$(EXESUF): tests/test-replication.o $(test-util-obj-= y) \ - $(test-block-obj-y) - -tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visito= r.o $(test-qapi-obj-y) -tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.= o $(test-qapi-obj-y) -tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $(test-qapi-obj-y) t= ests/test-qapi-emit-events.o tests/test-qapi-events.o -tests/test-qobject-output-visitor$(EXESUF): tests/test-qobject-output-visi= tor.o $(test-qapi-obj-y) -tests/test-clone-visitor$(EXESUF): tests/test-clone-visitor.o $(test-qapi-= obj-y) -tests/test-qobject-input-visitor$(EXESUF): tests/test-qobject-input-visito= r.o $(test-qapi-obj-y) -tests/test-qmp-cmds$(EXESUF): tests/test-qmp-cmds.o tests/test-qapi-comman= ds.o tests/test-qapi-init-commands.o $(test-qapi-obj-y) -tests/test-visitor-serialization$(EXESUF): tests/test-visitor-serializatio= n.o $(test-qapi-obj-y) -tests/test-opts-visitor$(EXESUF): tests/test-opts-visitor.o $(test-qapi-ob= j-y) - -tests/test-shift128$(EXESUF): tests/test-shift128.o $(test-util-obj-y) -tests/test-mul64$(EXESUF): tests/test-mul64.o $(test-util-obj-y) -tests/test-bitops$(EXESUF): tests/test-bitops.o $(test-util-obj-y) -tests/test-bitcnt$(EXESUF): tests/test-bitcnt.o $(test-util-obj-y) -tests/test-qgraph$(EXESUF): tests/test-qgraph.o tests/qtest/libqos/qgraph.= o $(test-util-obj-y) -tests/test-crypto-hash$(EXESUF): tests/test-crypto-hash.o $(test-crypto-ob= j-y) tests/benchmark-crypto-hash$(EXESUF): tests/benchmark-crypto-hash.o $(test= -crypto-obj-y) -tests/test-crypto-hmac$(EXESUF): tests/test-crypto-hmac.o $(test-crypto-ob= j-y) tests/benchmark-crypto-hmac$(EXESUF): tests/benchmark-crypto-hmac.o $(test= -crypto-obj-y) -tests/test-crypto-cipher$(EXESUF): tests/test-crypto-cipher.o $(test-crypt= o-obj-y) tests/benchmark-crypto-cipher$(EXESUF): tests/benchmark-crypto-cipher.o $(= test-crypto-obj-y) -tests/test-crypto-secret$(EXESUF): tests/test-crypto-secret.o $(test-crypt= o-obj-y) -tests/test-crypto-xts$(EXESUF): tests/test-crypto-xts.o $(test-crypto-obj-= y) - -ifeq ($(CONFIG_KEYUTILS),y) -tests/test-crypto-secret.o-libs :=3D -lkeyutils -endif - -tests/crypto-tls-x509-helpers.o-cflags :=3D $(TASN1_CFLAGS) -tests/crypto-tls-x509-helpers.o-libs :=3D $(TASN1_LIBS) -tests/pkix_asn1_tab.o-cflags :=3D $(TASN1_CFLAGS) - -tests/test-crypto-tlscredsx509.o-cflags :=3D $(TASN1_CFLAGS) -tests/test-crypto-tlscredsx509$(EXESUF): tests/test-crypto-tlscredsx509.o \ - tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o $(test-crypto-obj-y) - -tests/test-crypto-tlssession.o-cflags :=3D $(TASN1_CFLAGS) -tests/test-crypto-tlssession$(EXESUF): tests/test-crypto-tlssession.o \ - tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o \ - tests/crypto-tls-psk-helpers.o \ - $(test-crypto-obj-y) -tests/test-util-filemonitor$(EXESUF): tests/test-util-filemonitor.o \ - $(test-util-obj-y) -tests/test-util-sockets$(EXESUF): tests/test-util-sockets.o \ - tests/socket-helpers.o $(test-util-obj-y) -tests/test-authz-simple$(EXESUF): tests/test-authz-simple.o $(test-authz-o= bj-y) -tests/test-authz-list$(EXESUF): tests/test-authz-list.o $(test-authz-obj-y) -tests/test-authz-listfile$(EXESUF): tests/test-authz-listfile.o $(test-aut= hz-obj-y) -tests/test-authz-pam$(EXESUF): tests/test-authz-pam.o $(test-authz-obj-y) -tests/test-io-task$(EXESUF): tests/test-io-task.o $(test-io-obj-y) -tests/test-io-channel-socket$(EXESUF): tests/test-io-channel-socket.o \ - tests/io-channel-helpers.o tests/socket-helpers.o $(test-io-obj-y) -tests/test-io-channel-file$(EXESUF): tests/test-io-channel-file.o \ - tests/io-channel-helpers.o $(test-io-obj-y) -tests/test-io-channel-tls$(EXESUF): tests/test-io-channel-tls.o \ - tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o \ - tests/io-channel-helpers.o $(test-io-obj-y) -tests/test-io-channel-command$(EXESUF): tests/test-io-channel-command.o \ - tests/io-channel-helpers.o $(test-io-obj-y) -tests/test-io-channel-buffer$(EXESUF): tests/test-io-channel-buffer.o \ - tests/io-channel-helpers.o $(test-io-obj-y) -tests/test-crypto-pbkdf$(EXESUF): tests/test-crypto-pbkdf.o $(test-crypto-= obj-y) -tests/test-crypto-ivgen$(EXESUF): tests/test-crypto-ivgen.o $(test-crypto-= obj-y) -tests/test-crypto-afsplit$(EXESUF): tests/test-crypto-afsplit.o $(test-cry= pto-obj-y) -tests/test-crypto-block$(EXESUF): tests/test-crypto-block.o $(test-crypto-= obj-y) =20 tests/migration/stress$(EXESUF): tests/migration/stress.o $(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ,"L= INK","$(TARGET_DIR)$@") @@ -301,8 +65,6 @@ tests/migration/initrd-stress.img: tests/migration/stres= s$(EXESUF) rm $(INITRD_WORK_DIR)/init rmdir $(INITRD_WORK_DIR) =20 -tests/test-qga$(EXESUF): qga/qemu-ga$(EXESUF) -tests/test-qga$(EXESUF): tests/test-qga.o tests/qtest/libqtest.o $(test-ut= il-obj-y) tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-ob= j-y) libvhost-user.a tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_s= cm_helper.o =20 @@ -343,19 +105,9 @@ define do_test_tap "TAP","$@") endef =20 -build-unit: $(check-unit-y) - -check-unit: $(check-unit-y) - $(call do_test_human, $^) - check-speed: $(check-speed-y) $(call do_test_human, $^) =20 -# gtester tests with TAP output - -check-report-unit.tap: $(check-unit-y) - $(call do_test_tap,$^) - # Per guest TCG tests =20 BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS)) @@ -448,7 +200,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-v= m-images =20 # Consolidated targets =20 -.PHONY: check-block check-unit check check-clean get-vm-images +.PHONY: check-block check check-clean get-vm-images check: =20 ifeq ($(CONFIG_TOOLS)$(CONFIG_POSIX),yy) @@ -460,14 +212,12 @@ check-block: $(SRC_PATH)/tests/check-block.sh qemu-im= g$(EXESUF) \ @$< endif =20 -check-build: build-unit $(QEMU_IOTESTS_HELPERS-y) +check-build: $(QEMU_IOTESTS_HELPERS-y) =20 check-clean: - rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) + rm -rf tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) =20 -check: check-unit - clean: check-clean =20 # Build the help program automatically diff --git a/tests/meson.build b/tests/meson.build index 3aeae23d54..bd5d13f6f9 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,5 +1,7 @@ +py3 =3D import('python').find_installation() + qht_bench =3D executable('qht-bench', - sources: files('qht-bench.c'), + sources: 'qht-bench.c', dependencies: [qemuutil]) =20 test_qapi_outputs =3D [ @@ -47,6 +49,178 @@ subdir('include') libtestqapi =3D static_library('testqapi', sources: [test_qapi_files, test= _qapi_outputs_extra]) testqapi =3D declare_dependency(link_with: libtestqapi) =20 +testblock =3D declare_dependency(dependencies: [block], sources: 'iothread= .c') + +tests =3D { + 'check-block-qdict': [], + 'check-qdict': [], + 'check-qnum': [], + 'check-qstring': [], + 'check-qlist': [], + 'check-qnull': [], + 'check-qobject': [], + 'check-qjson': [], + 'check-qlit': [], + 'test-qobject-output-visitor': [testqapi], + 'test-clone-visitor': [testqapi], + 'test-qobject-input-visitor': [testqapi], + 'test-string-input-visitor': [testqapi], + 'test-string-output-visitor': [testqapi], + 'test-qmp-event': [testqapi], + 'test-opts-visitor': [testqapi], + 'test-visitor-serialization': [testqapi], + 'test-bitmap': [], + # all code tested by test-x86-cpuid is inside topology.h + 'test-x86-cpuid': [], + 'test-cutils': [], + 'test-shift128': [], + 'test-mul64': [], + # all code tested by test-int128 is inside int128.h + 'test-int128': [], + 'rcutorture': [], + 'test-rcu-list': [], + 'test-rcu-simpleq': [], + 'test-rcu-tailq': [], + 'test-rcu-slist': [], + 'test-qdist': [], + 'test-qht': [], + 'test-bitops': [], + 'test-bitcnt': [], + 'test-qgraph': ['qtest/libqos/qgraph.c'], + 'check-qom-interface': [qom], + 'check-qom-proplist': [qom], + 'test-qemu-opts': [], + 'test-keyval': [testqapi], + 'test-logging': [], + 'test-uuid': [], + 'ptimer-test': ['ptimer-test-stubs.c', meson.source_root() / 'hw/core/pt= imer.c'], + 'test-qapi-util': [], +} + +if have_block + tests +=3D { + 'test-coroutine': [testblock], + 'test-aio': [testblock], + 'test-aio-multithread': [testblock], + 'test-throttle': [testblock], + 'test-thread-pool': [testblock], + 'test-hbitmap': [testblock], + 'test-bdrv-drain': [testblock], + 'test-bdrv-graph-mod': [testblock], + 'test-blockjob': [testblock], + 'test-blockjob-txn': [testblock], + 'test-block-backend': [testblock], + 'test-block-iothread': [testblock], + 'test-write-threshold': [testblock], + 'test-crypto-hash': [crypto], + 'test-crypto-hmac': [crypto], + 'test-crypto-cipher': [crypto], + 'test-crypto-secret': [crypto, keyutils], + 'test-authz-simple': [authz], + 'test-authz-list': [authz], + 'test-authz-listfile': [authz], + 'test-io-task': [testblock], + 'test-io-channel-socket': ['socket-helpers.c', 'io-channel-helpers.c',= io], + 'test-io-channel-file': ['io-channel-helpers.c', io], + 'test-io-channel-command': ['io-channel-helpers.c', io], + 'test-io-channel-buffer': ['io-channel-helpers.c', io], + 'test-crypto-ivgen': [io], + 'test-crypto-afsplit': [io], + 'test-crypto-block': [io], + } + if 'CONFIG_GNUTLS' in config_host and \ + 'CONFIG_TASN1' in config_host + tests +=3D { + 'test-crypto-tlscredsx509': ['crypto-tls-x509-helpers.c', 'pkix_asn1= _tab.c', + tasn1, crypto], + 'test-crypto-tlssession': ['crypto-tls-x509-helpers.c', 'pkix_asn1_t= ab.c', 'crypto-tls-psk-helpers.c', + tasn1, crypto], + 'test-io-channel-tls': ['io-channel-helpers.c', 'crypto-tls-x509-hel= pers.c', 'pkix_asn1_tab.c', + tasn1, io, crypto]} + endif + if 'CONFIG_AUTH_PAM' in config_host + tests +=3D {'test-authz-pam': [authz]} + endif + if 'CONFIG_QEMU_PRIVATE_XTS' in config_host + tests +=3D {'test-crypto-xts': [crypto, io]} + endif + if 'CONFIG_POSIX' in config_host + tests +=3D {'test-image-locking': [testblock]} + endif + if 'CONFIG_REPLICATION' in config_host and \ + 'CONFIG_POSIX' in config_host + tests +=3D {'test-replication': [testblock]} + endif + if 'CONFIG_NETTLE' in config_host or 'CONFIG_GCRYPT' in config_host + tests +=3D {'test-crypto-pbkdf': [io]} + endif +endif + +if have_system + tests +=3D { + 'test-iov': [], + 'test-qmp-cmds': [testqapi], + 'test-xbzrle': [migration], + 'test-vmstate': [migration, io], + 'test-timed-average': [], + 'test-util-filemonitor': [], + 'test-util-sockets': ['socket-helpers.c'], + 'test-base64': [], + 'test-bufferiszero': [], + } + if 'CONFIG_POSIX' in config_host + tests +=3D {'test-vmstate': [migration, io]} + endif + if 'CONFIG_INOTIFY1' in config_host + tests +=3D {'test-util-filemonitor': []} + endif + + # Some tests: test-char, test-qdev-global-props, and test-qga, + # are not runnable under TSan due to a known issue. + # https://github.com/google/sanitizers/issues/1116 + if 'CONFIG_TSAN' not in config_host + tests +=3D { + 'test-char': ['socket-helpers.c', qom, io, chardev], + 'test-qdev-global-props': [qom, hwcore, testqapi] + } + endif +endif + +if 'CONFIG_TSAN' not in config_host and \ + 'CONFIG_GUEST_AGENT' in config_host and \ + 'CONFIG_LINUX' in config_host + tests +=3D {'test-qga': ['qtest/libqtest.c']} +endif + +test_deps =3D { + 'test-qht-par': qht_bench, + 'test-qga': qga, +} + +test_env =3D environment() +test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) +test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) + +foreach test_name, extra: tests + src =3D [test_name + '.c'] + deps =3D [qemuutil] + if extra.length() > 0 + # use a sourceset to quickly separate sources and deps + test_ss =3D ss.source_set() + test_ss.add(extra) + src +=3D test_ss.all_sources() + deps +=3D test_ss.all_dependencies() + endif + exe =3D executable(test_name, src, dependencies: deps) + + test(test_name, exe, + depends: test_deps.get(test_name, []), + env: test_env, + args: ['--tap', '-k'], + protocol: 'tap', + suite: ['unit']) +endforeach + if have_system and 'CONFIG_POSIX' in config_host subdir('qemu-iotests') endif diff --git a/tests/test-qga.c b/tests/test-qga.c index 122730d326..1e223e992c 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -4,7 +4,7 @@ #include #include =20 -#include "libqos/libqtest.h" +#include "qtest/libqos/libqtest.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" =20 --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052133; cv=none; d=zohomail.com; s=zohoarc; b=QFvowXs7ww+knabv4qKqSj7CQ/71TtdKlb0nqVU4+MMNf8WpKrO20VuGze/MELZpb/vGF4gsK8sNy5LHOZ7slfD9WGYnHWm22sxgFqzKNm7zW2VXJkDe5qLYIH6GOIUYjdwLGY971UP5/sgtcB8yycu9E32P5Sb6GlRZG+EQvZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052133; 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; bh=hNC++EisQar/f/E7gimpP8924iax8X00AoPinplBz/Y=; b=WjAhS8D50k8MM6TmIADIlO2F9nUGhJQ6/Z15e+1iPN8hI00Jmp75O3n6nLRY57qy2GYeZgXuOL4kKZRwJsEgfoOyM1Dn+aWfhFlvhw//T8wOXKEGKz0lLjoeuvCFvhWS7XllpDRLDZFEVwVyMajf2eVNaCaq84pBQpwBqPoADHQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052133378906.9292589907774; Wed, 2 Sep 2020 06:08:53 -0700 (PDT) Received: from localhost ([::1]:57602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSVQ-0006AO-J6 for importer@patchew.org; Wed, 02 Sep 2020 09:08:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMT-00067a-EB for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:37 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:36678 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 1kDSMQ-00077n-JB for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:37 -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-473-aP9SzZqeOGKYecEnDnTmcg-1; Wed, 02 Sep 2020 08:59:31 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6DDB9805EF2 for ; Wed, 2 Sep 2020 12:59:27 +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 19B117B90B; Wed, 2 Sep 2020 12:59:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hNC++EisQar/f/E7gimpP8924iax8X00AoPinplBz/Y=; b=eiAsYNhBqcAO9YZ763I4pPAWAoq4A1+gwD2WRR/381CJjM6tTFLEPq2L63Jo4tPeCKyz2Y BxkuCRQv0QLypdNTzdsn0ORAKz1BYMqmxxAEHRbpLZqR8vRm8h2h7+HTj77rJeSCjWOptK CDHCf/oqKgD9/8F+ZWuIkuzhSWnvF0o= X-MC-Unique: aP9SzZqeOGKYecEnDnTmcg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 17/39] meson: move keyutils dependency check Date: Wed, 2 Sep 2020 08:58:55 -0400 Message-Id: <20200902125917.26021-18-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:07:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Since there is not minimum version specified, and it's a test-only dependency, it's fair to depend on a version that ships with a .pc I suppose. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200828110734.1638685-8-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 25 ------------------------- meson.build | 7 +++---- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/configure b/configure index 6a43ef6c2d..82b2211936 100755 --- a/configure +++ b/configure @@ -6305,28 +6305,6 @@ but not implemented on your system" fi fi =20 -########################################## -# check for usable keyutils.h - -if test "$linux" =3D "yes" ; then - - have_keyutils=3Dno - cat > $TMPC << EOF -#include -#include -#include -#include -#include -int main(void) { - return request_key("user", NULL, NULL, 0); -} -EOF - if compile_prog "" "-lkeyutils"; then - have_keyutils=3Dyes - fi -fi - - ########################################## # End of CC checks # After here, no more $cc or $ld runs @@ -7510,9 +7488,6 @@ fi =20 if test "$secret_keyring" =3D "yes" ; then echo "CONFIG_SECRET_KEYRING=3Dy" >> $config_host_mak - if test "$have_keyutils" =3D "yes" ; then - echo "CONFIG_KEYUTILS=3Dy" >> $config_host_mak - fi fi =20 if test "$tcg_interpreter" =3D "yes"; then diff --git a/meson.build b/meson.build index fc46273491..7c714bb49c 100644 --- a/meson.build +++ b/meson.build @@ -410,10 +410,8 @@ if 'CONFIG_TASN1' in config_host tasn1 =3D declare_dependency(compile_args: config_host['TASN1_CFLAGS'].s= plit(), link_args: config_host['TASN1_LIBS'].split()) endif -keyutils =3D not_found -if 'CONFIG_KEYUTILS' in config_host - keyutils =3D declare_dependency(link_args: '-lkeyutils') -endif +keyutils =3D dependency('libkeyutils', required: false, + method: 'pkg-config', static: enable_static) =20 # Create config-host.h =20 @@ -424,6 +422,7 @@ config_host_data.set('CONFIG_VNC_JPEG', jpeg.found()) config_host_data.set('CONFIG_VNC_PNG', png.found()) config_host_data.set('CONFIG_VNC_SASL', sasl.found()) config_host_data.set('CONFIG_XKBCOMMON', xkbcommon.found()) +config_host_data.set('CONFIG_KEYUTILS', keyutils.found()) config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version(= ))) config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('= .')[0]) config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('= .')[1]) --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599051868; cv=none; d=zohomail.com; s=zohoarc; b=hRIzbxrAM9/B1MoF0FEBtGyCMmyOHRuGNuyhfpTCttTp1fCO4xTFQgymc4fVmFNgCosf+tDpdjAVuPUAbRVww5Gf2XZaNQRJ5C0Y3oKeb5UouJFBadGTq+OAk3NDDC8AcPy37nwyKK7NsV2KuTdGJuYvO74WtO6hTUqzlZKjulE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599051868; 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; bh=zwXmnckO+iG2uDr07UWgSCscI6KlxObmHPb2/Umqe7c=; b=A5AcqdiYiOWIObATj5QepS5c6CN8xMYAO55yYq2aDA9dwfQLTW1sQNhG2IC1WRffaNgwzuLMG2Mlcvh8foaU9cmwChjNcBwKzAYKaGb/9IjGC/T7EUS1bsjfy/+5kACL7n52hFjeRdCVkupHrl9wk8bDaLxafVBLNmgq1vRGBzI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599051868440285.2372461992194; Wed, 2 Sep 2020 06:04:28 -0700 (PDT) Received: from localhost ([::1]:38044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSR9-0006X6-Dx for importer@patchew.org; Wed, 02 Sep 2020 09:04:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMS-00064g-Cd for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:36 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:33616 helo=us-smtp-delivery-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 1kDSMP-000776-SF for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:35 -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-225-L3jkQMChPNmX-ORcKgdK_A-1; Wed, 02 Sep 2020 08:59:31 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E017981F009 for ; Wed, 2 Sep 2020 12:59:27 +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 8E96776E01; Wed, 2 Sep 2020 12:59:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zwXmnckO+iG2uDr07UWgSCscI6KlxObmHPb2/Umqe7c=; b=NoEUNaJmIthbEKBQfSR38UlMY+NO7RJbyM4g1k3aZNUjU+1iWEZgT3JT9rvJzf3TdPasUd JZMcpHXGZgTr3MRRQW23R0L5bz3jkNo+bupBsipH00OrMwwD++N7gg5HJKZr1UiMmYiBD4 IW91jNiFBwe655+H4IqDn7VZm9gI5Ls= X-MC-Unique: L3jkQMChPNmX-ORcKgdK_A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 18/39] meson: remove old socket_scm_helper rule Date: Wed, 2 Sep 2020 08:58:56 -0400 Message-Id: <20200902125917.26021-19-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:33:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau It was covered already in commit d3ca592b3c10 ("meson: convert check-block") Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200828110734.1638685-9-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index ce0a9fd780..b68911833f 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -66,7 +66,6 @@ tests/migration/initrd-stress.img: tests/migration/stress= $(EXESUF) rmdir $(INITRD_WORK_DIR) =20 tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-ob= j-y) libvhost-user.a -tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_s= cm_helper.o =20 SPEED =3D quick =20 --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052207; cv=none; d=zohomail.com; s=zohoarc; b=nS4/QGrTULt8bp7IJshA9yJisBEYKh6IPhZYg7Zh5BX3Ed/iEGX6uzRO4L8/0CTRMHbkqZ8y/6KrgwjrARvme58O3dYhf7EU/jFd1bcHSVpigz8/idCIjylwnIWtjH6abhe3wWjc9u+f8XRrogpxmTpA8jBkMBTa77tXRw1JSiI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052207; 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; bh=MpnvhkuY94YofkmT++ed5KWHesYrjJBLpFzTMzeP1+0=; b=Gh5OyVKrF2AFy1UyiZ9gwEhh2CFsSJhyw+8grSpdxJiFpnp5yLxxBDU5ToX8rbBa0WWPa0fnS+Ymii+fLhr/qTg9zFYTzA0QtqvML05BEfh03eQH6bQ/bOrotCrUH4zY8GAnxLG6xV/Pb/SEbmWcITVZbDJtUBs1SJJ3YKs25Gk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052207113110.81962900152894; Wed, 2 Sep 2020 06:10:07 -0700 (PDT) Received: from localhost ([::1]:35504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSWc-0000DL-AB for importer@patchew.org; Wed, 02 Sep 2020 09:10:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMT-00068k-PB for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:38 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:34382 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 1kDSMR-00078G-08 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:37 -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-507-GqS6OwEEOcuoaidG_mMbqg-1; Wed, 02 Sep 2020 08:59:31 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5E31F1008542 for ; Wed, 2 Sep 2020 12:59:28 +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 0D15F76E01; Wed, 2 Sep 2020 12:59:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MpnvhkuY94YofkmT++ed5KWHesYrjJBLpFzTMzeP1+0=; b=drj/S/IeFxsRoazY61h/VPyc+3p8oI6mgDBeTtKGafOjwNSxAUjuwI2iZjwVFl2FG4d1XN pXFmL76Ccd++Fa0l2Jsx6/byPk234PFPMZezryODKGRny9qMnvDatKNrNEaOXiPHMpj/eu rEmoQnrVUBu2ZIXAjGnBH3BwQFh2vFE= X-MC-Unique: GqS6OwEEOcuoaidG_mMbqg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 19/39] meson: convert vhost-user-bridge Date: Wed, 2 Sep 2020 08:58:57 -0400 Message-Id: <20200902125917.26021-20-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:07:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200828110734.1638685-10-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 2 -- tests/meson.build | 9 +++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index b68911833f..04ffda66a5 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -65,8 +65,6 @@ tests/migration/initrd-stress.img: tests/migration/stress= $(EXESUF) rm $(INITRD_WORK_DIR)/init rmdir $(INITRD_WORK_DIR) =20 -tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-ob= j-y) libvhost-user.a - SPEED =3D quick =20 # gtester tests, possibly with verbose output diff --git a/tests/meson.build b/tests/meson.build index bd5d13f6f9..8c6ace25ef 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -221,6 +221,15 @@ foreach test_name, extra: tests suite: ['unit']) endforeach =20 + +if have_tools and 'CONFIG_VHOST_USER' in config_host + executable('vhost-user-bridge', + sources: files('vhost-user-bridge.c'), + link_with: [libvhost_user], + dependencies: [qemuutil], + build_by_default: false) +endif + if have_system and 'CONFIG_POSIX' in config_host subdir('qemu-iotests') endif --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052201; cv=none; d=zohomail.com; s=zohoarc; b=TJuJE6ecKcdx9SMEizuHmuTCpy8zhEmvAwlVsuysLdxKIRnFLFDgN/iE0jYujyCLDXdMr11WSf8Smcc5ZGz6yqn1CT5O/3svNq0ajGHkqant9HMiC6ibLzSA6XvZnK9HVfd6gWiSus3CAkToawWyN88RJTnXPJfReaTd7EnLzaI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052201; 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; bh=LqZiTsy/tPatniTvh2PwE6XUEqzGQb6peikuf9IxSLw=; b=FtcXE5Ny+7VIM4T8K8MTtgb/TQMtLRuez6r+bb0/9ThfSJ20/moflWKKhZdoza8NXarYyZZ8U0kAlMyyC/JZ8TMs8QcbRm9SJdd0ZajrfjOOV6FMJtHnZSbrBflxsTfVfIykWTv1gp8Cd1i7WBG5aUicsqavIKVPynCETzvwm28= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 159905220144488.15140361583019; Wed, 2 Sep 2020 06:10:01 -0700 (PDT) Received: from localhost ([::1]:34884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSWW-0008PN-GF for importer@patchew.org; Wed, 02 Sep 2020 09:10:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMU-0006At-Qj for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:34615) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDSMS-00078g-2u for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:38 -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-535-7T_j5DsUM7KQzvLE8EdLmg-1; Wed, 02 Sep 2020 08:59:33 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3CA5118BFEF1 for ; Wed, 2 Sep 2020 12:59:29 +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 CC0BA76E01; Wed, 2 Sep 2020 12:59:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LqZiTsy/tPatniTvh2PwE6XUEqzGQb6peikuf9IxSLw=; b=W0vkR+KLk65ZwLmhdMXuIUM/JO8aLoNQyaOgRadpZK6oASuJl+u3kI8BbswKF4cVbmChoc W5nq7HjmN+hAveIjYxofFzQjQlW+zvI8JL4t4OIko9GircSJQhiFoVokXp8vSgNHfyhH6i WZqhPGI30W2IFSz8lGxAh8NQF38Wf+g= X-MC-Unique: 7T_j5DsUM7KQzvLE8EdLmg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 20/39] meson: convert atomic*-bench Date: Wed, 2 Sep 2020 08:58:58 -0400 Message-Id: <20200902125917.26021-21-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 01:13:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200828110734.1638685-11-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 5 ----- tests/meson.build | 10 ++++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 04ffda66a5..0388a0e4fd 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -44,11 +44,6 @@ check-speed-$(CONFIG_BLOCK) +=3D tests/benchmark-crypto-= cipher$(EXESUF) =20 QEMU_CFLAGS +=3D -I$(SRC_PATH)/tests -I$(SRC_PATH)/tests/qtest =20 -# Deps that are common to various different sets of tests below -test-util-obj-y =3D libqemuutil.a -tests/atomic_add-bench$(EXESUF): tests/atomic_add-bench.o $(test-util-obj-= y) -tests/atomic64-bench$(EXESUF): tests/atomic64-bench.o $(test-util-obj-y) - tests/benchmark-crypto-hash$(EXESUF): tests/benchmark-crypto-hash.o $(test= -crypto-obj-y) tests/benchmark-crypto-hmac$(EXESUF): tests/benchmark-crypto-hmac.o $(test= -crypto-obj-y) tests/benchmark-crypto-cipher$(EXESUF): tests/benchmark-crypto-cipher.o $(= test-crypto-obj-y) diff --git a/tests/meson.build b/tests/meson.build index 8c6ace25ef..2c87e16fad 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -4,6 +4,16 @@ qht_bench =3D executable('qht-bench', sources: 'qht-bench.c', dependencies: [qemuutil]) =20 +executable('atomic_add-bench', + sources: files('atomic_add-bench.c'), + dependencies: [qemuutil], + build_by_default: false) + +executable('atomic64-bench', + sources: files('atomic64-bench.c'), + dependencies: [qemuutil], + build_by_default: false) + test_qapi_outputs =3D [ 'qapi-builtin-types.c', 'qapi-builtin-types.h', --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052049; cv=none; d=zohomail.com; s=zohoarc; b=D82tcrn+w5EkIIUiU22m6DXUKj4PaR6E0308ucEcpqaq6PqKLKho7RkyJm0CUpL7Z0/laws0GF5e3a55fp71aGwrgHyq9tvwnb7yHHU4oOQDY/086KuhQ1UdRWvvNGr9bkrpd5GFChDKt+K+2IST4xEKoK0ydA5vn6MOjzUsUlU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052049; 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; bh=Vq0F63TwAmF545aJt6SfKmcoeuvR1cdZmiT6FTtj8qs=; b=U9oASjdd3Awv4UU6r1ZkHpZXdmFH2FewvLDl/UeWARDIpVmVtR2V3pkT1GJ04xBuSi8URH8rkkFsMw5tIOy8iAh2RdDKYU1x7C+79/EYRHRxJNQRMS2ig8Xe/iU8bQrV7h1YLgZ9zW/XH/IxnaJ2CL3yV3o8/kc6JQvHHoMmvCc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052049298936.8648340202234; Wed, 2 Sep 2020 06:07:29 -0700 (PDT) Received: from localhost ([::1]:49168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSU4-0002me-HS for importer@patchew.org; Wed, 02 Sep 2020 09:07:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMS-00065j-P6 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46399) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDSMP-00076y-TU for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:36 -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-197-rtHCh_saNyyBcV30U766Rw-1; Wed, 02 Sep 2020 08:59:31 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AA4B05703A; Wed, 2 Sep 2020 12:59:29 +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 56B8A76E01; Wed, 2 Sep 2020 12:59:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Vq0F63TwAmF545aJt6SfKmcoeuvR1cdZmiT6FTtj8qs=; b=CSoouZun0tlRTzvCZgXdQH8mFzEGkJTFzIVpj1BCrLTLeI/y/iDrX6ys97q6rwM/1ACBmd cLjtiPin/C32YDUZdT7jo9vHuRNsurYgQ94FAV9zeBDBIeC8tbh/UcgltEqEFspVSFxTF5 6XFILsAwr//0s+8q2MKmgRz0BBVQkDc= X-MC-Unique: rtHCh_saNyyBcV30U766Rw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 21/39] tests: do not print benchmark output to stdout Date: Wed, 2 Sep 2020 08:58:59 -0400 Message-Id: <20200902125917.26021-22-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 01:13:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau As this makes the TAP output invalid. Use g_test_message(). Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200828110734.1638685-13-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- tests/benchmark-crypto-cipher.c | 8 ++++---- tests/benchmark-crypto-hash.c | 2 +- tests/benchmark-crypto-hmac.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/benchmark-crypto-cipher.c b/tests/benchmark-crypto-ciphe= r.c index 53032334ec..1936aa4ae0 100644 --- a/tests/benchmark-crypto-cipher.c +++ b/tests/benchmark-crypto-cipher.c @@ -70,8 +70,8 @@ static void test_cipher_speed(size_t chunk_size, } g_test_timer_elapsed(); =20 - g_print("Enc chunk %zu bytes ", chunk_size); - g_print("%.2f MB/sec ", (double)total / MiB / g_test_timer_last()); + g_test_message("Enc chunk %zu bytes ", chunk_size); + g_test_message("%.2f MB/sec ", (double)total / MiB / g_test_timer_last= ()); =20 g_test_timer_start(); remain =3D total; @@ -85,8 +85,8 @@ static void test_cipher_speed(size_t chunk_size, } g_test_timer_elapsed(); =20 - g_print("Dec chunk %zu bytes ", chunk_size); - g_print("%.2f MB/sec ", (double)total / MiB / g_test_timer_last()); + g_test_message("Dec chunk %zu bytes ", chunk_size); + g_test_message("%.2f MB/sec ", (double)total / MiB / g_test_timer_last= ()); =20 qcrypto_cipher_free(cipher); g_free(plaintext); diff --git a/tests/benchmark-crypto-hash.c b/tests/benchmark-crypto-hash.c index d16837d00a..598111e75a 100644 --- a/tests/benchmark-crypto-hash.c +++ b/tests/benchmark-crypto-hash.c @@ -48,7 +48,7 @@ static void test_hash_speed(const void *opaque) } g_test_timer_elapsed(); =20 - g_print("%.2f MB/sec ", (double)total / MiB / g_test_timer_last()); + g_test_message("%.2f MB/sec ", (double)total / MiB / g_test_timer_last= ()); =20 g_free(out); g_free(in); diff --git a/tests/benchmark-crypto-hmac.c b/tests/benchmark-crypto-hmac.c index f1dfa240cb..f9fa22df95 100644 --- a/tests/benchmark-crypto-hmac.c +++ b/tests/benchmark-crypto-hmac.c @@ -55,10 +55,10 @@ static void test_hmac_speed(const void *opaque) } while (g_test_timer_elapsed() < 5.0); =20 total /=3D MiB; - g_print("hmac(sha256): "); - g_print("Testing chunk_size %zu bytes ", chunk_size); - g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last()); - g_print("%.2f MB/sec\n", total / g_test_timer_last()); + g_test_message("hmac(sha256): "); + g_test_message("Testing chunk_size %zu bytes ", chunk_size); + g_test_message("done: %.2f MB in %.2f secs: ", total, g_test_timer_las= t()); + g_test_message("%.2f MB/sec\n", total / g_test_timer_last()); =20 g_free(out); g_free(in); --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052446; cv=none; d=zohomail.com; s=zohoarc; b=IWEox1F1ebxRNlBy1l+0rZdso2tBJMIiavECYeo745RutebjZlEdMmTeqwQVwhaU4dw8Xda4czq0WwNtru6Y29+uKDcTSiMrksxZXf9INTlPiOpHGYYtBKKc5U836oAiuA1RPuCG3zX/EsqN4A48jpfPL1adqsO+akeTFM7UZt4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052446; 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; bh=AGp13knl2AwbwIUfbsui0EZTYEE2bUjwSJ476S/wUZQ=; b=X4MOtcwHRbUeiYuueK1eGv5dvaZGecQMdWqCSX4Xot8jcDFdrX/Pxge5fIarS/3hb1SRvv5rwBAGw9pixnTSBvz8leFfekmh4PJMxowy6Iv6RS/XYZSrzQhx3zg7OOrSD22gCYF1EpSptCqzwQ7Roj0bDCEblveOU/zdSGo09vg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052446727883.3070707442591; Wed, 2 Sep 2020 06:14:06 -0700 (PDT) Received: from localhost ([::1]:60296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSaT-0001n2-8x for importer@patchew.org; Wed, 02 Sep 2020 09:14:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMY-0006Jm-5v for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:38035) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDSMT-00079V-Km for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:41 -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-440-xY9ykD2aMJOi9sJFLJM-DQ-1; Wed, 02 Sep 2020 08:59:33 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1405010ABDB8 for ; Wed, 2 Sep 2020 12:59:30 +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 C4CCB7B90B; Wed, 2 Sep 2020 12:59:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AGp13knl2AwbwIUfbsui0EZTYEE2bUjwSJ476S/wUZQ=; b=gUWawvWk8P2oe0/4zggszv3U/HRYAjkkOT0dOdX8E9CbxsZC4cMF0kjTScxPxb7o5kJgr9 3f/9oTws1OUWlbqjrxNWTYmM07RlhNaJNTxKVpGgQANqhdBcs1aevAtYna9XphBLF7Gf2E AlVV35clQxx5Pwm0+lNzMzSNe8ayPk4= X-MC-Unique: xY9ykD2aMJOi9sJFLJM-DQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 22/39] meson: convert the speed tests Date: Wed, 2 Sep 2020 08:59:00 -0400 Message-Id: <20200902125917.26021-23-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:42:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Use meson benchmark() for them, adjust mtest2make.py for that. A new target "make bench" can be used to run all benchmarks. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200828110734.1638685-14-marcandre.lureau@redhat.com> [Rewrite mtest2make part. - Paolo] Signed-off-by: Paolo Bonzini --- Makefile | 3 ++- scripts/mtest2make.py | 9 ++++++++- tests/Makefile.include | 15 ++++----------- tests/meson.build | 16 ++++++++++++++++ 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index ed354c43b0..d4d6a67d96 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ ${ninja-targets-c_COMPILER} ${ninja-targets-cpp_COMPILER}= : .var.command +=3D -MP # reread (and MESON won't be empty anymore). ifneq ($(MESON),) Makefile.mtest: build.ninja scripts/mtest2make.py - $(MESON) introspect --tests | $(PYTHON) scripts/mtest2make.py > $@ + $(MESON) introspect --tests --benchmarks | $(PYTHON) scripts/mtest2make.p= y > $@ -include Makefile.mtest endif =20 @@ -283,6 +283,7 @@ help: @echo '' @echo 'Test targets:' $(call print-help,check,Run all tests (check-help for details)) + $(call print-help,bench,Run all benchmarks) $(call print-help,docker,Help about targets running tests inside containe= rs) $(call print-help,vm-help,Help about targets running tests inside VM) @echo '' diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index e5dcb66bf7..afb8835191 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -99,12 +99,19 @@ def emit_suite(name, suite, prefix): print('endif') =20 testsuites =3D defaultdict(Suite) -for test in introspect: +for test in introspect['tests']: process_tests(test, testsuites) emit_prolog(testsuites, 'check') for name, suite in testsuites.items(): emit_suite(name, suite, 'check') =20 +benchsuites =3D defaultdict(Suite) +for test in introspect['benchmarks']: + process_tests(test, benchsuites) +emit_prolog(benchsuites, 'bench') +for name, suite in benchsuites.items(): + emit_suite(name, suite, 'bench') + print('.PHONY: $(patsubst %, run-test-%, $(.tests))') print('$(patsubst %, run-test-%, $(sort $(.tests))): run-test-%: all') print('\t@$(call .test.run,$*,$(.test.output-format))') diff --git a/tests/Makefile.include b/tests/Makefile.include index 0388a0e4fd..fe22ccfcc6 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -38,16 +38,8 @@ export SRC_PATH SYSEMU_TARGET_LIST :=3D $(subst -softmmu.mak,,$(notdir \ $(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak))) =20 -check-speed-$(CONFIG_BLOCK) +=3D tests/benchmark-crypto-hash$(EXESUF) -check-speed-$(CONFIG_BLOCK) +=3D tests/benchmark-crypto-hmac$(EXESUF) -check-speed-$(CONFIG_BLOCK) +=3D tests/benchmark-crypto-cipher$(EXESUF) - QEMU_CFLAGS +=3D -I$(SRC_PATH)/tests -I$(SRC_PATH)/tests/qtest =20 -tests/benchmark-crypto-hash$(EXESUF): tests/benchmark-crypto-hash.o $(test= -crypto-obj-y) -tests/benchmark-crypto-hmac$(EXESUF): tests/benchmark-crypto-hmac.o $(test= -crypto-obj-y) -tests/benchmark-crypto-cipher$(EXESUF): tests/benchmark-crypto-cipher.o $(= test-crypto-obj-y) - tests/migration/stress$(EXESUF): tests/migration/stress.o $(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ,"L= INK","$(TARGET_DIR)$@") =20 @@ -97,9 +89,6 @@ define do_test_tap "TAP","$@") endef =20 -check-speed: $(check-speed-y) - $(call do_test_human, $^) - # Per guest TCG tests =20 BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS)) @@ -212,6 +201,10 @@ check-clean: =20 clean: check-clean =20 +# For backwards compatibility + +check-speed: bench-speed + # Build the help program automatically =20 -include $(wildcard tests/*.d) diff --git a/tests/meson.build b/tests/meson.build index 2c87e16fad..71d0776a79 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -107,6 +107,8 @@ tests =3D { 'test-qapi-util': [], } =20 +benchs =3D {} + if have_block tests +=3D { 'test-coroutine': [testblock], @@ -164,6 +166,11 @@ if have_block if 'CONFIG_NETTLE' in config_host or 'CONFIG_GCRYPT' in config_host tests +=3D {'test-crypto-pbkdf': [io]} endif + benchs +=3D { + 'benchmark-crypto-hash': {'deps': [crypto]}, + 'benchmark-crypto-hmac': {'deps': [crypto]}, + 'benchmark-crypto-cipher': {'deps': [crypto]}, + } endif =20 if have_system @@ -231,6 +238,15 @@ foreach test_name, extra: tests suite: ['unit']) endforeach =20 +foreach bench_name, extra_args: benchs + src =3D extra_args.get('src', [bench_name + '.c']) + exe =3D executable(bench_name, src, + dependencies: [qemuutil] + extra_args.get('deps', [])) + benchmark(bench_name, exe, + args: ['--tap', '-k'], + protocol: 'tap', + suite: ['speed']) +endforeach =20 if have_tools and 'CONFIG_VHOST_USER' in config_host executable('vhost-user-bridge', --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599051998; cv=none; d=zohomail.com; s=zohoarc; b=STlcVr09q5Hx5vcGr/2IsyNu2/1Fvct00Ftb0fTFMICqLl2ucpkJtPiHGcBh2lA7+ebO0l0LbFWIdxeTchM6+cQX9cnChPLWoPHpDWaOlg+FKY6tvg7IoUBdk5jBbTZyXUwvZayGBt7EirY2fyEzygY7U3a8yY9tEreFx2A9Czc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599051998; 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; bh=v4TVz1WCilqTi/33TbwGq0rRGyN4bN158F/BnaUJQ6U=; b=KZ1SAt7pMcSMYTfOB1YrxnpzprKupkK7gFDkJ92O4ZdTbCIC/XtpuFYazOk5Uh+6zFytkTV+7i4Z+cmOQIsc/b6V7JpXe66ZJV8Euns2wuy6/oIfgaUL3lh+Z2haln7QZ/3f3TBkvu/I08wD08SZOfnQHPP1WW5Hxg3t8F8sxSM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599051998322579.786577621446; Wed, 2 Sep 2020 06:06:38 -0700 (PDT) Received: from localhost ([::1]:46410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSTF-0001cV-I8 for importer@patchew.org; Wed, 02 Sep 2020 09:06:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMT-00066S-2Q for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29320) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDSMP-00076r-UT for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:36 -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-102-qwXzk5T2NZ6cvuBwHKAFkw-1; Wed, 02 Sep 2020 08:59:31 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 768EC5708B for ; Wed, 2 Sep 2020 12:59:30 +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 2E98A76E01; Wed, 2 Sep 2020 12:59:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v4TVz1WCilqTi/33TbwGq0rRGyN4bN158F/BnaUJQ6U=; b=NHuhMrYvqpaAiFu3GBRJautgXW202tCfAT803uW6fT1t2Z/reuHzBa76PHzrEZ5fnTHYZW V7L+GWZTAiO52/aq6Oo6vKDOo6R+wu9mahCPKHfYGMeWLO4+MELrAb+KajoHo/MMShN3IO WC+d5Z5nXfKcl+p0kLqC1W5G6YAhVZc= X-MC-Unique: qwXzk5T2NZ6cvuBwHKAFkw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 23/39] tests/migration/stress: remove unused exit_success Date: Wed, 2 Sep 2020 08:59:01 -0400 Message-Id: <20200902125917.26021-24-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:42:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200828110734.1638685-15-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- tests/migration/stress.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/tests/migration/stress.c b/tests/migration/stress.c index a062ef6b55..05d85051e3 100644 --- a/tests/migration/stress.c +++ b/tests/migration/stress.c @@ -47,19 +47,6 @@ static __attribute__((noreturn)) void exit_failure(void) } } =20 -static __attribute__((noreturn)) void exit_success(void) -{ - if (getpid() =3D=3D 1) { - sync(); - reboot(RB_POWER_OFF); - fprintf(stderr, "%s (%05d): ERROR: cannot reboot: %s\n", - argv0, gettid(), strerror(errno)); - abort(); - } else { - exit(0); - } -} - static int get_command_arg_str(const char *name, char **val) { --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052239; cv=none; d=zohomail.com; s=zohoarc; b=VfvlIOOye5HuSaSl/YIwvzS/mgLUtba4L6MR/qDmKK8W30/OefVXWwn414dbfes39t7Qsx1hd1QvbZHTiBlVan/3gfx2aKuE7tU/IJuibguRJVqkhYCs5I2BKNayTe1lNHqQSEjGas/XDCKYNAf2cqTOTJP+SZmAD0oFSDuaO0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052239; 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; bh=k8S3oXxz3JeO9vktC9+EDUO3DZiEVkn457DPI+0QHaY=; b=iFWwHbsMyahP6emaiNeX+g9ijTPNll7Ig6z1rAF1H0JLEtVeUDuWQ8bAql7KjIJQJXzFHckczLRAR9AA6fsbyyUUA1eHtWie646fKVG7cUH+AP/OYWH7zpsIbgXZpRiY3/RRB21KxsLvFy0KF2slkiawE4fnxbxeqk5Jfl4mUQY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052239689754.6984355843125; Wed, 2 Sep 2020 06:10:39 -0700 (PDT) Received: from localhost ([::1]:37666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSX8-000157-QD for importer@patchew.org; Wed, 02 Sep 2020 09:10:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMT-00068H-L3 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:37 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:58372 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 1kDSMQ-00077s-NZ for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:37 -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-168-fL_5i71HPKq8eGxAWOtKaQ-1; Wed, 02 Sep 2020 08:59:32 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D31E5873073 for ; Wed, 2 Sep 2020 12:59:30 +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 9076576E01; Wed, 2 Sep 2020 12:59:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k8S3oXxz3JeO9vktC9+EDUO3DZiEVkn457DPI+0QHaY=; b=SLaLj8SEVV17P75Ilqazz0UoPgMyoxfPRQqVRjWG3W9cHZVTrcwV92xGFFc9MVw9wXV72g GHOdII67wb08UXEVUc3v6y74gSHOHD2z/aRWKblIkDerP9yKJkn99HTae/RUJaI7PpOVDv 1ihzpGmL7izC9v142T0rnbZzzr8tvHY= X-MC-Unique: fL_5i71HPKq8eGxAWOtKaQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 24/39] meson: fix migration/stress compilation with glibc>=2.30 Date: Wed, 2 Sep 2020 08:59:02 -0400 Message-Id: <20200902125917.26021-25-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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/02 02:26:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau gettid() was introduced with glibc 2.30. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200828110734.1638685-16-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- meson.build | 3 +++ tests/migration/stress.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/meson.build b/meson.build index 7c714bb49c..b71f561c96 100644 --- a/meson.build +++ b/meson.build @@ -413,6 +413,8 @@ endif keyutils =3D dependency('libkeyutils', required: false, method: 'pkg-config', static: enable_static) =20 +has_gettid =3D cc.has_function('gettid') + # Create config-host.h =20 config_host_data.set('CONFIG_SDL', sdl.found()) @@ -423,6 +425,7 @@ config_host_data.set('CONFIG_VNC_PNG', png.found()) config_host_data.set('CONFIG_VNC_SASL', sasl.found()) config_host_data.set('CONFIG_XKBCOMMON', xkbcommon.found()) config_host_data.set('CONFIG_KEYUTILS', keyutils.found()) +config_host_data.set('CONFIG_GETTID', has_gettid) config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version(= ))) config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('= .')[0]) config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('= .')[1]) diff --git a/tests/migration/stress.c b/tests/migration/stress.c index 05d85051e3..0c72a420be 100644 --- a/tests/migration/stress.c +++ b/tests/migration/stress.c @@ -29,10 +29,12 @@ const char *argv0; =20 #define PAGE_SIZE 4096 =20 +#ifndef CONFIG_GETTID static int gettid(void) { return syscall(SYS_gettid); } +#endif =20 static __attribute__((noreturn)) void exit_failure(void) { --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052098; cv=none; d=zohomail.com; s=zohoarc; b=ao32QgpQHrypzJd1IvNqOvfBBoYtTwqXwcuPj+fzpqUXjbHYsQU6jmSfPGPESlPQEQ4VTOwYqEijWfAIDXSbt3Nm9Q3TKyhM6NDLIDGJGHOSZASkZ04Ze05a/aVynj0p8KxNw1ZItUq5nLi21rziLeDUqXGwiiWRZ4M11aUIh9o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052098; 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; bh=JzD/Xbfh9iFS9Oeuypb7J+c3KYVRhhQuLnFFFo4vIrM=; b=jJbJS/0NNSuCFHh6ZBzOVkg+68Dbk5OOThkhxk6rhzLTgilQV3rcr+Mo0CZn6mkefsq3IdFBUJ1Jq/Qa5yFD3PuStfhfxreqR61iC7Bl9gkCSrXVJYBC0E2jZZquv+k2iPFM1RlSiDKmtB8IDJ8DYdIJgLqxeMqxBggk/xtOYuc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052098761313.4581504233794; Wed, 2 Sep 2020 06:08:18 -0700 (PDT) Received: from localhost ([::1]:54766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSUr-00052V-EF for importer@patchew.org; Wed, 02 Sep 2020 09:08:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMZ-0006Os-Mv for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:43 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:47093 helo=us-smtp-delivery-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 1kDSMW-0007AR-7i for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:43 -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-525-wnamRvktPpWzn4F887gIjw-1; Wed, 02 Sep 2020 08:59:35 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 42D52890E5E for ; Wed, 2 Sep 2020 12:59:31 +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 0001C7B90B; Wed, 2 Sep 2020 12:59:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JzD/Xbfh9iFS9Oeuypb7J+c3KYVRhhQuLnFFFo4vIrM=; b=gkxlypOwzWEobjNcji2yPjcJTo9TuEQHUz64ohEMqNXQoolkNWvmi3lXnHGj2lsNVGmTrU FgwAbwUHmjdMIGigw/t3KUM61xyyediM8qRyip7nwn1cwKOA1HybuewVTYrnhfmqECxY8I eMk8zgJ9OoaB7dH8ev+yOV1sMoERFkA= X-MC-Unique: wnamRvktPpWzn4F887gIjw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 25/39] meson: convert migration/initrd-stress Date: Wed, 2 Sep 2020 08:59:03 -0400 Message-Id: <20200902125917.26021-26-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:33:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200828110734.1638685-17-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 14 -------------- tests/meson.build | 1 + tests/migration/initrd-stress.sh | 10 ++++++++++ tests/migration/meson.build | 14 ++++++++++++++ 4 files changed, 25 insertions(+), 14 deletions(-) create mode 100755 tests/migration/initrd-stress.sh create mode 100644 tests/migration/meson.build diff --git a/tests/Makefile.include b/tests/Makefile.include index fe22ccfcc6..1592a647f4 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -38,20 +38,6 @@ export SRC_PATH SYSEMU_TARGET_LIST :=3D $(subst -softmmu.mak,,$(notdir \ $(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak))) =20 -QEMU_CFLAGS +=3D -I$(SRC_PATH)/tests -I$(SRC_PATH)/tests/qtest - -tests/migration/stress$(EXESUF): tests/migration/stress.o - $(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ,"L= INK","$(TARGET_DIR)$@") - -INITRD_WORK_DIR=3Dtests/migration/initrd - -tests/migration/initrd-stress.img: tests/migration/stress$(EXESUF) - mkdir -p $(INITRD_WORK_DIR) - cp $< $(INITRD_WORK_DIR)/init - (cd $(INITRD_WORK_DIR) && (find | cpio --quiet -o -H newc | gzip -9)) > $@ - rm $(INITRD_WORK_DIR)/init - rmdir $(INITRD_WORK_DIR) - SPEED =3D quick =20 # gtester tests, possibly with verbose output diff --git a/tests/meson.build b/tests/meson.build index 71d0776a79..1e3dd94ac2 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -274,3 +274,4 @@ endif =20 subdir('qapi-schema') subdir('qtest') +subdir('migration') diff --git a/tests/migration/initrd-stress.sh b/tests/migration/initrd-stre= ss.sh new file mode 100755 index 0000000000..0f20ac29a6 --- /dev/null +++ b/tests/migration/initrd-stress.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +INITRD=3D"$1" +STRESS=3D"$2" + +INITRD_DIR=3D$(mktemp -d -p '' "initrd-stress.XXXXXX") +trap 'rm -rf $INITRD_DIR' EXIT + +cp "$STRESS" "$INITRD_DIR/init" +(cd "$INITRD_DIR" && (find | cpio --quiet -o -H newc | gzip -9)) > "$INITR= D" diff --git a/tests/migration/meson.build b/tests/migration/meson.build new file mode 100644 index 0000000000..f215ee7d3a --- /dev/null +++ b/tests/migration/meson.build @@ -0,0 +1,14 @@ +stress =3D executable( + 'stress', + files('stress.c'), + dependencies: [glib], + link_args: ['-static'], + build_by_default: false, +) + +custom_target( + 'initrd-stress.img', + output: 'initrd-stress.img', + input: stress, + command: [find_program('initrd-stress.sh'), '@OUTPUT@', '@INPUT@'] +) --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052646; cv=none; d=zohomail.com; s=zohoarc; b=T0b2iNDVMvPlLu9koJI38Z8fW8lbZQIv0VJVTgYs1oxnCIrm4K3stMRcsazCuJV3SPgVv3iT6U0QzRd1f0c0Yhu6vnn8hNT/Q6yirguh7cxNaMOLhpDuLWwP5x4KjArZEpQRd3G2LQCWhbphThoi1vFn1SQcG1EmKVBk9ipZ/Vg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052646; 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; bh=JaDCNnKVdJYXwWIFrqAIaU5hH7nDGGBurgQYtgJFS0g=; b=K2zT7x+cvMUcXOj5uqUCr2IcyGiBP4XENuTTk+NXrs/HJsDSPwIwwlKV1rLVG0J+YDDVSdeLrSuL0HdauLw2yMHKz72U5bHJOOv+uZOE4JQalaXROzhokg/4uu2lQ6kg3UCkSwHjkO1CWPCVpOvU6J6Uxt7PlysU1iPpZqa1R2I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052646023435.19408620529623; Wed, 2 Sep 2020 06:17:26 -0700 (PDT) Received: from localhost ([::1]:46526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSdh-0007gm-6q for importer@patchew.org; Wed, 02 Sep 2020 09:17:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMZ-0006Pc-Va for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28853) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDSMV-0007AC-GG for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:43 -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-233-epG5k3tDO9yHbPsQ2cLIHQ-1; Wed, 02 Sep 2020 08:59:35 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9CA8718CBC6A for ; Wed, 2 Sep 2020 12:59:31 +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 5D10F76E01; Wed, 2 Sep 2020 12:59:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JaDCNnKVdJYXwWIFrqAIaU5hH7nDGGBurgQYtgJFS0g=; b=Ez2nhRiUHelQb5tHamM5RThUmJJao80BgGWdzCOa5ZbIb0y08C3k6gUIdnOcnJO2iPrObe GnnvTx0TmLbSd9FenJ1P/piPDDX6VKPISce6WfM5bG6fSprehy4qvjwgqCy4CZHeb9QZUK G/7rxCmYbsZnTm9+Po4suGgR4XwZIiY= X-MC-Unique: epG5k3tDO9yHbPsQ2cLIHQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 26/39] configure: remove dead code for in-tree builds Date: Wed, 2 Sep 2020 08:59:04 -0400 Message-Id: <20200902125917.26021-27-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 01:13:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) The $pwd_is_source_path variable is never "y", since configure re-executes itself from a build directory. Remove code that will never run. Cc: Daniel P. Berrang=C3=A9 Signed-off-by: Paolo Bonzini --- configure | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 82b2211936..eee310b310 100755 --- a/configure +++ b/configure @@ -665,14 +665,6 @@ QEMU_INCLUDES=3D"$QEMU_INCLUDES -iquote ${source_path}= /disas/libvixl" CFLAGS=3D"-std=3Dgnu99 -Wall" =20 =20 -# running configure in the source tree? -# we know that's the case if configure is there. -if test -f "./configure"; then - pwd_is_source_path=3D"y" -else - pwd_is_source_path=3D"n" -fi - check_define() { cat > $TMPC < (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 1599052245687447.598197524987; Wed, 2 Sep 2020 06:10:45 -0700 (PDT) Received: from localhost ([::1]:38152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSXD-0001Gz-Q5 for importer@patchew.org; Wed, 02 Sep 2020 09:10:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMc-0006YE-Jf for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:46 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:43011 helo=us-smtp-delivery-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 1kDSMY-0007BF-HN for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:46 -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-366-hNSDB740NXOsPo0PS4eBPw-1; Wed, 02 Sep 2020 08:59:35 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E744B10ABDCB for ; Wed, 2 Sep 2020 12:59:31 +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 B6EA276E01 for ; Wed, 2 Sep 2020 12:59:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wI7hFWx6sPeGb8YbxWYcUWNm467cVi3XKy83JOcRMFk=; b=PBrxc7xWBk77n7JI/nEhY0aNIXAL4Iak8xewYtb05iNhQkOdG0l+ZPThil+rE/XYsyVZ+c OU3lhZlBP8vsWsNWsTM/iFScdqeg2hIatTSApvnIN6mxluj102dgsFVwoVkkgd3F3w46yE OYKzfifnQbjG7A17jOKwfBOXLrmDSfo= X-MC-Unique: hNSDB740NXOsPo0PS4eBPw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 27/39] meson: compute config_all_devices directly Date: Wed, 2 Sep 2020 08:59:05 -0400 Message-Id: <20200902125917.26021-28-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com 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.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 03:24:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There is no need anymore to produce config-all-devices.mak, compute the resulting dictionary directly instead of going through grepy.sh. Signed-off-by: Paolo Bonzini --- .gitignore | 1 - meson.build | 14 ++------------ scripts/grepy.sh | 3 --- 3 files changed, 2 insertions(+), 16 deletions(-) delete mode 100755 scripts/grepy.sh diff --git a/.gitignore b/.gitignore index 4ccb9ed975..f3fbd87ce4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ /build/ /.doctrees /config-devices.* -/config-all-devices.* /config-all-disas.* /config-host.* /config-target.* diff --git a/meson.build b/meson.build index b71f561c96..037ccd3f4c 100644 --- a/meson.build +++ b/meson.build @@ -455,6 +455,7 @@ endforeach genh +=3D configure_file(output: 'config-host.h', configuration: config_ho= st_data) =20 minikconf =3D find_program('scripts/minikconf.py') +config_all_devices =3D {} config_devices_mak_list =3D [] config_devices_h =3D {} config_target_h =3D {} @@ -523,11 +524,11 @@ foreach target : target_dirs config_devices_h +=3D {target: configure_file(output: target + '-confi= g-devices.h', configuration: config_devi= ces_data)} config_target +=3D config_devices + config_all_devices +=3D config_devices endif config_target_mak +=3D {target: config_target} endforeach =20 -grepy =3D find_program('scripts/grepy.sh') # This configuration is used to build files that are shared by # multiple binaries, and then extracted out of the "common" # static_library target. @@ -537,17 +538,6 @@ grepy =3D find_program('scripts/grepy.sh') # targets that are not built for this compilation. The CONFIG_ALL # pseudo symbol replaces it. =20 -if have_system - config_all_devices_mak =3D configure_file( - output: 'config-all-devices.mak', - input: config_devices_mak_list, - capture: true, - command: [grepy, '@INPUT@'], - ) - config_all_devices =3D keyval.load(config_all_devices_mak) -else - config_all_devices =3D {} -endif config_all =3D config_all_devices config_all +=3D config_host config_all +=3D config_all_disas diff --git a/scripts/grepy.sh b/scripts/grepy.sh deleted file mode 100755 index aee46ddc8d..0000000000 --- a/scripts/grepy.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -grep -h '=3Dy$' "$@" | sort -u --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052319; cv=none; d=zohomail.com; s=zohoarc; b=fRnLWuO+jaJEiSfZQ615c8owPQWnAf/DBK5rP78lS//5vuWq6HpVafp+aWxAGd8rhy8vJ1nn72+E9chz9wlrL7VJLbjQykXoHn0yqIpCfGmUYEoLPxeJXCGxGScJPKzSjWySVItd9mcvh55d/UBYSkOAtNWWNeDgUUqzEJGjzHQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052319; 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=l+DMMxfcdV7S/t8w+04XdUxdvTq6UJnXyrlclrj3jo+vqfOoe284xVMuq4BXFOJirtjUdGtMVyS3ZAVWjqaAdnT+IZJA9TRt0OaY17ZziPejEb6hVAqyb5ow7k0bm5kuhpScGwwsmURRe12wdwrowUzlOAVTfMXVmgGYYG64otc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052319497655.0521238453256; Wed, 2 Sep 2020 06:11:59 -0700 (PDT) Received: from localhost ([::1]:46564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSYQ-0004gD-MV for importer@patchew.org; Wed, 02 Sep 2020 09:11:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMe-0006dW-BY for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:48 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:35953 helo=us-smtp-delivery-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 1kDSMY-0007BJ-MA for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:48 -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-314-IP6AGhKyNu6HXS2b6R26dA-1; Wed, 02 Sep 2020 08:59:33 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3F21D801AEF for ; Wed, 2 Sep 2020 12:59:32 +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 0DC4776E01 for ; Wed, 2 Sep 2020 12:59:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2b6suSUQoUCdu/svLeROGq1EoTJ292BuA8aeHzcUKCw=; b=JG5YaizVFU03GB9psQNaSAdlK0nC41OP9qxrsardeFcKUPF4p0oJB8i2XHU51qjVkODT8m A+nRxVaHxDOg44DNd2NR7KVS82XxA99GTv/sEp51AXWZzDWXf1JkEgk0Sw0Vyw1mJbY6k/ pubHckwfMuSY15Z/LWEjzyS8hWhHhdY= X-MC-Unique: IP6AGhKyNu6HXS2b6R26dA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 28/39] Makefile: remove dead variables and includes Date: Wed, 2 Sep 2020 08:59:06 -0400 Message-Id: <20200902125917.26021-29-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com 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.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 03:24:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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" X-ZohoMail-DKIM: pass (identity @redhat.com) 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 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599051997; cv=none; d=zohomail.com; s=zohoarc; b=lmwFq09udeq6dPWd9S6WlWV1Lbvdg9Q/Ly5thYGGTVRLVD+L7FCG9lDJqy4Cj9k782EoH4OP2XsS/7qdb7uEigTMKR80RdgA9ai/PCwUhH43TvBgLrY0lOTWtelOelYyM4UbK9dFB/Key6E5l/Wu74UfKL3LMWE3d0/cewP+nEY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599051997; 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=Xf/OVxQRv8VsGByPISeVDmk2FH5DWnw1EZekclDjUgc=; b=DyaS2rbX0+ajAgxkxHPuzsiM/BCA4jsMICUsgabxzld7s974SWceht6/IpIn062VZuLpfA31Xn40Fy8tGHyUgAWtb+W3Bafbp7G6/OsbMdgSC2H4F5Ko7TUlCtSxwppOjXuNinnAowBtoTzkNDHyVNijxCfauft4DpaI2xvzYzI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599051997906290.3119671338857; Wed, 2 Sep 2020 06:06:37 -0700 (PDT) Received: from localhost ([::1]:46356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSTE-0001aG-UA for importer@patchew.org; Wed, 02 Sep 2020 09:06:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMZ-0006NY-9w for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:43 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:41163 helo=us-smtp-delivery-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 1kDSMV-00079y-1Q for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:42 -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-191-Wh0Bbg4DPYCmcjtifufe4w-1; Wed, 02 Sep 2020 08:59:35 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8A89610199B7 for ; Wed, 2 Sep 2020 12:59:32 +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 5A1D976E01 for ; Wed, 2 Sep 2020 12:59:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Xf/OVxQRv8VsGByPISeVDmk2FH5DWnw1EZekclDjUgc=; b=V73GThyU5E+K0LLSSpFMKSgdUPz/yn+2NZo+5kSWoPXwT3+v5DgTKpwwdDdzq8f7D/s2eO ZhztD4Gtcu64ES//AbMtnDYRXXDV/ZUGRc+i7B6X9of4MtOOX/KKL8uPyMDVlMwLz5pI4i J5adB7fkKDVgdfgFCvEvExxGcW/d9Hk= X-MC-Unique: Wh0Bbg4DPYCmcjtifufe4w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 29/39] Makefile: inline the relevant parts of rules.mak Date: Wed, 2 Sep 2020 08:59:07 -0400 Message-Id: <20200902125917.26021-30-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 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=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:33:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Most of rules.mak is not used anymore, just inline what's needed. Signed-off-by: Paolo Bonzini --- Makefile | 38 +++++---- docs/devel/build-system.rst | 4 - rules.mak | 158 ------------------------------------ tests/tcg/Makefile.qemu | 2 - 4 files changed, 22 insertions(+), 180 deletions(-) delete mode 100644 rules.mak diff --git a/Makefile b/Makefile index 9bdf5fc072..678e76d6f2 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,20 @@ BUILD_DIR=3D$(CURDIR) # Before including a proper config-host.mak, assume we are in the source t= ree SRC_PATH=3D. =20 +# Don't use implicit rules or variables +# we have explicit rules for everything +MAKEFLAGS +=3D -rR + +# Usage: $(call quiet-command,command and args,"NAME","args to print") +# This will run "command and args", and either: +# if V=3D1 just print the whole command and args +# otherwise print the 'quiet' output in the format " NAME args to pr= int" +# NAME should be a short name of the command, 7 letters or fewer. +# If called with only a single argument, will print nothing in quiet mode. +quiet-command-run =3D $(if $(V),,$(if $2,printf " %-7s %s\n" $2 $3 && ))$1 +quiet-@ =3D $(if $(V),,@) +quiet-command =3D $(quiet-@)$(call quiet-command-run,$1,$2,$3) + UNCHECKED_GOALS :=3D %clean TAGS cscope ctags dist \ help check-help print-% \ docker docker-% vm-help vm-test vm-build-% @@ -68,6 +82,7 @@ Makefile.mtest: build.ninja scripts/mtest2make.py -include Makefile.mtest endif =20 +Makefile: .git-submodule-status .git-submodule-status: git-submodule-update config-host.mak =20 # Check that we're not trying to do an out-of-tree build from @@ -108,10 +123,6 @@ ninja-clean:: ninja-distclean:: build.ninja: config-host.mak =20 -include $(SRC_PATH)/rules.mak - -generated-files-y +=3D .git-submodule-status - # Don't try to regenerate Makefile or configure # We don't generate any of them Makefile: ; @@ -120,9 +131,7 @@ configure: ; .PHONY: all clean cscope distclean install \ recurse-all dist msi FORCE =20 -$(call set-vpath, $(SRC_PATH)) - -SUBDIR_MAKEFLAGS=3D$(if $(V),,--no-print-directory --quiet) BUILD_DIR=3D$(= BUILD_DIR) +SUBDIR_MAKEFLAGS=3D$(if $(V),,--no-print-directory --quiet) =20 include $(SRC_PATH)/tests/Makefile.include =20 @@ -189,7 +198,6 @@ clean: recurse-clean ninja-clean clean-ctlist -exec rm {} + rm -f TAGS cscope.* *.pod *~ */*~ rm -f fsdev/*.pod scsi/*.pod - rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp) =20 VERSION =3D $(shell cat $(SRC_PATH)/VERSION) =20 @@ -232,14 +240,6 @@ cscope: # Needed by "meson install" export DESTDIR =20 -# Add a dependency on the generated files, so that they are always -# rebuilt before other object files -ifneq ($(wildcard config-host.mak),) -ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if $(MAKECMDGOAL= S),,fail)) -Makefile: $(generated-files-y) -endif -endif - include $(SRC_PATH)/tests/docker/Makefile.include include $(SRC_PATH)/tests/vm/Makefile.include =20 @@ -280,3 +280,9 @@ endif endif $(call print-help,$(MAKE) [targets],(quiet build, default)) $(call print-help,$(MAKE) V=3D1 [targets],(verbose build)) + +# will delete the target of a rule if commands exit with a nonzero exit st= atus +.DELETE_ON_ERROR: + +print-%: + @echo '$*=3D$($*)' diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst index 0c09fb9a54..55f0576c07 100644 --- a/docs/devel/build-system.rst +++ b/docs/devel/build-system.rst @@ -401,10 +401,6 @@ number of dynamically created files listed later. executables. Build rules for various subdirectories are included in other meson.build files spread throughout the QEMU source tree. =20 -`rules.mak` - This file provides the generic helper rules for invoking build tools, in - particular the compiler and linker. - `tests/Makefile.include` Rules for building the unit tests. This file is included directly by the top level Makefile, so anything defined in this file will influence the diff --git a/rules.mak b/rules.mak deleted file mode 100644 index c66c8218f0..0000000000 --- a/rules.mak +++ /dev/null @@ -1,158 +0,0 @@ - -# These are used when we want to do substitutions without confusing Make -NULL :=3D -SPACE :=3D $(NULL) # -COMMA :=3D , - -# Don't use implicit rules or variables -# we have explicit rules for everything -MAKEFLAGS +=3D -rR - -# Files with this suffixes are final, don't try to generate them -# using implicit rules -%/trace-events: -%.hx: -%.py: -%.objs: -%.d: -%.h: -%.c: -%.cc: -%.cpp: -%.m: -%.mak: - -# Flags for dependency generation -QEMU_DGFLAGS +=3D -MMD -MP -MT $@ -MF $(@D)/$(*F).d - -# Compiler searches the source file dir first, but in vpath builds -# we need to make it search the build dir too, before any other -# explicit search paths. There are two search locations in the build -# dir, one absolute and the other relative to the compiler working -# directory. These are the same for target-independent files, but -# different for target-dependent ones. -QEMU_LOCAL_INCLUDES =3D -iquote $(BUILD_DIR) -iquote $(BUILD_DIR)/$(@D) -i= quote $(@D) - -WL :=3D -Wl, -ifdef CONFIG_DARWIN -whole-archive =3D $(WL)-force_load,$1 -else -whole-archive =3D $(WL)--whole-archive $1 $(WL)--no-whole-archive -endif - -extract-libs =3D $(strip $(foreach o,$1,$($o-libs))) - -%.o: %.c - @mkdir -p $(dir $@) - $(call quiet-command,$(CC) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \ - $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) \ - -c -o $@ $<,"CC","$(TARGET_DIR)$@") - -# If we have a CXX we might have some C++ objects, in which case we -# must link with the C++ compiler, not the plain C compiler. -LINKPROG =3D $(or $(CXX),$(CC)) - -LINK =3D $(call quiet-command, $(LINKPROG) $(CFLAGS) $(QEMU_LDFLAGS) -o $@= \ - $(filter-out %.a %.fa,$1) \ - $(foreach l,$(filter %.fa,$1),$(call whole-archive,$l)) \ - $(filter %.a,$1) \ - $(call extract-libs,$1) $(LIBS),"LINK","$(TARGET_DIR)$@") - -%.o: %.S - $(call quiet-command,$(CCAS) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \ - $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) \ - -c -o $@ $<,"CCAS","$(TARGET_DIR)$@") - -%.o: %.cc - $(call quiet-command,$(CXX) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \ - $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CXXFLAGS) $($@-cflags) \ - -c -o $@ $<,"CXX","$(TARGET_DIR)$@") - -%.o: %.cpp - $(call quiet-command,$(CXX) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \ - $(QEMU_CXXFLAGS) $(QEMU_DGFLAGS) $(CXXFLAGS) $($@-cflags) \ - -c -o $@ $<,"CXX","$(TARGET_DIR)$@") - -%.o: %.m - $(call quiet-command,$(OBJCC) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \ - $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) \ - -c -o $@ $<,"OBJC","$(TARGET_DIR)$@") - -%.o: %.dtrace - $(call quiet-command,dtrace -o $@ -G -s $<,"GEN","$(TARGET_DIR)$@") - -.PHONY: modules -modules: - -%$(EXESUF): %.o - $(call LINK,$(filter %.o %.a %.fa, $^)) - -%.a: - $(call quiet-command,rm -f $@ && $(AR) rcs $@ $^,"AR","$(TARGET_DIR)$@") - -# Usage: $(call quiet-command,command and args,"NAME","args to print") -# This will run "command and args", and either: -# if V=3D1 just print the whole command and args -# otherwise print the 'quiet' output in the format " NAME args to pr= int" -# NAME should be a short name of the command, 7 letters or fewer. -# If called with only a single argument, will print nothing in quiet mode. -quiet-command-run =3D $(if $(V),,$(if $2,printf " %-7s %s\n" $2 $3 && ))$1 -quiet-@ =3D $(if $(V),,@) -quiet-command =3D $(quiet-@)$(call quiet-command-run,$1,$2,$3) - -# cc-option -# Usage: CFLAGS+=3D$(call cc-option, -falign-functions=3D0, -malign-functi= ons=3D0) - -cc-option =3D $(if $(shell $(CC) $1 $2 -S -o /dev/null -xc /dev/null \ - >/dev/null 2>&1 && echo OK), $2, $3) -cc-c-option =3D $(if $(shell $(CC) $1 $2 -c -o /dev/null -xc /dev/null \ - >/dev/null 2>&1 && echo OK), $2, $3) - -VPATH_SUFFIXES =3D %.c %.h %.S %.cc %.cpp %.m %.mak %.texi %.sh %.rc Kconf= ig% %.json.in -set-vpath =3D $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath $(P= ATTERN) $1))) - -# install-prog list, dir -define install-prog - $(INSTALL_DIR) "$2" - $(INSTALL_PROG) $1 "$2" - $(if $(STRIP),$(STRIP) $(foreach T,$1,"$2/$(notdir $T)"),) -endef - -# Logical functions (for operating on y/n values like CONFIG_FOO vars) -# Inputs to these must be either "y" (true) or "n" or "" (both false) -# Output is always either "y" or "n". -# Usage: $(call land,$(CONFIG_FOO),$(CONFIG_BAR)) -# Logical NOT -lnot =3D $(if $(subst n,,$1),n,y) -# Logical AND -land =3D $(if $(findstring yy,$1$2),y,n) -# Logical OR -lor =3D $(if $(findstring y,$1$2),y,n) -# Logical XOR (note that this is the inverse of leqv) -lxor =3D $(if $(filter $(call lnot,$1),$(call lnot,$2)),n,y) -# Logical equivalence (note that leqv "","n" is true) -leqv =3D $(if $(filter $(call lnot,$1),$(call lnot,$2)),y,n) -# Logical if: like make's $(if) but with an leqv-like test -lif =3D $(if $(subst n,,$1),$2,$3) - -# String testing functions: inputs to these can be any string; -# the output is always either "y" or "n". Leading and trailing whitespace -# is ignored when comparing strings. -# String equality -eq =3D $(if $(subst $2,,$1)$(subst $1,,$2),n,y) -# String inequality -ne =3D $(if $(subst $2,,$1)$(subst $1,,$2),y,n) -# Emptiness/non-emptiness tests: -isempty =3D $(if $1,n,y) -notempty =3D $(if $1,y,n) - -.PHONY: clean-timestamp -clean-timestamp: - rm -f *.timestamp -clean: clean-timestamp - -# will delete the target of a rule if commands exit with a nonzero exit st= atus -.DELETE_ON_ERROR: - -print-%: - @echo '$*=3D$($*)' diff --git a/tests/tcg/Makefile.qemu b/tests/tcg/Makefile.qemu index f8ad4c47be..0332bad10f 100644 --- a/tests/tcg/Makefile.qemu +++ b/tests/tcg/Makefile.qemu @@ -8,8 +8,6 @@ # to do it for us. # =20 -include $(SRC_PATH)/rules.mak - # The configure script fills in extra information about # useful docker images or alternative compiler flags. =20 --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052557; cv=none; d=zohomail.com; s=zohoarc; b=Qb7EKp+3+OcDOtyKMA1Xf+0JC0m2Jtc4GjWTuypU8pQYXEDucKew6Ob8YjxePJVeCX/53yaVS0lzpEMq14Zg5bs3ikj6c1PgaR0h7aND3d+xbEDa0K7BXWTL/4gNzLGBpQfzoXCyEykwKug6sLcGLduNYiyLHcjO5w9L1meO3p4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052557; 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=NC21SpAiW8/7oxYwrnfmwYFmwNhzILdDrPwOW1B2HAw=; b=Y/WQGOwqVVFB0aS9OCA0A2ed5qplw9WkjmY5dAfX8mThlWip0KIX4l/l3Ae4e22GlDRNcUSA2BNZ0ij01DG85DqxoQYKfo9NAm78xWj9fcNjIvipE5PM1Epdu/Fo9SIgc1muV5foF3/IQF8JmL+gsD9TU9gBPPv6qQX4Iw+LFs8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052557728155.6946010116152; Wed, 2 Sep 2020 06:15:57 -0700 (PDT) Received: from localhost ([::1]:40686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDScG-0005Di-Ty for importer@patchew.org; Wed, 02 Sep 2020 09:15:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMY-0006L5-L8 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:42 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:52221 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 1kDSMV-0007A6-A5 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:42 -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-190-JfGhojGBMv26BQ1PdPHJWA-1; Wed, 02 Sep 2020 08:59: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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5FA01871805 for ; Wed, 2 Sep 2020 12:59:33 +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 2D5E55D9CC for ; Wed, 2 Sep 2020 12:59:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NC21SpAiW8/7oxYwrnfmwYFmwNhzILdDrPwOW1B2HAw=; b=XcqGuK8IH4JKcc3kplDPFpg8rfkh2uPPARScphPv/+Scfcqb4DUwZghAOSOml0f4L/Pjza sJoz3PCCOC5l6hkUE1HnJrusjdBtS2u3fZh43e9VKidijSwiFKnXwGnO0nOe22uN0xBih3 RjgWdSH8se7QHtagsE8xYMDgZCxvYeU= X-MC-Unique: JfGhojGBMv26BQ1PdPHJWA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 30/39] configure: move disassembler configuration to meson Date: Wed, 2 Sep 2020 08:59:08 -0400 Message-Id: <20200902125917.26021-31-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com 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/02 02:26:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- .gitignore | 1 - configure | 87 ----------------------------------------------- disas/meson.build | 4 +-- meson.build | 45 +++++++++++++++++++++++- 4 files changed, 45 insertions(+), 92 deletions(-) diff --git a/.gitignore b/.gitignore index f3fbd87ce4..b6fdd34ddf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ /build/ /.doctrees /config-devices.* -/config-all-disas.* /config-host.* /config-target.* /config.status diff --git a/configure b/configure index eee310b310..8df41b2f8b 100755 --- a/configure +++ b/configure @@ -7907,93 +7907,6 @@ if test "$target_bsd_user" =3D "yes" ; then echo "CONFIG_BSD_USER=3Dy" >> $config_target_mak fi =20 - -# generate QEMU_CFLAGS/QEMU_LDFLAGS for targets - -disas_config() { - echo "CONFIG_${1}_DIS=3Dy" >> $config_target_mak - echo "CONFIG_${1}_DIS=3Dy" >> config-all-disas.mak -} - -for i in $ARCH $TARGET_BASE_ARCH ; do - case "$i" in - alpha) - disas_config "ALPHA" - ;; - aarch64) - if test -n "${cxx}"; then - disas_config "ARM_A64" - fi - ;; - arm) - disas_config "ARM" - if test -n "${cxx}"; then - disas_config "ARM_A64" - fi - ;; - avr) - disas_config "AVR" - ;; - cris) - disas_config "CRIS" - ;; - hppa) - disas_config "HPPA" - ;; - i386|x86_64|x32) - disas_config "I386" - ;; - lm32) - disas_config "LM32" - ;; - m68k) - disas_config "M68K" - ;; - microblaze*) - disas_config "MICROBLAZE" - ;; - mips*) - disas_config "MIPS" - if test -n "${cxx}"; then - disas_config "NANOMIPS" - fi - ;; - moxie*) - disas_config "MOXIE" - ;; - nios2) - disas_config "NIOS2" - ;; - or1k) - disas_config "OPENRISC" - ;; - ppc*) - disas_config "PPC" - ;; - riscv*) - disas_config "RISCV" - ;; - rx) - disas_config "RX" - ;; - s390*) - disas_config "S390" - ;; - sh4) - disas_config "SH4" - ;; - sparc*) - disas_config "SPARC" - ;; - xtensa*) - disas_config "XTENSA" - ;; - esac -done -if test "$tcg_interpreter" =3D "yes" ; then - disas_config "TCI" -fi - done # for target in $targets =20 if [ "$fdt" =3D "git" ]; then diff --git a/disas/meson.build b/disas/meson.build index 0527d69128..bde8280c73 100644 --- a/disas/meson.build +++ b/disas/meson.build @@ -22,6 +22,4 @@ common_ss.add(when: 'CONFIG_SH4_DIS', if_true: files('sh4= .c')) common_ss.add(when: 'CONFIG_SPARC_DIS', if_true: files('sparc.c')) common_ss.add(when: 'CONFIG_XTENSA_DIS', if_true: files('xtensa.c')) =20 -# TODO: As long as the TCG interpreter and its generated code depend -# on the QEMU target, we cannot compile the disassembler here. -#common_ss.add(when: 'CONFIG_TCI_DIS', if_true: files('tci.c')) +specific_ss.add(when: 'CONFIG_TCG_INTERPRETER', if_true: files('tci.c')) diff --git a/meson.build b/meson.build index 037ccd3f4c..84a3e610e7 100644 --- a/meson.build +++ b/meson.build @@ -14,7 +14,6 @@ ss =3D import('sourceset') sh =3D find_program('sh') cc =3D meson.get_compiler('c') config_host =3D keyval.load(meson.current_build_dir() / 'config-host.mak') -config_all_disas =3D keyval.load(meson.current_build_dir() / 'config-all-d= isas.mak') enable_modules =3D 'CONFIG_MODULES' in config_host enable_static =3D 'CONFIG_STATIC' in config_host build_docs =3D 'BUILD_DOCS' in config_host @@ -456,10 +455,44 @@ genh +=3D configure_file(output: 'config-host.h', con= figuration: config_host_data) =20 minikconf =3D find_program('scripts/minikconf.py') config_all_devices =3D {} +config_all_disas =3D {} config_devices_mak_list =3D [] config_devices_h =3D {} config_target_h =3D {} config_target_mak =3D {} + +disassemblers =3D { + 'alpha' : ['CONFIG_ALPHA_DIS'], + 'arm' : ['CONFIG_ARM_DIS'], + 'avr' : ['CONFIG_AVR_DIS'], + 'cris' : ['CONFIG_CRIS_DIS'], + 'hppa' : ['CONFIG_HPPA_DIS'], + 'i386' : ['CONFIG_I386_DIS'], + 'x86_64' : ['CONFIG_I386_DIS'], + 'x32' : ['CONFIG_I386_DIS'], + 'lm32' : ['CONFIG_LM32_DIS'], + 'm68k' : ['CONFIG_M68K_DIS'], + 'microblaze' : ['CONFIG_MICROBLAZE_DIS'], + 'mips' : ['CONFIG_MIPS_DIS'], + 'moxie' : ['CONFIG_MOXIE_DIS'], + 'nios2' : ['CONFIG_NIOS2_DIS'], + 'or1k' : ['CONFIG_OPENRISC_DIS'], + 'ppc' : ['CONFIG_PPC_DIS'], + 'riscv' : ['CONFIG_RISCV_DIS'], + 'rx' : ['CONFIG_RX_DIS'], + 's390' : ['CONFIG_S390_DIS'], + 'sh4' : ['CONFIG_SH4_DIS'], + 'sparc' : ['CONFIG_SPARC_DIS'], + 'xtensa' : ['CONFIG_XTENSA_DIS'], +} +if link_language =3D=3D 'cpp' + disassemblers +=3D { + 'aarch64' : [ 'CONFIG_ARM_A64_DIS'], + 'arm' : [ 'CONFIG_ARM_DIS', 'CONFIG_ARM_A64_DIS'], + 'mips' : [ 'CONFIG_MIPS_DIS', 'CONFIG_NANOMIPS_DIS'], + } +endif + kconfig_external_symbols =3D [ 'CONFIG_KVM', 'CONFIG_XEN', @@ -475,9 +508,19 @@ kconfig_external_symbols =3D [ 'CONFIG_PVRDMA', ] ignored =3D ['TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_DIRS'] + foreach target : target_dirs config_target =3D keyval.load(meson.current_build_dir() / target / 'conf= ig-target.mak') =20 + foreach k, v: disassemblers + if config_host['ARCH'].startswith(k) or config_target['TARGET_BASE_ARC= H'].startswith(k) + foreach sym: v + config_target +=3D { sym: 'y' } + config_all_disas +=3D { sym: 'y' } + endforeach + endif + endforeach + config_target_data =3D configuration_data() foreach k, v: config_target if not k.startswith('TARGET_') and not k.startswith('CONFIG_') --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052315; cv=none; d=zohomail.com; s=zohoarc; b=na5MERg8xnn0D1vqIQbMRlLtoZzbl9OBv2ozYCfk5FlCFNVFlSawkG/A6KFt2hNP8hesPEqZ7ph5rdMpojW0DxO9hIKKEgzsFFoQuDPiQXMhxcHAYu67BGf/8hCObRP4rvbfr8Lpkwe7BswhvyQK1W3cCSTbzQbg8RI7XfB8ZjM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052315; 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=Y+RDqgPB8w8neiEcR+BoAA77MTT8+r8lfK1Qle+H5RU=; b=ncOAKnnLCQd/lP/9JYpKgj0/DbIJ2i/V4t5Q17MA8QS/uq60cvFPz94JxW5BTp099d03PIXmSLdro6cwq3qtwPW4Cg6q0aiXZDbMv7QVp65fNwxErCTMrf+BKPipdqXiSSRm4z+Wwc6bagYpqqzyg4Obnwd7cw2lKw28C2icxHY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 159905231513841.70398027912324; Wed, 2 Sep 2020 06:11:55 -0700 (PDT) Received: from localhost ([::1]:46072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSYM-0004UF-D0 for importer@patchew.org; Wed, 02 Sep 2020 09:11:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMX-0006H9-9N for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:41 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:30134 helo=us-smtp-delivery-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 1kDSMT-00079F-5v for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:40 -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-32-GfC4f301NEKjTgzMC1Gx3A-1; Wed, 02 Sep 2020 08:59:34 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id ACE671DE0A for ; Wed, 2 Sep 2020 12:59:33 +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 7A7A65D9CC for ; Wed, 2 Sep 2020 12:59:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Y+RDqgPB8w8neiEcR+BoAA77MTT8+r8lfK1Qle+H5RU=; b=FMzBIhDF0FWMNBRCNPsO8ewZfqNSKe9aMLRS/zzycmoWmIqcMr5RXiIBWqcS+/8LlwEG+X tNknVmdWSGK4e51kdlf8zGfwHfEdixTiwpxet4EZLFEB/YkPMh4wfQUl3nRRFhWbkzkMmC n+VK9eZEsD4F/adr1lMwtNNgXIm2ogs= X-MC-Unique: GfC4f301NEKjTgzMC1Gx3A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 31/39] configure: move C++ compiler handling to meson Date: Wed, 2 Sep 2020 08:59:09 -0400 Message-Id: <20200902125917.26021-32-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com 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.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 03:24:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" All configure tests are run with a C compiler, except for building QEMU_CXXFLAGS and checking for compatibility between the C and C++ compilers. Move this to Meson and get rid of the link_language property in the toolchain description. Signed-off-by: Paolo Bonzini --- configure | 53 ------------------------------------------------- meson.build | 25 ++++++++++++++++++----- scripts/empty.c | 6 ++++++ 3 files changed, 26 insertions(+), 58 deletions(-) create mode 100644 scripts/empty.c diff --git a/configure b/configure index 8df41b2f8b..95a259d420 100755 --- a/configure +++ b/configure @@ -150,24 +150,6 @@ add_to() { eval $1=3D\${$1:+\"\$$1 \"}\$2 } =20 -update_cxxflags() { - # Set QEMU_CXXFLAGS from QEMU_CFLAGS by filtering out those - # options which some versions of GCC's C++ compiler complain about - # because they only make sense for C programs. - QEMU_CXXFLAGS=3D"$QEMU_CXXFLAGS -D__STDC_LIMIT_MACROS -D__STDC_CONSTAN= T_MACROS -D__STDC_FORMAT_MACROS" - CXXFLAGS=3D$(echo "$CFLAGS" | sed s/-std=3Dgnu99/-std=3Dgnu++11/) - for arg in $QEMU_CFLAGS; do - case $arg in - -Wstrict-prototypes|-Wmissing-prototypes|-Wnested-externs|\ - -Wold-style-declaration|-Wold-style-definition|-Wredundant-dec= ls) - ;; - *) - QEMU_CXXFLAGS=3D${QEMU_CXXFLAGS:+$QEMU_CXXFLAGS }$arg - ;; - esac - done -} - compile_object() { local_cflags=3D"$1" do_cc $CFLAGS $QEMU_CFLAGS $local_cflags -c -o $TMPO $TMPC @@ -6561,38 +6543,6 @@ if test "$cpu" =3D "s390x" ; then fi fi =20 -# Check that the C++ compiler exists and works with the C compiler. -# All the QEMU_CXXFLAGS are based on QEMU_CFLAGS. Keep this at the end to = don't miss any other that could be added. -if has $cxx; then - cat > $TMPC < $TMPCXX <> $config_host_mak echo "PKG_CONFIG=3D$pkg_config_exe" >> $config_host_mak echo "WINDRES=3D$windres" >> $config_host_mak echo "CFLAGS=3D$CFLAGS" >> $config_host_mak -echo "CXXFLAGS=3D$CXXFLAGS" >> $config_host_mak echo "CFLAGS_NOPIE=3D$CFLAGS_NOPIE" >> $config_host_mak echo "QEMU_CFLAGS=3D$QEMU_CFLAGS" >> $config_host_mak echo "QEMU_CXXFLAGS=3D$QEMU_CXXFLAGS" >> $config_host_mak @@ -8016,8 +7965,6 @@ meson_quote() { } =20 echo "# Automatically generated by configure - do not modify" > $cross -echo "[properties]" >> $cross -test -z "$cxx" && echo "link_language =3D 'c'" >> $cross echo "[binaries]" >> $cross echo "c =3D $(meson_quote $cc)" >> $cross test -n "$cxx" && echo "cpp =3D $(meson_quote $cxx)" >> $cross diff --git a/meson.build b/meson.build index 84a3e610e7..57fadd3dab 100644 --- a/meson.build +++ b/meson.build @@ -34,8 +34,6 @@ have_block =3D have_system or have_tools =20 add_project_arguments(config_host['QEMU_CFLAGS'].split(), native: false, language: ['c', 'objc']) -add_project_arguments(config_host['QEMU_CXXFLAGS'].split(), - native: false, language: 'cpp') add_project_link_arguments(config_host['QEMU_LDFLAGS'].split(), native: false, language: ['c', 'cpp', 'objc']) add_project_arguments(config_host['QEMU_INCLUDES'].split(), @@ -43,9 +41,26 @@ add_project_arguments(config_host['QEMU_INCLUDES'].split= (), =20 python =3D import('python').find_installation() =20 -link_language =3D meson.get_external_property('link_language', 'cpp') -if link_language =3D=3D 'cpp' - add_languages('cpp', required: true, native: false) +################## +# Compiler flags # +################## + +link_language =3D 'c' +if not add_languages('cpp', required: false, native: false) + # no warning +elif not meson.get_compiler('cpp').links(files('scripts/empty.c')) + warning('C++ compiler does not work with C compiler, disabling C++ code') +else + link_language =3D 'cpp' + add_project_arguments('-D__STDC_LIMIT_MACROS', '-D__STDC_CONSTANT_MACROS= ', + '-D__STDC_CONSTANT_MACROS', + native: false, language: 'cpp') + foreach i : config_host['QEMU_CFLAGS'].split() + if i not in [ '-Wstrict-prototypes', '-Wmissing-prototypes', '-Wnested= -externs', + '-Wold-style-declaration', '-Wold-style-definition', '-W= redundant-decls' ] + add_project_arguments(i, native: false, language: 'cpp') + endif + endforeach endif if host_machine.system() =3D=3D 'darwin' add_languages('objc', required: false, native: false) diff --git a/scripts/empty.c b/scripts/empty.c new file mode 100644 index 0000000000..8f20b7e5f2 --- /dev/null +++ b/scripts/empty.c @@ -0,0 +1,6 @@ +/* + * An empty C file. We need to make it a file and not include it + * in meson.build, so that we force it to compile with the C front-end + * and link with the C++ front-end. + */ +int main(void) { return 0; } --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052450; cv=none; d=zohomail.com; s=zohoarc; b=dbsTEuzPB+Z6I3yeLng10+OMStBmzgWpehsllxwXEu2ymk2axXaUHSRdV55YW6pnbn3naBVGM/FA57BDeYVjkcIOLRFoaqvPudN7HtTfUhGm5UZaQbjd1tNxmtHw8zRa2UV/m5n9UVUuoPiw/iVCW+JU9xp786mrHd+TkfyrdOQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052450; 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=oRgWFwPCsjiXsgvA8dt9YmKQcm3JhszpEXfGbn5juR0=; b=IN77G4HRtdyXjElr8EhCLyCO0SF6g3BmxtsXUt8oWDYDPthYcSqINWl67SuXewsQCNn46pwWDJRmOUKsq2sr1IQgtg6m7gJ5SMn5HNhcaftZbonIe33oluW8tp1kW5Nkj6g/2B2c+vZ7l3gJZZXWf+raVVaJR4yEYzF5A6RpGv4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052450390537.0533285871426; Wed, 2 Sep 2020 06:14:10 -0700 (PDT) Received: from localhost ([::1]:60614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSaV-0001uX-HW for importer@patchew.org; Wed, 02 Sep 2020 09:14:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMa-0006QF-5k for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:53744 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 1kDSMW-0007AP-7w for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:43 -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-75-D-YzEJm_MuqgVIiVBD85RA-1; Wed, 02 Sep 2020 08:59:37 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 05CC1191E2C0 for ; Wed, 2 Sep 2020 12:59:34 +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 C6E1A5D9CC for ; Wed, 2 Sep 2020 12:59:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oRgWFwPCsjiXsgvA8dt9YmKQcm3JhszpEXfGbn5juR0=; b=YKXbvLJ274XHgS76YdQ/I17Q8//exrNnHAs/ARCSSO7ArYya2DlOIxYpdiCBF3XqlnOp+/ 04VAB8qynrGMXtMK8aOFsvPcl1ue3wLw1Exc6mOhCeL2BQYEFMCV8oZxcMfGfoVuBwZ28y kqpxNNgyDOTzKOQJw0Xs/LQFfIgIAaI= X-MC-Unique: D-YzEJm_MuqgVIiVBD85RA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 32/39] meson: keep all compiler flags detection together Date: Wed, 2 Sep 2020 08:59:10 -0400 Message-Id: <20200902125917.26021-33-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com 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=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:07:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- meson.build | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/meson.build b/meson.build index 57fadd3dab..4c32f5286f 100644 --- a/meson.build +++ b/meson.build @@ -32,6 +32,23 @@ endforeach have_tools =3D 'CONFIG_TOOLS' in config_host have_block =3D have_system or have_tools =20 +python =3D import('python').find_installation() + +supported_oses =3D ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', '= sunos', 'linux'] +supported_cpus =3D ['ppc', 'ppc64', 's390x', 'sparc64', 'riscv32', 'riscv6= 4', 'x86', 'x86_64', + 'arm', 'aarch64', 'mips', 'mips64', 'sparc', 'sparc64'] + +cpu =3D host_machine.cpu_family() +targetos =3D host_machine.system() + +configure_file(input: files('scripts/ninjatool.py'), + output: 'ninjatool', + configuration: config_host) + +################## +# Compiler flags # +################## + add_project_arguments(config_host['QEMU_CFLAGS'].split(), native: false, language: ['c', 'objc']) add_project_link_arguments(config_host['QEMU_LDFLAGS'].split(), @@ -39,12 +56,6 @@ add_project_link_arguments(config_host['QEMU_LDFLAGS'].s= plit(), add_project_arguments(config_host['QEMU_INCLUDES'].split(), language: ['c', 'cpp', 'objc']) =20 -python =3D import('python').find_installation() - -################## -# Compiler flags # -################## - link_language =3D 'c' if not add_languages('cpp', required: false, native: false) # no warning @@ -73,17 +84,6 @@ if 'SPARSE_CFLAGS' in config_host 'compile_commands.json']) endif =20 -configure_file(input: files('scripts/ninjatool.py'), - output: 'ninjatool', - configuration: config_host) - -supported_oses =3D ['windows', 'freebsd', 'netbsd', 'openbsd', 'darwin', '= sunos', 'linux'] -supported_cpus =3D ['ppc', 'ppc64', 's390x', 'sparc64', 'riscv32', 'riscv6= 4', 'x86', 'x86_64', - 'arm', 'aarch64', 'mips', 'mips64', 'sparc', 'sparc64'] - -cpu =3D host_machine.cpu_family() -targetos =3D host_machine.system() - m =3D cc.find_library('m', required: false) util =3D cc.find_library('util', required: false) winmm =3D [] --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052392; cv=none; d=zohomail.com; s=zohoarc; b=ZPdNPQcKBdHSnEZAZxliT46f/B2Zd8zaJs9sD5tZBOD0uBlTUXt7YwB8r+watS/0fSZdlygwFgRU1cjZRJcogXXgNmcoRQxzUkuCrKCrMdCBKsIqKoKAPhpY0QgfJLSLu9XADRvQxK+zw/8uH7nevAH7Humjmrutdgc80+WHcCE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052392; 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=wC+LJ013NooJS75QwtW7/Uh57XNYYWrwZIx7N2n8bjM=; b=ETYvpKoSdNYlnr8Ja1ytDmcwkgUDTTag8+vgU7kVpiyrDt4aTuPg7D2hntaM/9Bzg6ElccomAlWKdvDSCTMD7qMpGj6Q0PH6DZbQj74sqsyhM5eVEt0Wsb6M1j4MJj/hEDQQ4E948rtKCOnHBRfUxkKQ9fcXZ2Z9KzM9W66Oy/k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052392790338.5762695384192; Wed, 2 Sep 2020 06:13:12 -0700 (PDT) Received: from localhost ([::1]:54420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSZb-0007rY-TR for importer@patchew.org; Wed, 02 Sep 2020 09:13:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMd-0006a8-8J for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50351) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDSMX-0007B3-R2 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:46 -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-259-M4r2HHc5My-oDveQLqFRRw-1; Wed, 02 Sep 2020 08:59:38 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 520CE88EF0D for ; Wed, 2 Sep 2020 12:59:34 +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 202265D9CC for ; Wed, 2 Sep 2020 12:59:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wC+LJ013NooJS75QwtW7/Uh57XNYYWrwZIx7N2n8bjM=; b=CwhBSgj7XPf3kHSp4pYxnvjJNRbe0jaZGbEFlOBWKysH1zXPgAfsSWlThsgZUTbMJ5i9EY PQI2uaDVRerbmRQpbSXANy/Tqzb0sv7K2WW1iPtTFardT6vN4wBMKDGu13UcLZRsPdUHSq UD4+dKi414nLjIyCD3L5UaYdU89hdlY= X-MC-Unique: M4r2HHc5My-oDveQLqFRRw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 33/39] configure: move -ldl test to meson Date: Wed, 2 Sep 2020 08:59:11 -0400 Message-Id: <20200902125917.26021-34-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 01:13:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- accel/tcg/meson.build | 2 +- configure | 1 - meson.build | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index 2a335b50f2..96a76ed23d 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -9,7 +9,7 @@ tcg_ss.add(files( )) tcg_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c')) tcg_ss.add(when: 'CONFIG_SOFTMMU', if_false: files('user-exec-stub.c')) -tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: files('plugin-gen.c')) +tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: [files('plugin-gen.c'), libdl]) specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss) =20 specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files('tc= g-all.c', 'cputlb.c')) diff --git a/configure b/configure index 95a259d420..033eb43428 100755 --- a/configure +++ b/configure @@ -7403,7 +7403,6 @@ fi =20 if test "$plugins" =3D "yes" ; then echo "CONFIG_PLUGIN=3Dy" >> $config_host_mak - LIBS=3D"-ldl $LIBS" # Copy the export object list to the build dir if test "$ld_dynamic_list" =3D "yes" ; then echo "CONFIG_HAS_LD_DYNAMIC_LIST=3Dyes" >> $config_host_mak diff --git a/meson.build b/meson.build index 4c32f5286f..0452de8d0e 100644 --- a/meson.build +++ b/meson.build @@ -217,6 +217,10 @@ libmpathpersist =3D not_found if config_host.has_key('CONFIG_MPATH') libmpathpersist =3D cc.find_library('mpathpersist') endif +libdl =3D not_found +if 'CONFIG_PLUGIN' in config_host + libdl =3D cc.find_library('dl', required: true) +endif libiscsi =3D not_found if 'CONFIG_LIBISCSI' in config_host libiscsi =3D declare_dependency(compile_args: config_host['LIBISCSI_CFLA= GS'].split(), --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052709; cv=none; d=zohomail.com; s=zohoarc; b=AvDtdsah9zlPxxIR6O30X31MW3gFT/ALUYyvsFSGnG8pwEA6OV25kbx+APpXyR0QK1OYcp3lajaHRZSSShSNRnZq5P50ecNqShwL9umaelml7xgi2620NU+572MnyCExUiTbJ+yHlxdfXtKfxveNoStELj1CpR0b7DoNY/5x1Mk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052709; 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=Uj8Or6jqCWjgsWo+tDf5DueNDzUwY/MwozhU6V0+JXk=; b=T2E5LHN/THKU/MO/lwcbaHyFcrbg2UEFEXLixTye/2uUcxiP6Tz9WAoQqzPNs2t1xHCtle2RiOn/n/nojrzXqI+j0e9d2Vekzpmdq7mcD7cZ07Ds4edd5ZSkPBPrH/A8uoulfGO7K3QV7xRF9FP6Kbnag0SDAYgLgWyeW/PepwI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052709200171.65273541865088; Wed, 2 Sep 2020 06:18:29 -0700 (PDT) Received: from localhost ([::1]:51472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSei-0001Fi-21 for importer@patchew.org; Wed, 02 Sep 2020 09:18:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMb-0006Th-5Y for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38349) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDSMX-0007Am-Ev for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:44 -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-373-317Vn0TCNlCS1UiO5d_aZQ-1; Wed, 02 Sep 2020 08:59:38 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9E73910ABDC3 for ; Wed, 2 Sep 2020 12:59:34 +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 6C72E5D9CC for ; Wed, 2 Sep 2020 12:59:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Uj8Or6jqCWjgsWo+tDf5DueNDzUwY/MwozhU6V0+JXk=; b=KFC/daYZDxfoTQH28tuS7XtRhLQ3vatKo2LB7vJtJT0KM8mrLxorA/X76i/9ir16ojHMkj SeQJ6Q12mVpUmiDuNTfAwODZZgGR0B0BkrMbLsL4rs9YhXpSrai7Ze782BQeJcaXFXjWXm pMDvlSH2ZhoV3g2lMWxgg9cLZ7NzVYs= X-MC-Unique: 317Vn0TCNlCS1UiO5d_aZQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 34/39] configure: remove unnecessary libm test Date: Wed, 2 Sep 2020 08:59:12 -0400 Message-Id: <20200902125917.26021-35-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 01:13:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The same test is already performed by meson.build. Signed-off-by: Paolo Bonzini --- configure | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/configure b/configure index 033eb43428..adb5abe0c0 100755 --- a/configure +++ b/configure @@ -4968,20 +4968,6 @@ if test "$libiscsi" !=3D "no" ; then fi fi =20 -########################################## -# Do we need libm -cat > $TMPC << EOF -#include -int main(int argc, char **argv) { return isnan(sin((double)argc)); } -EOF -if compile_prog "" "" ; then - : -elif compile_prog "" "-lm" ; then - LIBS=3D"-lm $LIBS" -else - error_exit "libm check failed" -fi - ########################################## # Do we need librt # uClibc provides 2 versions of clock_gettime(), one with realtime --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052397; cv=none; d=zohomail.com; s=zohoarc; b=VCUWHBxmVP8pBfxWArqV8KEKS9S26qHZja6fcN5p4b4aPkRv3Zwvrkjxi9IeY4OyEEYgyqzVuZb6yOsVM7gz3Dxxi8IvgXIT6hOnD17iDQi01KpaI3S1IB2BQuLXH/asYc0ENfJ2h4WJ+Nc20nlWRPRM9wtBiMy4SpK7IpFFtak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052397; 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=8h3AAHc1LO1DpZPMv2lF1h83yhx+jCG7f2kXp2CU/CY=; b=oICs4PO1SJkaVq334R9wMwc1GNc+fMxOpARht8LbTokVBVfrBjmHVfl9iRal4G6BpyFRsyKlEsfdVS1xe3XpQO5E7kFH8J7LD9R0qaum7drG+3ABq28BsAj8Yy+mploYVlTVH/wmPV2r6q/zCZ1ELPeERvvXYMmJFsjLURcGdMs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052397689574.361241529186; Wed, 2 Sep 2020 06:13:17 -0700 (PDT) Received: from localhost ([::1]:54868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSZg-00082U-Ni for importer@patchew.org; Wed, 02 Sep 2020 09:13:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMs-0006ux-T4 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 09:00:02 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:32603 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 1kDSMn-0007Co-UJ for qemu-devel@nongnu.org; Wed, 02 Sep 2020 09:00:01 -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-450-7KLz2AjvOyiovvuwvczbtA-1; Wed, 02 Sep 2020 08:59:38 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id EAB21107AD64 for ; Wed, 2 Sep 2020 12:59:34 +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 B8E415D9CC for ; Wed, 2 Sep 2020 12:59:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8h3AAHc1LO1DpZPMv2lF1h83yhx+jCG7f2kXp2CU/CY=; b=BOC0fNh5Mj1pipQtauP6y5D7cAlrVS6sxVSSVvKQlVLUQ2Imj66J+9bY9mC59zBpE7zPoF zkYOTjaInV+3HydcbuhtWlEa3vaCf1XgvV6h7B9BZ6ZjVHoknmIIfzgV2O34YK0FINyo5m 35qHmRefK8E6785s+Pbwk9LE4YgBS3E= X-MC-Unique: 7KLz2AjvOyiovvuwvczbtA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 35/39] configure: do not look for install(1) Date: Wed, 2 Sep 2020 08:59:13 -0400 Message-Id: <20200902125917.26021-36-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 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/02 02:26:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" It is not used anymore, so there is no Solaris-specific check to perform. Signed-off-by: Paolo Bonzini --- configure | 53 ++----------------------------------- docs/devel/build-system.rst | 4 --- meson.build | 1 - 3 files changed, 2 insertions(+), 56 deletions(-) diff --git a/configure b/configure index adb5abe0c0..d148242c9a 100755 --- a/configure +++ b/configure @@ -174,36 +174,6 @@ has() { type "$1" >/dev/null 2>&1 } =20 -# search for an executable in PATH -path_of() { - local_command=3D"$1" - local_ifs=3D"$IFS" - local_dir=3D"" - - # pathname has a dir component? - if [ "${local_command#*/}" !=3D "$local_command" ]; then - if [ -x "$local_command" ] && [ ! -d "$local_command" ]; then - echo "$local_command" - return 0 - fi - fi - if [ -z "$local_command" ]; then - return 1 - fi - - IFS=3D: - for local_dir in $PATH; do - if [ -x "$local_dir/$local_command" ] && [ ! -d "$local_dir/$local= _command" ]; then - echo "$local_dir/$local_command" - IFS=3D"${local_ifs:-$(printf ' \t\n')}" - return 0 - fi - done - # not found - IFS=3D"${local_ifs:-$(printf ' \t\n')}" - return 1 -} - version_ge () { local_ver1=3D`echo $1 | tr . ' '` local_ver2=3D`echo $2 | tr . ' '` @@ -893,7 +863,6 @@ Darwin) SunOS) solaris=3D"yes" make=3D"${MAKE-gmake}" - install=3D"${INSTALL-ginstall}" smbd=3D"${SMBD-/usr/sfw/sbin/smbd}" if test -f /usr/include/sys/soundcard.h ; then audio_drv_list=3D"oss try-sdl" @@ -929,7 +898,7 @@ if [ "$bsd" =3D "yes" ] ; then fi =20 : ${make=3D${MAKE-make}} -: ${install=3D${INSTALL-install}} + # We prefer python 3.x. A bare 'python' is traditionally # python 2.x, but some distros have it as python 3.x, so # we check that too @@ -1016,7 +985,7 @@ for opt do ;; --make=3D*) make=3D"$optarg" ;; - --install=3D*) install=3D"$optarg" + --install=3D*) ;; --python=3D*) python=3D"$optarg" ; explicit_python=3Dyes ;; @@ -1797,7 +1766,6 @@ Advanced options (experts only): --cross-cc-ARCH=3DCC use compiler when building ARCH guest test ca= ses --cross-cc-flags-ARCH=3D use compiler flags when building ARCH guest t= ests --make=3DMAKE use specified make [$make] - --install=3DINSTALL use specified install [$install] --python=3DPYTHON use specified python [$python] --sphinx-build=3DSPHINX use specified sphinx-build [$sphinx_build] --meson=3DMESON use specified meson [$meson] @@ -2315,18 +2283,6 @@ fi # Solaris specific configure tool chain decisions =20 if test "$solaris" =3D "yes" ; then - if has $install; then - : - else - error_exit "Solaris install program not found. Use --install=3D/usr/uc= b/install or" \ - "install fileutils from www.blastwave.org using pkg-get -i fileuti= ls" \ - "to get ginstall which is used by default (which lives in /opt/csw= /bin)" - fi - if test "$(path_of $install)" =3D "/usr/sbin/install" ; then - error_exit "Solaris /usr/sbin/install is not an appropriate install pr= ogram." \ - "try ginstall from the GNU fileutils available from www.blastwave.= org" \ - "using pkg-get -i fileutils, or use --install=3D/usr/ucb/install" - fi if has ar; then : else @@ -7433,11 +7389,6 @@ fi =20 echo "ROMS=3D$roms" >> $config_host_mak echo "MAKE=3D$make" >> $config_host_mak -echo "INSTALL=3D$install" >> $config_host_mak -echo "INSTALL_DIR=3D$install -d -m 0755" >> $config_host_mak -echo "INSTALL_DATA=3D$install -c -m 0644" >> $config_host_mak -echo "INSTALL_PROG=3D$install -c -m 0755" >> $config_host_mak -echo "INSTALL_LIB=3D$install -c -m 0644" >> $config_host_mak echo "PYTHON=3D$python" >> $config_host_mak echo "SPHINX_BUILD=3D$sphinx_build" >> $config_host_mak echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst index 55f0576c07..28492cfcae 100644 --- a/docs/devel/build-system.rst +++ b/docs/devel/build-system.rst @@ -136,10 +136,6 @@ developers in checking for system features: Determine if $COMMAND exists in the current environment, either as a shell builtin, or executable binary, returning 0 on success. =20 -`path_of $COMMAND` - Return the fully qualified path of $COMMAND, printing it to stdout, - and returning 0 on success. - `check_define $NAME` Determine if the macro $NAME is defined by the system C compiler =20 diff --git a/meson.build b/meson.build index 0452de8d0e..2455eb5e1a 100644 --- a/meson.build +++ b/meson.build @@ -1352,7 +1352,6 @@ summary_info +=3D {'CFLAGS': config_host['= CFLAGS']} summary_info +=3D {'QEMU_CFLAGS': config_host['QEMU_CFLAGS']} summary_info +=3D {'QEMU_LDFLAGS': config_host['QEMU_LDFLAGS']} summary_info +=3D {'make': config_host['MAKE']} -summary_info +=3D {'install': config_host['INSTALL']} summary_info +=3D {'python': '@0@ (version: @1@)'.format(python= .full_path(), python.language_version())} summary_info +=3D {'sphinx-build': config_host['SPHINX_BUILD']} summary_info +=3D {'genisoimage': config_host['GENISOIMAGE']} --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052290; cv=none; d=zohomail.com; s=zohoarc; b=JJsXAgVIxkvl+rSxURQrwW2DCVGgaJZ86ym042OEdbtVQA51npZpuYuJnl2/eH9I2QCMj4wd9SQo73/Iwbt9lNKIEjOEf35JwnC2reivspYk7YuGkJdE4byzZ+o1zR547ubctl3BgauvFXZaxsUM+U9UBSg2FzFy2fbufC/i9eU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052290; 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=+iF9cT1AEifStdmNdJWnjXFEA/AnsREladpxeCR1Wic=; b=XQ8BO884qZGTGuTf8rCtqm4q1odhb7k8tlpdtenih2bpc0RIcUR0xmF836Y8t4r/hbbyZL+uSj1yUIDJJ8eOb/+XSiYBh8GB2noNlDgQtKyyKahI7i5myG/7bFvEaR2srpHWvQ+kVe2uiUN7izftRcbeMlI3O4P8fTFun2iMsJ0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052290660859.0174598732099; Wed, 2 Sep 2020 06:11:30 -0700 (PDT) Received: from localhost ([::1]:43338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSXx-0003QC-QU for importer@patchew.org; Wed, 02 Sep 2020 09:11:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMW-0006GH-Tk for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:40 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:38801 helo=us-smtp-delivery-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 1kDSMU-00079p-E6 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:40 -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-343-nIL7C4yKM1-8qsUnku0BUw-1; Wed, 02 Sep 2020 08:59: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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 42B9E3FF9 for ; Wed, 2 Sep 2020 12:59:35 +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 1142C5D9CC for ; Wed, 2 Sep 2020 12:59:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+iF9cT1AEifStdmNdJWnjXFEA/AnsREladpxeCR1Wic=; b=FcmTvi7XWNWbr+nueC3C7ESB/f3sCYKijoTVK7IaO1oEldnEx9jA9D+H6+xbNrpZFnHuV0 ZIKvNPUAxsuQgZfYVfDr6WJW+PZciiA0ZYCNnM07hs9bjUdIUTIbQ/W1QMxVbWoNftw9NR S3+1shwLUI/EBMd4GupMeXzJOb8K61k= X-MC-Unique: nIL7C4yKM1-8qsUnku0BUw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 36/39] meson: get glib compilation flags from GLIB_CFLAGS Date: Wed, 2 Sep 2020 08:59:14 -0400 Message-Id: <20200902125917.26021-37-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com 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=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:33:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The glib compilation flags were added to QEMU_CFLAGS. While we still want them to be added to all compilation commands (at least for now), do that via GLIB_CFLAGS rather than via QEMU_CFLAGS. This shows that glib is a special case and makes it clearer that QEMU_CFLAGS is only about compiler commands and not dependencies. Signed-off-by: Paolo Bonzini --- configure | 19 +++++++++---------- meson.build | 7 +++++-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/configure b/configure index d148242c9a..7d4e499202 100755 --- a/configure +++ b/configure @@ -3742,24 +3742,23 @@ if test "$plugins" =3D yes; then glib_modules=3D"$glib_modules gmodule-2.0" fi =20 -# This workaround is required due to a bug in pkg-config file for glib as = it -# doesn't define GLIB_STATIC_COMPILATION for pkg-config --static - -if test "$static" =3D yes && test "$mingw32" =3D yes; then - QEMU_CFLAGS=3D"-DGLIB_STATIC_COMPILATION $QEMU_CFLAGS" -fi - for i in $glib_modules; do if $pkg_config --atleast-version=3D$glib_req_ver $i; then glib_cflags=3D$($pkg_config --cflags $i) glib_libs=3D$($pkg_config --libs $i) - QEMU_CFLAGS=3D"$glib_cflags $QEMU_CFLAGS" LIBS=3D"$glib_libs $LIBS" else error_exit "glib-$glib_req_ver $i is required to compile QEMU" fi done =20 +# This workaround is required due to a bug in pkg-config file for glib as = it +# doesn't define GLIB_STATIC_COMPILATION for pkg-config --static + +if test "$static" =3D yes && test "$mingw32" =3D yes; then + glib_cflags=3D"-DGLIB_STATIC_COMPILATION $glib_cflags" +fi + if $pkg_config --atleast-version=3D$glib_req_ver gio-2.0; then gio=3Dyes gio_cflags=3D$($pkg_config --cflags gio-2.0) @@ -3794,7 +3793,7 @@ int main(void) { } EOF =20 -if ! compile_prog "$CFLAGS" "$LIBS" ; then +if ! compile_prog "$glib_cflags" "$glib_libs" ; then error_exit "sizeof(size_t) doesn't match GLIB_SIZEOF_SIZE_T."\ "You probably need to set PKG_CONFIG_LIBDIR"\ "to point to the right pkg-config files for your"\ @@ -3809,7 +3808,7 @@ EOF if ! compile_prog "$glib_cflags -Werror" "$glib_libs" ; then if cc_has_warning_flag "-Wno-unknown-attributes"; then glib_cflags=3D"-Wno-unknown-attributes $glib_cflags" - QEMU_CFLAGS=3D"-Wno-unknown-attributes $CFLAGS" + CFLAGS=3D"-Wno-unknown-attributes $CFLAGS" fi fi =20 diff --git a/meson.build b/meson.build index 2455eb5e1a..6d0e61a05d 100644 --- a/meson.build +++ b/meson.build @@ -115,8 +115,11 @@ elif targetos =3D=3D 'haiku' cc.find_library('network'), cc.find_library('bsd')] endif -glib =3D declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split= (), - link_args: config_host['GLIB_LIBS'].split()) +# The path to glib.h is added to all compilation commands. This was +# grandfathered in from the QEMU Makefiles. +add_project_arguments(config_host['GLIB_CFLAGS'].split(), + native: false, language: ['c', 'cpp', 'objc']) +glib =3D declare_dependency(link_args: config_host['GLIB_LIBS'].split()) gio =3D not_found if 'CONFIG_GIO' in config_host gio =3D declare_dependency(compile_args: config_host['GIO_CFLAGS'].split= (), --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052860; cv=none; d=zohomail.com; s=zohoarc; b=ZkVRG98MNJ3dChgQlcMRCaawqVd5gMLph4IJsxDU5jwHuOATcN14xVZGlnmXw824r7wZvwgTqltcT/4mABNFeMZZDFZHEoXuJLHXHnK92p6rFh/UP9iP/Fm4Ie6nPA+a9vjkU/VH9S11a3KPp0L374YT9C7+QkleP9OiDJ+uH0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052860; 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=k1XV5DOHzM01Ds3aOXz7sZWweYvqtSodxJFaptYarYQ=; b=BzbkJK2ft6cOgWaHQ0jhvwMH39SkfV6O33GxZz6gMT/B+QIgfLL8ayDs/eUW8NSFK07K0dPinaM3beZrDgilarMIbrGXa/6Czp/SMhL67zXBSaNWtIdF3qHu79SXJHtKD2VIlQDBeVMDRQdbL1GjXe+pyCechZaWm40gv1NL8pw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052860753575.2216357281412; Wed, 2 Sep 2020 06:21:00 -0700 (PDT) Received: from localhost ([::1]:60216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSh9-0004sH-RN for importer@patchew.org; Wed, 02 Sep 2020 09:20:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMc-0006XB-7e for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:46 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:56766 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 1kDSMX-0007Ar-GK for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:45 -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-339-lf3v4jhUO4eF0BhHZZZmKA-1; Wed, 02 Sep 2020 08:59:38 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8F78C85B67B for ; Wed, 2 Sep 2020 12:59:35 +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 5D25F5D9CC for ; Wed, 2 Sep 2020 12:59:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k1XV5DOHzM01Ds3aOXz7sZWweYvqtSodxJFaptYarYQ=; b=K7zGxBJ5g2Xa6Z4VlaTkTiSgVOn9jrh2jwQso1w4Y5pcnfs+rLZf/UuWr2qX8ncX1OqIhP vDkwZwzlMaGL9u51HLqaWrZ605oSzureu92NTG3rfhKGUEex5XinMhSfjCqZMr1W4URNxH iGbV0ULJGQvCeJVRJabFDwoKr8nhq0A= X-MC-Unique: lf3v4jhUO4eF0BhHZZZmKA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 37/39] configure: do not include dependency flags in QEMU_CFLAGS and LIBS Date: Wed, 2 Sep 2020 08:59:15 -0400 Message-Id: <20200902125917.26021-38-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com 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=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:07:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" All Meson executables should specify their dependencies explicitly, either directly or indirectly via declare_dependency. Makefiles instead did not propagate dependencies correctly from static libraries, for example. Therefore, flags for dependencies need not be included in QEMU_CFLAGS. LIBS is not used at all, so drop that one as well. In a few cases the dependencies were not yet specified, so add them. Signed-off-by: Paolo Bonzini --- Makefile | 2 +- configure | 40 ---------------------------------------- hw/arm/meson.build | 2 +- hw/riscv/meson.build | 2 +- monitor/meson.build | 2 +- 5 files changed, 4 insertions(+), 44 deletions(-) diff --git a/Makefile b/Makefile index 678e76d6f2..d6c5c9fdef 100644 --- a/Makefile +++ b/Makefile @@ -155,7 +155,7 @@ dtc/%: .git-submodule-status # Therefore we replicate some of the logic in the sub-makefile. # Remove all the extra -Warning flags that QEMU uses that Capstone doesn't; # no need to annoy QEMU developers with such things. -CAP_CFLAGS =3D $(patsubst -W%,,$(CFLAGS) $(QEMU_CFLAGS)) +CAP_CFLAGS =3D $(patsubst -W%,,$(CFLAGS) $(QEMU_CFLAGS)) $(CAPSTONE_CFLAGS) CAP_CFLAGS +=3D -DCAPSTONE_USE_SYS_DYN_MEM CAP_CFLAGS +=3D -DCAPSTONE_HAS_ARM CAP_CFLAGS +=3D -DCAPSTONE_HAS_ARM64 diff --git a/configure b/configure index 7d4e499202..044cb413f2 100755 --- a/configure +++ b/configure @@ -814,7 +814,6 @@ FreeBSD) audio_drv_list=3D"oss try-sdl" audio_possible_drivers=3D"oss sdl pa" # needed for kinfo_getvmmap(3) in libutil.h - LIBS=3D"-lutil $LIBS" netmap=3D"" # enable netmap autodetect HOST_VARIANT_DIR=3D"freebsd" ;; @@ -872,13 +871,10 @@ SunOS) QEMU_CFLAGS=3D"-D_XOPEN_SOURCE=3D600 $QEMU_CFLAGS" # needed for TIOCWIN* defines in termios.h QEMU_CFLAGS=3D"-D__EXTENSIONS__ $QEMU_CFLAGS" - solarisnetlibs=3D"-lsocket -lnsl -lresolv" - LIBS=3D"$solarisnetlibs $LIBS" ;; Haiku) haiku=3D"yes" QEMU_CFLAGS=3D"-DB_USE_POSITIVE_POSIX_ERRORS -DBSD_SOURCE $QEMU_CFLAGS" - LIBS=3D"-lposix_error_mapper -lnetwork -lbsd $LIBS" ;; Linux) audio_drv_list=3D"try-pa oss" @@ -948,11 +944,7 @@ if test "$mingw32" =3D "yes" ; then HOST_DSOSUF=3D".dll" # MinGW needs -mthreads for TLS and macro _MT. CFLAGS=3D"-mthreads $CFLAGS" - LIBS=3D"-lwinmm -lws2_32 $LIBS" write_c_skeleton; - if compile_prog "" "-liberty" ; then - LIBS=3D"-liberty $LIBS" - fi prefix=3D"c:/Program Files/QEMU" qemu_suffix=3D"" libs_qga=3D"-lws2_32 -lwinmm -lpowrprof -lwtsapi32 -lwininet -liphlpapi = -lnetapi32 $libs_qga" @@ -2673,7 +2665,6 @@ if test "$xen" !=3D "no" ; then if $pkg_config --exists xentoolcore; then xen_pc=3D"$xen_pc xentoolcore" fi - QEMU_CFLAGS=3D"$QEMU_CFLAGS $($pkg_config --cflags $xen_pc)" xen_cflags=3D"$($pkg_config --cflags $xen_pc)" xen_libs=3D"$($pkg_config --libs $xen_pc)" else @@ -3058,8 +3049,6 @@ if test "$gnutls" !=3D "no"; then # At least ubuntu 18.04 ships only shared libraries. write_c_skeleton if compile_prog "" "$gnutls_libs" ; then - LIBS=3D"$gnutls_libs $LIBS" - QEMU_CFLAGS=3D"$QEMU_CFLAGS $gnutls_cflags" pass=3D"yes" fi fi @@ -3129,8 +3118,6 @@ if test "$nettle" !=3D "no"; then # Link test to make sure the given libraries work (e.g for static). write_c_skeleton if compile_prog "" "$nettle_libs" ; then - LIBS=3D"$nettle_libs $LIBS" - QEMU_CFLAGS=3D"$QEMU_CFLAGS $nettle_cflags" if test -z "$gcrypt"; then gcrypt=3D"no" fi @@ -3173,8 +3160,6 @@ if test "$gcrypt" !=3D "no"; then # Link test to make sure the given libraries work (e.g for static). write_c_skeleton if compile_prog "" "$gcrypt_libs" ; then - LIBS=3D"$gcrypt_libs $LIBS" - QEMU_CFLAGS=3D"$QEMU_CFLAGS $gcrypt_cflags" pass=3D"yes" fi fi @@ -3746,7 +3731,6 @@ for i in $glib_modules; do if $pkg_config --atleast-version=3D$glib_req_ver $i; then glib_cflags=3D$($pkg_config --cflags $i) glib_libs=3D$($pkg_config --libs $i) - LIBS=3D"$glib_libs $LIBS" else error_exit "glib-$glib_req_ver $i is required to compile QEMU" fi @@ -4056,11 +4040,6 @@ if test "$linux_io_uring" !=3D "no" ; then linux_io_uring_cflags=3D$($pkg_config --cflags liburing) linux_io_uring_libs=3D$($pkg_config --libs liburing) linux_io_uring=3Dyes - - # io_uring is used in libqemuutil.a where per-file -libs variables are= not - # seen by programs linking the archive. It's not ideal, but just add = the - # library dependency globally. - LIBS=3D"$linux_io_uring_libs $LIBS" else if test "$linux_io_uring" =3D "yes" ; then feature_not_found "linux io_uring" "Install liburing devel" @@ -4105,7 +4084,6 @@ EOF elif compile_prog "-DCONFIG_LIBATTR" "-lattr" ; then attr=3Dyes libattr_libs=3D"-lattr" - LIBS=3D"$libattr_libs $LIBS" libattr=3Dyes else if test "$attr" =3D "yes" ; then @@ -4225,7 +4203,6 @@ if test "$opengl" !=3D "no" ; then if test "$gtk" =3D "yes" && $pkg_config --exists "$gtkpackage >=3D 3.1= 6"; then gtk_gl=3D"yes" fi - QEMU_CFLAGS=3D"$QEMU_CFLAGS $opengl_cflags" else if test "$opengl" =3D "yes" ; then feature_not_found "opengl" "Please install opengl (mesa) devel pkgs:= $opengl_pkgs" @@ -4974,7 +4951,6 @@ EOF $pkg_config --atleast-version=3D0.12.3 spice-protocol && \ compile_prog "$spice_cflags" "$spice_libs" ; then spice=3D"yes" - QEMU_CFLAGS=3D"$QEMU_CFLAGS $spice_cflags" else if test "$spice" =3D "yes" ; then feature_not_found "spice" \ @@ -5157,7 +5133,6 @@ case "$capstone" in git_submodules=3D"${git_submodules} capstone" fi mkdir -p capstone - QEMU_CFLAGS=3D"$QEMU_CFLAGS -I${source_path}/capstone/include" if test "$mingw32" =3D "yes"; then LIBCAPSTONE=3Dcapstone.lib else @@ -5170,7 +5145,6 @@ case "$capstone" in system) capstone_libs=3D"$($pkg_config --libs capstone)" capstone_cflags=3D"$($pkg_config --cflags capstone)" - QEMU_CFLAGS=3D"$QEMU_CFLAGS $($pkg_config --cflags capstone)" ;; =20 no) @@ -5319,8 +5293,6 @@ EOF else urcu_bp_libs=3D"-lurcu-bp" fi - - LIBS=3D"$lttng_ust_libs $urcu_bp_libs $LIBS" else error_exit "Trace backend 'ust' missing lttng-ust header files" fi @@ -6101,7 +6073,6 @@ if test "$libpmem" !=3D "no"; then libpmem=3D"yes" libpmem_libs=3D$($pkg_config --libs libpmem) libpmem_cflags=3D$($pkg_config --cflags libpmem) - QEMU_CFLAGS=3D"$QEMU_CFLAGS $libpmem_cflags" else if test "$libpmem" =3D "yes" ; then feature_not_found "libpmem" "Install nvml or pmdk" @@ -6118,7 +6089,6 @@ if test "$libdaxctl" !=3D "no"; then libdaxctl=3D"yes" libdaxctl_libs=3D$($pkg_config --libs libdaxctl) libdaxctl_cflags=3D$($pkg_config --cflags libdaxctl) - QEMU_CFLAGS=3D"$QEMU_CFLAGS $libdaxctl_cflags" else if test "$libdaxctl" =3D "yes" ; then feature_not_found "libdaxctl" "Install libdaxctl" @@ -6301,11 +6271,6 @@ if test "$libudev" !=3D "no" ; then fi fi =20 -# Now we've finished running tests it's OK to add -Werror to the compiler = flags -if test "$werror" =3D "yes"; then - QEMU_CFLAGS=3D"-Werror $QEMU_CFLAGS" -fi - # Exclude --warn-common with TSan to suppress warnings from the TSan libra= ries. if test "$solaris" =3D "no" && test "$tsan" =3D "no"; then if $ld --version 2>/dev/null | grep "GNU ld" >/dev/null 2>/dev/null ; = then @@ -6490,10 +6455,6 @@ echo_version() { fi } =20 -# prepend ftd flags after all config tests are done -QEMU_CFLAGS=3D"$fdt_cflags $QEMU_CFLAGS" -QEMU_LDFLAGS=3D"$fdt_ldflags $QEMU_LDFLAGS" - config_host_mak=3D"config-host.mak" =20 echo "# Automatically generated by configure - do not modify" >config-all-= disas.mak @@ -7423,7 +7384,6 @@ echo "QEMU_LDFLAGS=3D$QEMU_LDFLAGS" >> $config_host_m= ak echo "LDFLAGS_NOPIE=3D$LDFLAGS_NOPIE" >> $config_host_mak echo "LD_REL_FLAGS=3D$LD_REL_FLAGS" >> $config_host_mak echo "LD_I386_EMULATION=3D$ld_i386_emulation" >> $config_host_mak -echo "LIBS+=3D$LIBS" >> $config_host_mak echo "LIBS_TOOLS+=3D$libs_tools" >> $config_host_mak echo "PTHREAD_LIB=3D$PTHREAD_LIB" >> $config_host_mak echo "EXESUF=3D$EXESUF" >> $config_host_mak diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 1ae5e17eeb..8480b7f37d 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -1,5 +1,5 @@ arm_ss =3D ss.source_set() -arm_ss.add(files('boot.c')) +arm_ss.add(files('boot.c'), fdt) arm_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('sysbus-fdt.c')) arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) arm_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build index 25af9db75e..fe2ea75f65 100644 --- a/hw/riscv/meson.build +++ b/hw/riscv/meson.build @@ -1,5 +1,5 @@ riscv_ss =3D ss.source_set() -riscv_ss.add(files('boot.c')) +riscv_ss.add(files('boot.c'), fdt) riscv_ss.add(files('numa.c')) riscv_ss.add(when: 'CONFIG_HART', if_true: files('riscv_hart.c')) riscv_ss.add(when: 'CONFIG_OPENTITAN', if_true: files('opentitan.c')) diff --git a/monitor/meson.build b/monitor/meson.build index 0484a64341..eb2a534fdc 100644 --- a/monitor/meson.build +++ b/monitor/meson.build @@ -6,4 +6,4 @@ softmmu_ss.add(files( 'qmp-cmds.c', )) =20 -specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('misc.c')) +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('misc.c'), spice]) --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052776; cv=none; d=zohomail.com; s=zohoarc; b=Mw8nhD1PXme/7bakqDUVYS9YQ2Gs1ps0VdGc9Zpc6H9P9uCFQ6LekzkbyEs3JjAQEJyMS7ryNuYqfWAAcGL1zrXumYj8Gr6S50pEOeSpdMvQN1+2MTX1GUV8JJ4aVDmeLdCenXs0YG91SndZiUSwtdQW4kkgBv4i4nqH29vRoic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052776; 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=1EKJrEDpc7ENF0eGvrpw7+HFUjiqX3/oYPynl9tD1Jw=; b=ibB+AS7mtFe63YuWy12ZFkb5JBKlc9uV0k2U9iuEfXnalYRXDWIR2xyBgL4LNe0RUZOCy13jz3Y8ieL/29pla4GWPZcmum8X6TdnyDhA2CX/xL14/jfEnn3eFHatxSSIte2GP9zKHNv/YYDur1ZLFqCgoT70A7uM8/z2wId9l2U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052776871451.5635622972212; Wed, 2 Sep 2020 06:19:36 -0700 (PDT) Received: from localhost ([::1]:55862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSfo-00031h-4Y for importer@patchew.org; Wed, 02 Sep 2020 09:19:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMb-0006Vo-PY for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:45 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:48771 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 1kDSMX-0007Ag-1M for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:45 -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-329-RlflslKHM-2leSC745BVbw-1; Wed, 02 Sep 2020 08:59:38 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id DB515107B7E1 for ; Wed, 2 Sep 2020 12:59:35 +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 AA49D5D9CC for ; Wed, 2 Sep 2020 12:59:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1EKJrEDpc7ENF0eGvrpw7+HFUjiqX3/oYPynl9tD1Jw=; b=OxHrjpj5eaEyfCdJk+ezOp9VaW8e8RXhXVCFgBBEg4bhtbZoHAzfUp8QA3NepIy/rUqJiP LR+xykxsMZNKGjW9qUCRhPhrMClvLCKHlXMo57fY3Xg7CU4dXq6jaUgqTUQt9WILQxjXOz RWSvyNDlBmAgpI5yZr8Wn0PkHlcDRjU= X-MC-Unique: RlflslKHM-2leSC745BVbw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 38/39] configure: drop dead variables Date: Wed, 2 Sep 2020 08:59:16 -0400 Message-Id: <20200902125917.26021-39-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com 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=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:07:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- configure | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/configure b/configure index 044cb413f2..43e7761a10 100755 --- a/configure +++ b/configure @@ -313,7 +313,6 @@ audio_drv_list=3D"" block_drv_rw_whitelist=3D"" block_drv_ro_whitelist=3D"" host_cc=3D"cc" -libs_tools=3D"" audio_win_int=3D"" libs_qga=3D"" debug_info=3D"yes" @@ -421,7 +420,6 @@ mingw32=3D"no" gcov=3D"no" EXESUF=3D"" HOST_DSOSUF=3D".so" -LDFLAGS_SHARED=3D"-shared" modules=3D"no" module_upgrades=3D"no" prefix=3D"/usr/local" @@ -845,7 +843,6 @@ Darwin) darwin=3D"yes" hax=3D"yes" hvf=3D"yes" - LDFLAGS_SHARED=3D"-bundle -undefined dynamic_lookup" if [ "$cpu" =3D "x86_64" ] ; then QEMU_CFLAGS=3D"-arch x86_64 $QEMU_CFLAGS" QEMU_LDFLAGS=3D"-arch x86_64 $QEMU_LDFLAGS" @@ -4922,7 +4919,7 @@ elif compile_prog "" "$pthread_lib -lrt" ; then LIBS=3D"$LIBS -lrt" fi =20 -# Check whether we need to link libutil for openpty() +# Check whether we have openpty() in either libc or libutil cat > $TMPC << EOF extern int openpty(int *am, int *as, char *name, void *termp, void *winp); int main(void) { return openpty(0, 0, 0, 0, 0); } @@ -4933,7 +4930,6 @@ if compile_prog "" "" ; then have_openpty=3D"yes" else if compile_prog "" "-lutil" ; then - libs_tools=3D"-lutil $libs_tools" have_openpty=3D"yes" fi fi @@ -7382,13 +7378,10 @@ if test "$sparse" =3D "yes" ; then fi echo "QEMU_LDFLAGS=3D$QEMU_LDFLAGS" >> $config_host_mak echo "LDFLAGS_NOPIE=3D$LDFLAGS_NOPIE" >> $config_host_mak -echo "LD_REL_FLAGS=3D$LD_REL_FLAGS" >> $config_host_mak echo "LD_I386_EMULATION=3D$ld_i386_emulation" >> $config_host_mak -echo "LIBS_TOOLS+=3D$libs_tools" >> $config_host_mak echo "PTHREAD_LIB=3D$PTHREAD_LIB" >> $config_host_mak echo "EXESUF=3D$EXESUF" >> $config_host_mak echo "HOST_DSOSUF=3D$HOST_DSOSUF" >> $config_host_mak -echo "LDFLAGS_SHARED=3D$LDFLAGS_SHARED" >> $config_host_mak echo "LIBS_QGA=3D$libs_qga" >> $config_host_mak echo "TASN1_LIBS=3D$tasn1_libs" >> $config_host_mak echo "TASN1_CFLAGS=3D$tasn1_cflags" >> $config_host_mak --=20 2.26.2 From nobody Sun Nov 16 05:58:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052559; cv=none; d=zohomail.com; s=zohoarc; b=GRvMu3I9t2oScrdlDlr+JhhEc9KKr8QfM4fS6/b88vd6sMaBKkaQsveuXWnq9bD7m5EgfqMNm8Rs5UgKjzJ7EVtmimsV1bwIXc5UhMGZP88qHIAz8LcV5IGTyV4d/YueCRbhNv3dSDTtQj//Unx8jiOWEUTSHEdHTLk9XHqtOdY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052559; 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=DJINUlrbOh9CRinU9oksUQxkJN23nsr9dJ80VojDCLA=; b=iSZ2GiQVea9Y4O57HVXHz8VGqaVqJPI7u7Mq6ECF4Jl01S3bK8Bs7+WHUyxVYPrBtaCFthCfy9S6MuNH01u7VBiBMuaeeAh2r4K+lxXjsLAkB16NHWeyE9dndwIUOdUzhG295tIejy33cwbtYVYeokOn4giKTUMG2ORQSUOV6KA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599052559919465.564756604894; Wed, 2 Sep 2020 06:15:59 -0700 (PDT) Received: from localhost ([::1]:40880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDScJ-0005Io-52 for importer@patchew.org; Wed, 02 Sep 2020 09:15:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMa-0006R6-H6 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:57624 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 1kDSMV-0007A8-C6 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:44 -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-441-DARaZT6gMDO_oli4irB6_w-1; Wed, 02 Sep 2020 08:59:37 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 333CA801AEF for ; Wed, 2 Sep 2020 12:59:36 +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 01CB85D9CC for ; Wed, 2 Sep 2020 12:59:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DJINUlrbOh9CRinU9oksUQxkJN23nsr9dJ80VojDCLA=; b=gRrR9e1rddUOV0XT8up2bSu9u8qogr6GLmbi8RrCNspywX/uD34q3JTMyYZVp70JCqgYZz q+nZeUDNRo9IGWDyS9RGQYfozrrYjhkS+5C5LhAXgWMuCvra6/BL1vcqdRBHJwgrwdd3m8 2ENFdBTm+Fj4iORQYFK22Ewuauv3Iqs= X-MC-Unique: DARaZT6gMDO_oli4irB6_w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 39/39] docs: suggest Meson replacements for various configure functions Date: Wed, 2 Sep 2020 08:59:17 -0400 Message-Id: <20200902125917.26021-40-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 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=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:07:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- docs/devel/build-system.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst index 28492cfcae..591e93f4b4 100644 --- a/docs/devel/build-system.rst +++ b/docs/devel/build-system.rst @@ -125,23 +125,27 @@ developers in checking for system features: `compile_object $CFLAGS` Attempt to compile a test program with the system C compiler using $CFLAGS. The test program must have been previously written to a file - called $TMPC. + called $TMPC. The replacement in Meson is the compiler object `cc`, + which has methods such as `cc.compiles()`, + `cc.check_header()`, `cc.has_function()`. =20 `compile_prog $CFLAGS $LDFLAGS` Attempt to compile a test program with the system C compiler using $CFLAGS and link it with the system linker using $LDFLAGS. The test program must have been previously written to a file called $TMPC. + The replacement in Meson is `cc.find_library()` and `cc.links()`. =20 `has $COMMAND` Determine if $COMMAND exists in the current environment, either as a - shell builtin, or executable binary, returning 0 on success. + shell builtin, or executable binary, returning 0 on success. The + replacement in Meson is `find_program()`. =20 `check_define $NAME` Determine if the macro $NAME is defined by the system C compiler =20 `check_include $NAME` Determine if the include $NAME file is available to the system C - compiler + compiler. The replacement in Meson is `cc.has_header()`. =20 `write_c_skeleton` Write a minimal C program main() function to the temporary file --=20 2.26.2