From nobody Sat May 4 06:57:40 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643282471675368.10902890101875; Thu, 27 Jan 2022 03:21:11 -0800 (PST) Received: from localhost ([::1]:44652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD2py-0001Kj-PR for importer@patchew.org; Thu, 27 Jan 2022 06:21:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD2ft-0006li-SM for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:47 -0500 Received: from [2a00:1450:4864:20::436] (port=41900 helo=mail-wr1-x436.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD2fp-00066t-Uh for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:44 -0500 Received: by mail-wr1-x436.google.com with SMTP id h21so4043692wrb.8 for ; Thu, 27 Jan 2022 03:10:41 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s17sm1825742wrm.62.2022.01.27.03.10.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 03:10:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RhCZzX1SzaShlFvgBIqzU1rna1BkC/vhcmJziKa4KaE=; b=WpAidGiGzPfJCTSqS+TONjOp1Gq1MEr1yuTZ4JEU8e2PzYhc79Vpu/lfw5iSbtPWJf 4SaNbX6oBLBzkWmjKGuc95lynZs1Fxtjqjr9+ETyvIhou14mPuy35b51upULBAjbOIR0 5T01jPEp+QlsPmuWmZMQs1EhwCF0CvRWEmEVy6n7bK75aumZxtpGlgrtLqRImDXjZd3t n0aEkMkPuvI1ggb2Hzx291CVpjJRFwTcJJG5i94zdxC637zz64xVIzZQ2wBMO4P57rZO wSQQbnfRk6qGz4MGZq4/tt+BMnPUBNzB90vweefSdo5LLte5Bh/5f5L3aurgrxNnQY0F Z7nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=RhCZzX1SzaShlFvgBIqzU1rna1BkC/vhcmJziKa4KaE=; b=PUXbs/gQJsIE96yYI9zuNxj0yzboitCQF+KAGJyD+FZ2+HXEjVGbSQPo45iG+tKNDX gpB+m+M+a9Czc/nfphu/2/k/IaFFuZbJTKWTkZgymlXdrVtnaY3BRCqFFlPIKdad/q82 MiH4JGjRErElDERYBMzdtvl5aV/EmijFTZk2RK+voXjUqOI9gwyOIHK+oeXl6IXs3PVh I810z+SUEYe6S0a7HwCLTiqJBFh5DzyomMMfQCKeAEmcHgTNZgYcxFEm+p6nEPU8qUli yvUqlJ1SYgXlMosTyY3fRou4qUW+R5lmRDOOd6TMg5eaimE6fgyPTMpwC3QKam6PmNsD 4FzA== X-Gm-Message-State: AOAM531ry+YlwNrU208Fkv4AMs1HmolZrMGMOcnn6+9kfet7I21u8si1 eUVRg4CQfwpxo7AgcSRdwaxzzKkPsUU= X-Google-Smtp-Source: ABdhPJxS7SedTGpagY6fq/8Aa8pXyKiLUpGpSy+dSgVCw2lVuQq2ftAt+qj1NKygiRpHpshycwUDwg== X-Received: by 2002:a5d:4cc7:: with SMTP id c7mr2517950wrt.233.1643281840009; Thu, 27 Jan 2022 03:10:40 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/14] build-sys: fix a meson deprecation warning Date: Thu, 27 Jan 2022 12:10:24 +0100 Message-Id: <20220127111037.457901-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220127111037.457901-1-pbonzini@redhat.com> References: <20220127111037.457901-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::436 (failed) 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=2a00:1450:4864:20::436; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x436.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643282474193100001 From: Marc-Andr=C3=A9 Lureau WARNING: Deprecated features used: * 0.56.0: {'meson.source_root'} Signed-off-by: Marc-Andr=C3=A9 Lureau Reported-by: Peter Maydell Message-Id: <20220113162148.3621818-1-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- tests/qtest/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 26937deb6d..842b1df420 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -103,7 +103,7 @@ if dbus_daemon.found() and config_host.has_key('GDBUS_C= ODEGEN') #qtests_i386 +=3D ['dbus-vmstate-test'] dbus_vmstate1 =3D custom_target('dbus-vmstate description', output: ['dbus-vmstate1.h', 'dbus-vmstate1= .c'], - input: meson.source_root() / 'backends/dbu= s-vmstate1.xml', + input: meson.project_source_root() / 'back= ends/dbus-vmstate1.xml', command: [config_host['GDBUS_CODEGEN'], '@INPUT@', '--interface-prefix', 'org.qemu', --=20 2.34.1 From nobody Sat May 4 06:57:40 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643282904718148.21299061611649; Thu, 27 Jan 2022 03:28:24 -0800 (PST) Received: from localhost ([::1]:58584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD2wx-0002c8-Ir for importer@patchew.org; Thu, 27 Jan 2022 06:28:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD2fu-0006lj-2C for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:47 -0500 Received: from [2a00:1450:4864:20::432] (port=38486 helo=mail-wr1-x432.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD2fp-00066y-Ux for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:44 -0500 Received: by mail-wr1-x432.google.com with SMTP id c23so4080675wrb.5 for ; Thu, 27 Jan 2022 03:10:41 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s17sm1825742wrm.62.2022.01.27.03.10.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 03:10:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0qQTl1Wmpww8I6zctLdCK7C2s/OXLuCsycoHUgco2G4=; b=k8LcvCcbp4NuhWdgtyrMg0U372uJBwi6CpsYnGNTe6YNNElQOIt2gK+HU8O5kNeaCj KVT77hZeQ1xM5TO3WoRGnVFv6gKohg/NhEpmxGV0FTcq59+D1fKQzgKT8NLwUqQrO+TH Syw1iC8STzf5qJmz01ah4p3o8m3j1uLXQ+xWglsnmB4Qp4xlfgOCnBu4w8cJehcW0X/z cm1Hwhciqgv1ZDvyPUEmR/fIW2PQtUtkfb7Jm5K5+fRk68hd+hIN+B+HdNxkxxe6Gl7c VR91/bRFBvguzKWOfO3wtPQ11XnZhpaYAiKMz/f1guvrP1G/t6mHE6YbhxoZa6k4UaG+ XlOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0qQTl1Wmpww8I6zctLdCK7C2s/OXLuCsycoHUgco2G4=; b=nzhNTB6CG/AyubC1Sky39r2Ftc0PNcZifHe0SCJXSSuuEk629jKTIFMvRjbDFOJOC1 RQT4I1jBbQvtQdGRiTEo4P3A1OeljRhTxHGpOqPKZC7tganOnEvGWeSB5b2LaLZev1Sp sPARpq2SgeIo12ruN/usAtCTI8D3dPC7ssRwmRk9N0NWnp45LU4/dOkmQl7ckqOylR7i 8k91bmL7/p/4iJZXdHYGqEQTVEPmKk8zSfb74rlafb5Mks5wqg04Ue+Eq1e4DqJzeldo 619wz1hlS7DquRB61xXkbJhG7DQf+ns3DPKD3RWDC4tiAb6SSaYE87KBRttqQXI8rSuw tZeA== X-Gm-Message-State: AOAM531qVbWZAMynZkQ9sGJ2RspZvboFl2jCZ7doMntYXz2Zd5i6NBi1 tG/ojd6M5PhS+RC6lUaTY1DzXikW/jE= X-Google-Smtp-Source: ABdhPJxm2hJm0z67n2i9HUPqf7mvmFUn3XUdPqYg0syIgN1AlUTee0ow3/xZDVV2jAf7qCclAFF29Q== X-Received: by 2002:a05:6000:1688:: with SMTP id y8mr2568553wrd.374.1643281840647; Thu, 27 Jan 2022 03:10:40 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/14] build-sys: fix undefined ARCH error Date: Thu, 27 Jan 2022 12:10:25 +0100 Message-Id: <20220127111037.457901-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220127111037.457901-1-pbonzini@redhat.com> References: <20220127111037.457901-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::432 (failed) 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=2a00:1450:4864:20::432; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x432.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643282906004100001 From: Marc-Andr=C3=A9 Lureau ../qga/meson.build:76:4: ERROR: Key ARCH is not in the dictionary. Fixes commit 823eb013 ("configure, meson: move ARCH to meson.build") Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20220114084312.3725242-1-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- qga/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/meson.build b/qga/meson.build index cfb1fbc085..613ecb9802 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -75,7 +75,7 @@ if targetos =3D=3D 'windows' endif qga_msi =3D custom_target('QGA MSI', input: files('installer/qemu-ga.wxs'), - output: 'qemu-ga-@0@.msi'.format(config_host['= ARCH']), + output: 'qemu-ga-@0@.msi'.format(host_arch), depends: deps, command: [ find_program('env'), --=20 2.34.1 From nobody Sat May 4 06:57:40 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643282604180317.22433437618406; Thu, 27 Jan 2022 03:23:24 -0800 (PST) Received: from localhost ([::1]:49962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD2s6-00056t-UD for importer@patchew.org; Thu, 27 Jan 2022 06:23:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD2fu-0006lk-Eo for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:47 -0500 Received: from [2a00:1450:4864:20::431] (port=44788 helo=mail-wr1-x431.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD2fr-000677-CP for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:44 -0500 Received: by mail-wr1-x431.google.com with SMTP id k18so4021311wrg.11 for ; Thu, 27 Jan 2022 03:10:42 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s17sm1825742wrm.62.2022.01.27.03.10.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 03:10:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4DhWFk/TxKIkkJpeksTWTEGSvTtXd1rBTWFImb/7k2E=; b=ToUA8E69KhA2+EFbRjkWKsN48UENP+WICBnXjT3MuHemino9jYuNyTPSAwnmxG5SKq /XQ+2Rjh+B2gZTjPavhqRTT3ksbIQJ7XUrCL4X2jQ9nZqx2K/XYbrKl22sk6KIS296kD pQEf0vyTsvnh7fnpGk4nFqXEVMnHN5thGDNO4gp+ehU9M61x4C20VkJSjxi5MzueiXjZ yoojPJCn0mZFHme1jFB/aL4deTsZ2JKjVxcMu1vI3gdn9WD3LmBRE/N7TJYI0rOcT8OU HSUT1skK3hxYySSMyIh/pA8HZwc9vw4nziNWXohGajbA6MED/LwrYTYzUpYspR9Qy5Zc zplA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4DhWFk/TxKIkkJpeksTWTEGSvTtXd1rBTWFImb/7k2E=; b=hdIzX3ScyjlewqbNcI2pv1A2o0SJN2odKh7M24aD3G7aAvfHllNKjwx1SSr1OQKq1U 11pOa/YNjv2iWLoKV8/WLyh5dKkZ00DGty4Fn6Pf/Zsqs5i9LWaRaqIJ+Zxi6IWW4zmb 0zvXbbQ68n1vzbiJvqD6r+ASrht2ujcfDvCaYjhotIcbyPp6bRjidP/Zl8kFP5DozzM1 tvsySgPp/tE+ipYYt7mvWaVXDvmlixzYDXqUflCkiFjfbYEp3RCE7dnV71K681PuUN+u OTg+q4IbmLoCFxk+mVwrowHkgk7JQJ4V7y4K0Dn0NBoNx7iM/2Fj4DHzxpCuHwkPoh6k wbnA== X-Gm-Message-State: AOAM532sqUwWiwIODvtrue94iruTMtJCtfMck9uy5EFZZ23GvtrrGaNT cs5bnVX+jIv6hNVUTkCfNgFSWBo30uM= X-Google-Smtp-Source: ABdhPJxZifv3/eo0xvbeyvHR68LZjQ+V7tfQSI0IbXv3mIz6k3ok1WUenIxO/qKkacKNKJT/R6FzbA== X-Received: by 2002:adf:e489:: with SMTP id i9mr2562742wrm.107.1643281842159; Thu, 27 Jan 2022 03:10:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/14] docker: add msitools to Fedora/mingw cross Date: Thu, 27 Jan 2022 12:10:26 +0100 Message-Id: <20220127111037.457901-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220127111037.457901-1-pbonzini@redhat.com> References: <20220127111037.457901-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::431 (failed) 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=2a00:1450:4864:20::431; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x431.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643282605365100001 From: Marc-Andr=C3=A9 Lureau That should help catch build issues/regressions with wixl. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20220114084312.3725242-2-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- tests/docker/dockerfiles/fedora-win32-cross.docker | 1 + tests/docker/dockerfiles/fedora-win64-cross.docker | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/doc= ker/dockerfiles/fedora-win32-cross.docker index aad39dd97f..d80e66c651 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -29,6 +29,7 @@ ENV PACKAGES \ mingw32-pixman \ mingw32-pkg-config \ mingw32-SDL2 \ + msitools \ perl \ perl-Test-Harness \ python3 \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index 9a224a619b..2b12b94ccf 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -26,6 +26,7 @@ ENV PACKAGES \ mingw64-libusbx \ mingw64-pixman \ mingw64-pkg-config \ + msitools \ perl \ perl-Test-Harness \ python3 \ --=20 2.34.1 From nobody Sat May 4 06:57:40 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643282278508920.1123130439896; Thu, 27 Jan 2022 03:17:58 -0800 (PST) Received: from localhost ([::1]:37024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD2mp-0004Wu-SE for importer@patchew.org; Thu, 27 Jan 2022 06:17:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD2fu-0006ll-Mj for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:47 -0500 Received: from [2a00:1450:4864:20::430] (port=35577 helo=mail-wr1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD2fs-00067J-5D for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:45 -0500 Received: by mail-wr1-x430.google.com with SMTP id e2so4114195wra.2 for ; Thu, 27 Jan 2022 03:10:43 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s17sm1825742wrm.62.2022.01.27.03.10.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 03:10:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=78omnZ5BLUfUnSRSR2DgfwkYSNZfwAfILdqOtI91T4M=; b=GXYjyFvLe87K4lxjhx0ld8I9O+uH5rABjgFm6X1sgAFzw3ABjqvpRyCuIi+tAb95iQ VR1Mp/YSY3iepR8UdrE5Ni+pJqh72EZ7Yehjc+PtvHsfAScsAGpd0MskmcoCTO8uCxvQ 6cCW44u6eKtlbhOufOf2dHDDnBg6QTaEakA/2o8qJNJ4mHTjTDcrs0Emqh0ZCHKQd4pN QFdh8wDjtiaoPdDTobP8Zc1aN5S7uljfHPkT1cYpO5qxhvWHb+eguKnX9E00FuRU3/Ug i8PFnhWwKqqz9COKKEtyD7Qa9Ub2tJiEJq6jBXHepSNvETAVjuFqwdD+Fk8YKxuVCdkZ CjKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=78omnZ5BLUfUnSRSR2DgfwkYSNZfwAfILdqOtI91T4M=; b=qs53yevCk+OHhI1jwEbHkUgUi+F0KZaPyMqP93PLTs1yT3hgM1mJf4Mp4W5Lyakn// SmEdCrG6ZIR6MtwlKOrUYtMn5CUilA7YC9xMlst1nUteT/iBWX0T9Bd/KXde8XBK44d3 Y51mSBZQEJzA7Ar9QSqBgj2a7VjiAnTT9YhZe2zzHtWnZdR9Gq9eLQj4NYREGNuI9xBu s2pldk5n6pszk4gUbkmAsmeBaQVA8tJDahHlqgWXbliLzZh4Npzwe1lET1qXM0euS9vh PXrD9wnKrVIIkbnuxuZPFfrlZ25qDwVNKjJuMAg2dPyLLlawhtcj2gDiVG2QTnZa2scj MJzA== X-Gm-Message-State: AOAM5312T9hIMk3VRXd9duYSZnNYsARO8pqJGFNEz57dQL23bcs1TQ8+ yfgpJtTmI7fpIVyfm4veiAlM2yNPIlY= X-Google-Smtp-Source: ABdhPJx6M235UYRbiCrDldYl7TKvVIRByLcAkIWO4ZFZw45lmwKltqtJS9Br3gad9nuc8+3Ry58v5w== X-Received: by 2002:a5d:64e9:: with SMTP id g9mr2642308wri.394.1643281842980; Thu, 27 Jan 2022 03:10:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/14] intc: Unexport InterruptStatsProviderClass-related functions Date: Thu, 27 Jan 2022 12:10:27 +0100 Message-Id: <20220127111037.457901-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220127111037.457901-1-pbonzini@redhat.com> References: <20220127111037.457901-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::430 (failed) 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=2a00:1450:4864:20::430; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x430.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernhard Beschow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643282280195100003 Content-Type: text/plain; charset="utf-8" From: Bernhard Beschow The functions are only used within their respective source files, so no need for exporting. Signed-off-by: Bernhard Beschow Message-Id: <20220116122327.73048-1-shentey@gmail.com> Signed-off-by: Paolo Bonzini --- hw/intc/i8259_common.c | 6 +++--- hw/intc/ioapic_common.c | 2 +- include/hw/i386/ioapic_internal.h | 1 - include/hw/isa/i8259_internal.h | 3 --- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c index d90b40fe4c..af2e4a2241 100644 --- a/hw/intc/i8259_common.c +++ b/hw/intc/i8259_common.c @@ -116,8 +116,8 @@ void pic_stat_update_irq(int irq, int level) } } =20 -bool pic_get_statistics(InterruptStatsProvider *obj, - uint64_t **irq_counts, unsigned int *nb_irqs) +static bool pic_get_statistics(InterruptStatsProvider *obj, + uint64_t **irq_counts, unsigned int *nb_irq= s) { PICCommonState *s =3D PIC_COMMON(obj); =20 @@ -132,7 +132,7 @@ bool pic_get_statistics(InterruptStatsProvider *obj, return true; } =20 -void pic_print_info(InterruptStatsProvider *obj, Monitor *mon) +static void pic_print_info(InterruptStatsProvider *obj, Monitor *mon) { PICCommonState *s =3D PIC_COMMON(obj); =20 diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c index 3cccfc1556..aa5f760871 100644 --- a/hw/intc/ioapic_common.c +++ b/hw/intc/ioapic_common.c @@ -76,7 +76,7 @@ static void ioapic_irr_dump(Monitor *mon, const char *nam= e, uint32_t bitmap) monitor_printf(mon, "\n"); } =20 -void ioapic_print_redtbl(Monitor *mon, IOAPICCommonState *s) +static void ioapic_print_redtbl(Monitor *mon, IOAPICCommonState *s) { static const char *delm_str[] =3D { "fixed", "lowest", "SMI", "...", "NMI", "INIT", "...", "extINT"}; diff --git a/include/hw/i386/ioapic_internal.h b/include/hw/i386/ioapic_int= ernal.h index 021e715f11..9880443cc7 100644 --- a/include/hw/i386/ioapic_internal.h +++ b/include/hw/i386/ioapic_internal.h @@ -112,7 +112,6 @@ struct IOAPICCommonState { =20 void ioapic_reset_common(DeviceState *dev); =20 -void ioapic_print_redtbl(Monitor *mon, IOAPICCommonState *s); void ioapic_stat_update_irq(IOAPICCommonState *s, int irq, int level); =20 #endif /* QEMU_IOAPIC_INTERNAL_H */ diff --git a/include/hw/isa/i8259_internal.h b/include/hw/isa/i8259_interna= l.h index a6ae8a583f..d272d879fb 100644 --- a/include/hw/isa/i8259_internal.h +++ b/include/hw/isa/i8259_internal.h @@ -72,8 +72,5 @@ struct PICCommonState { void pic_reset_common(PICCommonState *s); ISADevice *i8259_init_chip(const char *name, ISABus *bus, bool master); void pic_stat_update_irq(int irq, int level); -bool pic_get_statistics(InterruptStatsProvider *obj, - uint64_t **irq_counts, unsigned int *nb_irqs); -void pic_print_info(InterruptStatsProvider *obj, Monitor *mon); =20 #endif /* QEMU_I8259_INTERNAL_H */ --=20 2.34.1 From nobody Sat May 4 06:57:40 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643283432471267.08646756942017; Thu, 27 Jan 2022 03:37:12 -0800 (PST) Received: from localhost ([::1]:39002 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD35T-0000L5-HX for importer@patchew.org; Thu, 27 Jan 2022 06:37:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD2fv-0006ls-KD for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:51 -0500 Received: from [2a00:1450:4864:20::32b] (port=56114 helo=mail-wm1-x32b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD2fu-00067W-0Y for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:47 -0500 Received: by mail-wm1-x32b.google.com with SMTP id r7so1615446wmq.5 for ; Thu, 27 Jan 2022 03:10:44 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s17sm1825742wrm.62.2022.01.27.03.10.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 03:10:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IAVMsDJsaXOjswkyBD7Ia0E8Zsa510y7vP1ftZ1P6HE=; b=diskyPafenum2sVU+zGGPPOv0CeBuBRso/WCorgHGUhfWLNIa9bLN8/+xufOVCOg58 1HhTmFZH0Y4VIv/HFx/5Xj534WfJBlhZBYD/yPPTWd94DVY/HTYjRNAByFmZMJeeo5JZ 0BW71C3qoU6hUP92svbQ7VlyF9Cj+WkmaMcnUPJv2gFSD1TYnVLHnuSZfDmo52Qf/d5w H30igjLWlYETTBC+R5uKMCNAlpsB5KiR4L35gDVyXr5Wiv1cmox1ZeuDCLVlMoRRlA38 PN/ALz/b8QHEgc54y5mThQeM+0513YKcqpfcDT5ulfQLEHXUWcRo6HliU7kDJv2Esc8T iWew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=IAVMsDJsaXOjswkyBD7Ia0E8Zsa510y7vP1ftZ1P6HE=; b=LRAVtqSaay+cVGzEwvvn7F4gRpxkPqrLnlRXWzh1MsDsUdmWXpOHXxGGRbfEs266U+ 55SSqQ/4swpq4RPQq6BEePEdAZbrXnYyj7JypdRz2EAbQl3FpFqHzr5r8XHTZSqWPlH9 0GYiSzBxI+c1yKizA/ibvg6YCrYaXbHa0EaXKLVyrESuxFMadYdKEQpB/VjXKx1oVQBs ZfLXsMiWsLTt333pO5ZRydtbfmYsdDHJvLsh991ThuGUETlRT+6Xf9FiXtYO+prbpZns 2Keu7GPTs0iOtEPorN8SLYx+1C1GQxRTS5wiq22MUBD3vQZwOemVTXFSx+leV7f31XXO lf4A== X-Gm-Message-State: AOAM53209zfiJXFthGSYCNMEmo8LXNruEKwvKf3Nbn4omEdJpNvhimGi HAuGkni+Et/b6iS3DLRJYd5vztiENGY= X-Google-Smtp-Source: ABdhPJyeh146kwnzuwyAA1oHYMYEJRUtEoVhZ4Lkzt1zPjwLVaL1eJ/eV3ApzG6VwC7AKltC3MOOMw== X-Received: by 2002:a7b:c153:: with SMTP id z19mr11038989wmi.118.1643281843674; Thu, 27 Jan 2022 03:10:43 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/14] meson.build: Use a function from libfdt 1.5.1 for the library check Date: Thu, 27 Jan 2022 12:10:28 +0100 Message-Id: <20220127111037.457901-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220127111037.457901-1-pbonzini@redhat.com> References: <20220127111037.457901-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32b (failed) 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=2a00:1450:4864:20::32b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643283435052100001 From: Thomas Huth The fdt version test in meson.build uses a function from libfdt v1.4.7, but we require version 1.5.1 nowadays. Thus use a function that has been introduced in that version instead. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/822 Signed-off-by: Thomas Huth Reviewed-by: Alistair Francis Reviewed-by: David Gibson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20220118170548.97288-1-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 833fd6bc4c..4429fd2041 100644 --- a/meson.build +++ b/meson.build @@ -2279,7 +2279,7 @@ if have_system if fdt.found() and cc.links(''' #include #include - int main(void) { fdt_check_full(NULL, 0); return 0; }''', + int main(void) { fdt_find_max_phandle(NULL, NULL); return 0; }''', dependencies: fdt) fdt_opt =3D 'system' elif fdt_opt =3D=3D 'system' --=20 2.34.1 From nobody Sat May 4 06:57:40 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643282485330767.5403673153942; Thu, 27 Jan 2022 03:21:25 -0800 (PST) Received: from localhost ([::1]:45672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD2qC-0002Dv-DE for importer@patchew.org; Thu, 27 Jan 2022 06:21:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD2fw-0006mf-K1 for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:51 -0500 Received: from [2a00:1450:4864:20::32f] (port=44946 helo=mail-wm1-x32f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD2fu-00067p-21 for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:47 -0500 Received: by mail-wm1-x32f.google.com with SMTP id l35-20020a05600c1d2300b0034d477271c1so1600102wms.3 for ; Thu, 27 Jan 2022 03:10:45 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s17sm1825742wrm.62.2022.01.27.03.10.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 03:10:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DM6390IblKITC2WUseBCeDBsNtvZZl5g/IOpmBC35RU=; b=ioL1QOJJd1L7r+5EuGtZR2ODgb9Tk/qxDMmuiUcvlP6kUBBVmOjvXMrqNIuBs/4BEz WZOWjOrMUc98wjLZmJPCX4NLzgzPgj0l3Ztn2rYfIu8Fg6vzHmfd/GwGcw4SEoFbxvUp yhC2uuSmJDR9Tjh6r3mmZ59+N7DPkymTkqTRRV6rNI3yy4W2Qs4bIh/ttA0/ZQsVpz1x PcnD15kxziYNFjRGnHNB9dmpNarkyfAeHdlrGLh1YSJve+AEJBMbOkJ19Bx6BbARGyBr 9yFkCZU5mKLct9Oc8NJdyif5GkU/4vvorFUh15cfJpIQ/ivaWi5/uoiAbtEEnj5H7cz8 OuTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DM6390IblKITC2WUseBCeDBsNtvZZl5g/IOpmBC35RU=; b=rgaxKO6uzu38k1UbSzWYW89wiImMrTv10wbbFg4wI6LLYr7KiXVAQ/23/CXlq73/DL IA5Iomu6M+1LGhO66H6AsAG9nkHBxpk2FKDRtVzQF5pTvdx8P2p/NYJc91Zij0+rf/rG /hZXAOoSiPdsW2SAml3FfRF2KrTWuFZPbGy55qL3jdITkchvlV87Kl7nhJL9mWBTQ8Z3 PuzK9VhC6fGkCJNnKGSjyP571jQfF6d3bPZeZqsxP3j1yGu/ZQBpEneKMD5DN9yH/NYs ZCk/gekicIyIB/ZYMrvnpx76lYpcuf12y5SJp8lwDs1/kTLKlVtFG6DXhKXZev91eoLS iYaA== X-Gm-Message-State: AOAM532idPUnV7oqIfpCUS5s5dewSiCygBeaRR0fat5p7B3sZoLnH3CS SnZ3MSaAaUE1yGII90v6daIkcIcP5tk= X-Google-Smtp-Source: ABdhPJyRGqtcz14hNDMz/oTA1rWztVwZ8plyh2p9w8WAXDJRLDuilxU1WIfgEp4Z4Y8huU8qf2XLOg== X-Received: by 2002:a05:600c:3641:: with SMTP id y1mr2701686wmq.53.1643281844357; Thu, 27 Jan 2022 03:10:44 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 06/14] exec/cpu: Make host pages variables / macros 'target agnostic' Date: Thu, 27 Jan 2022 12:10:29 +0100 Message-Id: <20220127111037.457901-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220127111037.457901-1-pbonzini@redhat.com> References: <20220127111037.457901-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32f (failed) 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=2a00:1450:4864:20::32f; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643282486465100001 From: Philippe Mathieu-Daud=C3=A9 "host" pages are related to the *host* not the *target*, thus the qemu_host_page_size / qemu_host_page_mask variables and the HOST_PAGE_ALIGN() / REAL_HOST_PAGE_ALIGN() macros can be moved to "exec/cpu-common.h" which is target agnostic. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Message-Id: <20220120000836.229419-1-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- include/exec/cpu-all.h | 9 --------- include/exec/cpu-common.h | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index bb37239efa..84caf5c3d9 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -234,15 +234,6 @@ extern const TargetPageBits target_page; =20 #define TARGET_PAGE_ALIGN(addr) ROUND_UP((addr), TARGET_PAGE_SIZE) =20 -/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even - * when intptr_t is 32-bit and we are aligning a long long. - */ -extern uintptr_t qemu_host_page_size; -extern intptr_t qemu_host_page_mask; - -#define HOST_PAGE_ALIGN(addr) ROUND_UP((addr), qemu_host_page_size) -#define REAL_HOST_PAGE_ALIGN(addr) ROUND_UP((addr), qemu_real_host_page_si= ze) - /* same as PROT_xxx */ #define PAGE_READ 0x0001 #define PAGE_WRITE 0x0002 diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 039d422bf4..de5f444b19 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -7,6 +7,15 @@ #include "exec/hwaddr.h" #endif =20 +/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even + * when intptr_t is 32-bit and we are aligning a long long. + */ +extern uintptr_t qemu_host_page_size; +extern intptr_t qemu_host_page_mask; + +#define HOST_PAGE_ALIGN(addr) ROUND_UP((addr), qemu_host_page_size) +#define REAL_HOST_PAGE_ALIGN(addr) ROUND_UP((addr), qemu_real_host_page_si= ze) + /* The CPU list lock nests outside page_(un)lock or mmap_(un)lock */ void qemu_init_cpu_list(void); void cpu_list_lock(void); --=20 2.34.1 From nobody Sat May 4 06:57:40 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643282372273249.68687964662718; Thu, 27 Jan 2022 03:19:32 -0800 (PST) Received: from localhost ([::1]:41896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD2oN-0007om-BY for importer@patchew.org; Thu, 27 Jan 2022 06:19:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD2fw-0006mg-NI for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:51 -0500 Received: from [2a00:1450:4864:20::336] (port=55176 helo=mail-wm1-x336.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD2fu-00068t-QC for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:48 -0500 Received: by mail-wm1-x336.google.com with SMTP id c192so1621632wma.4 for ; Thu, 27 Jan 2022 03:10:45 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s17sm1825742wrm.62.2022.01.27.03.10.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 03:10:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=COj2CSQH2YQg2JpQfJANqj/+hFRZ0YGw/IVDcI2ycQI=; b=KLHAnX8Zsr6Uz4X0uPrN0DspQBvlcXtwm0DkILSjDWYwDfA+a/5YM9keVGrs5pXOnO W2aNteRPemmWcNxJgTaLT3nXLh5WPnpsgtmG9HcmSklUuAZLFQFGkDt4qUjAi/YSFMW1 lLkMPhT+oKiOyJL/tX+IFEBbCLJcrrKeZ4V1Gda7o4Pj+6EXjaUzl5EQcGMfVOmtrZrU ZLUDVIiglz4CWx+n4YKBXszPE4llTfDGmG0GKraC0BBeDnldBwffBQpaongsO9NOayiN 38exRiXKfDdoB8nWZX9q5QH7+z4beQ/hYxdUEbnR6sg+i3mD30zT37iYKPjrr1DCyKTL nYNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=COj2CSQH2YQg2JpQfJANqj/+hFRZ0YGw/IVDcI2ycQI=; b=4l1GkhocYqxxvafzQkHklU+et7xb83BIkQMWb7M7icAk9EdF0Wp6HVypzfvHTmBbV3 iiEJQg7V4Y+lvMWAbb/6R9Arqf7S2xl8KOFD7QxtBRBAIWxB8l1kTycngGAzneG1ai8v 2uOwjg5W6Q/UrimXYHgPPhj1lhclDf+Q6AjBM/35GevmPh4vZ8cqlfL080jnhQYJuzI9 4cxqUMbOQ7jXRN61sjB90koqmYWVTxUhn1aHP36Zt4GXre+WjmZVY7FYEAtoTgFKljvv GKqYiSksZuy/wMzm3kWjq5ggSXw4e1B0RuOqCFL3/4UEoLtw+ANFsvk8Hv3bL598xNXq 4PEw== X-Gm-Message-State: AOAM531l2y5h4mStyTh/xWp6g6S5n6JSAj8gQ//n9DRUAcJnIzHbGzFe iHTvfdAuQEtOiEobEXBxe0yv2FTZ7U0= X-Google-Smtp-Source: ABdhPJzDG8q97TaeVpWg01ou99MesMAltMMd5HtfDL8SXbruf7LNPAUQ4BNw7/tjBhLvgzHve6m5Cw== X-Received: by 2002:a05:600c:2650:: with SMTP id 16mr2805819wmy.52.1643281844987; Thu, 27 Jan 2022 03:10:44 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/14] meson: Use find_program() to resolve the entitlement.sh script Date: Thu, 27 Jan 2022 12:10:30 +0100 Message-Id: <20220127111037.457901-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220127111037.457901-1-pbonzini@redhat.com> References: <20220127111037.457901-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::336 (failed) 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=2a00:1450:4864:20::336; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x336.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Akihiko Odaki Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643282374056100001 From: Philippe Mathieu-Daud=C3=A9 via Using ../configure without any particular option generates 31 targets on Darwin, and meson search for the entitlement.sh script 31 times: Program nm found: YES Program scripts/undefsym.py found: YES (/opt/homebrew/opt/python@3.9/bin/= python3.9 /Code/qemu/scripts/undefsym.py) Program scripts/feature_to_c.sh found: YES (/bin/sh /Code/qemu/scripts/fe= ature_to_c.sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement= .sh) Configuring 50-edk2-i386-secure.json using configuration Configuring 50-edk2-x86_64-secure.json using configuration Use find_program() which seems to cache the script path once found. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Akihiko Odaki Reviewed-by: Richard Henderson Message-Id: <20220122002052.83745-1-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- meson.build | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 4429fd2041..c69fbbd0cb 100644 --- a/meson.build +++ b/meson.build @@ -3052,17 +3052,14 @@ foreach target : target_dirs install_input +=3D meson.current_source_dir() / entitlements endif =20 + entitlement =3D find_program('scripts/entitlement.sh') emulators +=3D {exe['name'] : custom_target(exe['name'], input: build_input, output: exe['name'], - command: [ - files('scripts/entitlement.sh'), - '@OUTPUT@', - '@INPUT@' - ]) + command: [entitlement, '@OUTPUT@', '@INPUT@']) } =20 - meson.add_install_script('scripts/entitlement.sh', '--install', + meson.add_install_script(entitlement, '--install', get_option('bindir') / exe['name'], install_input) else --=20 2.34.1 From nobody Sat May 4 06:57:40 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 164328275235793.37959998929341; Thu, 27 Jan 2022 03:25:52 -0800 (PST) Received: from localhost ([::1]:54288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD2uV-00080R-Do for importer@patchew.org; Thu, 27 Jan 2022 06:25:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD2fy-0006mj-K7 for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:51 -0500 Received: from [2a00:1450:4864:20::430] (port=39624 helo=mail-wr1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD2fu-000696-Sz for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:48 -0500 Received: by mail-wr1-x430.google.com with SMTP id s9so4072391wrb.6 for ; Thu, 27 Jan 2022 03:10:46 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s17sm1825742wrm.62.2022.01.27.03.10.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 03:10:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hPO4TufcfjhpALVJpQIo88mGXcGGnW5eY9HmLHccuZQ=; b=SFTy3V/C77+C6LgfFDMjbMeGMsU2IGCkl3KDQsZpUZMYhLop0zy71sOrm/SW5fyQQU VdHYRmFEkB/L3jW49INxey7q2+q2+HGKdjm4KWDX9b0KUWQGkFvz80xFxdVBkUsuVn/v kleWwRca2MphUFB3G/XZccfz3/SiUg3Nhn6SWbfahvWjuYq42S5IRQY87Iufe/XQc4Vt KTC3erwQGnBZw/PDmLUsicYMiR8Yyb24a/WsQK7qn9B6sR8xRhxNGUTN6qQEsXgKsHhR T+zjZFEGVU3OQp3JqYtUa2vPjiRMWrv0grukpMBcBQpg92quT3Dh47//pAJy6bUfdM54 QgTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hPO4TufcfjhpALVJpQIo88mGXcGGnW5eY9HmLHccuZQ=; b=myq0+Gr0F8L2t0TffJP7BmR+5+RAvsVRzc2p65P21IOmR5CZkNj6WuQ/U5lc5hkuZO 9uwrb6TutbSw1eRbVFTq/QhF9Xugpq0GAy06eMbedAZZaprAIIiv6C8pmHP68FY4JhdQ 6EkU+6QzAi0fuJEw0Ej1IKH9gJIVcSAoR/l0jbgy/gWgwhsC59p6FbdANXwyVsTOv4zw CtfNyGl0ogR+1fQSgXm65Ow5WcdMKI2SqklR7mdQo1zRqq5dKX28v2VitZWUTEwzHD8S 1zcYTdysLrVKMH41lLThJgD3mfY6Ys3jKOyl4dEVi8gF1Rgdoxmm6OqCQ9wLZ3vDfj52 VmCg== X-Gm-Message-State: AOAM531WmcQzh77+qCRDElNsW1cYvECEmgMdET0pOQazc1NCcuMq9oHg X/LtwzwvyiPKskEcNCaF+fgQoJy2c7Y= X-Google-Smtp-Source: ABdhPJwGbHX5QHCLFuX05zpn9gn1y9sCOauf+1WsEU6gI964CJ3sSmEC+KhBjFA7QLHqJkvKM8fyTA== X-Received: by 2002:a5d:438a:: with SMTP id i10mr2583084wrq.425.1643281845644; Thu, 27 Jan 2022 03:10:45 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/14] check-block.sh: passthrough -jN flag of make to -j N flag of check Date: Thu, 27 Jan 2022 12:10:31 +0100 Message-Id: <20220127111037.457901-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220127111037.457901-1-pbonzini@redhat.com> References: <20220127111037.457901-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::430 (failed) 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=2a00:1450:4864:20::430; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x430.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladimir Sementsov-Ogievskiy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643282755222100001 Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy This improves performance of running iotests during "make -jN check". Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20211223183933.1497037-1-vsementsov@virtuozzo.com> Signed-off-by: Paolo Bonzini --- tests/check-block.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/check-block.sh b/tests/check-block.sh index f86cb863de..d98d49ad63 100755 --- a/tests/check-block.sh +++ b/tests/check-block.sh @@ -74,10 +74,17 @@ cd tests/qemu-iotests # QEMU_CHECK_BLOCK_AUTO is used to disable some unstable sub-tests export QEMU_CHECK_BLOCK_AUTO=3D1 export PYTHONUTF8=3D1 +# If make was called with -jN we want to call ./check with -j N. Extract t= he +# flag from MAKEFLAGS, so that if it absent (or MAKEFLAGS is not defined),= JOBS +# would be an empty line otherwise JOBS is prepared string of flag with va= lue: +# "-j N" +# Note, that the following works even if make was called with "-j N" or ev= en +# "--jobs N", as all these variants becomes simply "-jN" in MAKEFLAGS vari= able. +JOBS=3D$(echo "$MAKEFLAGS" | sed -n 's/\(^\|.* \)-j\([0-9]\+\)\( .*\|$\)/-= j \2/p') =20 ret=3D0 for fmt in $format_list ; do - ${PYTHON} ./check -makecheck -$fmt $group || ret=3D1 + ${PYTHON} ./check $JOBS -makecheck -$fmt $group || ret=3D1 done =20 exit $ret --=20 2.34.1 From nobody Sat May 4 06:57:40 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643282683207859.2664471219907; Thu, 27 Jan 2022 03:24:43 -0800 (PST) Received: from localhost ([::1]:53236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD2tO-0007IK-4Z for importer@patchew.org; Thu, 27 Jan 2022 06:24:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD2fy-0006ml-Lb for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:53 -0500 Received: from [2a00:1450:4864:20::332] (port=41979 helo=mail-wm1-x332.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD2fv-00069I-Iv for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:48 -0500 Received: by mail-wm1-x332.google.com with SMTP id q141-20020a1ca793000000b00347b48dfb53so1640462wme.0 for ; Thu, 27 Jan 2022 03:10:47 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s17sm1825742wrm.62.2022.01.27.03.10.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 03:10:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7qgRepnTuh1VaS7uEEW1RDvXztJIS2RU+qpAvNhpbPs=; b=VkTur3y53E2tIeE9ExNwihvsCR5AEU8xKsu88m3N06knF+0hU6eBI6NqRDLxE3Dn2E +kbUzRGs2jTBjLa6jeAAW+CAbBnWT/0W5cYklAZcI4KF7J1Wd175SbQCH8YFfCNc4BCk ab9VdwKogPWbr9+Qc2oubvUrHnHVvGM+ttnU+E9KxWIeVklBJW6ff/Ps3f/o0rxzWMSt Yw8X//jM5cF/uy8OyD8e7y5ZwJTC/36i3xwqDmyHMuCY7taTfVR3hJtRou1tYJPlkrzx z0cXGHlN0n6mwIJIGQsEmSSywEh3d9IWSlIXRfAdTzgmRxZuUSnBKaWoyNj30sGYuokT AZAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7qgRepnTuh1VaS7uEEW1RDvXztJIS2RU+qpAvNhpbPs=; b=Aul7yV/L7b7zj2mTZOjBzm4yv/JNmYJzlZN+AGTZhn6JGw83ZZ4llen8XRQHCx/6ge mtTOd/7/c3WiOFGCW5s4XE15M00v6DrX9b9PYHnfNVO24FjV/sA909SeTjgOTnJkWGOu MgtGIXUcfif6qmCvMW8vI5zhzTO0KUYwqHEyJTyLd7HCIWX1TZVsRzcq3OIEYFuKPHbA rbU3Xt6RDo4X83cv1BB9QCdJybJn63XEzEb0SlCOF8747/xolhnE1oqG+o0+ZN9fkyS3 aNtsaj7kGtxtvO/aWbdSOwCtesVLh1cIuD46vc4yOqGV/K2UOsl5FojVgR5t+hNh4ecr uu3g== X-Gm-Message-State: AOAM53164odIX94K++wWbQvr972vhkj9ab+VEWSOsC+I+TPEt4Q/PP3y kyZ1RoYkAdHu9SmnJjllNLsBGHYSCDM= X-Google-Smtp-Source: ABdhPJx6pgrr88ol5B3iSvJR1skMPWjj/LUvyPjGiq5JkSAqQ3y8A8gpgMB1VHFlOZ7Qn1zhZnQkAA== X-Received: by 2002:a1c:a302:: with SMTP id m2mr2833719wme.84.1643281846210; Thu, 27 Jan 2022 03:10:46 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/14] scripts/mtest2make: add support for SPEED=thorough Date: Thu, 27 Jan 2022 12:10:32 +0100 Message-Id: <20220127111037.457901-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220127111037.457901-1-pbonzini@redhat.com> References: <20220127111037.457901-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::332 (failed) 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=2a00:1450:4864:20::332; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x332.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643282685847100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- meson.build | 5 +++-- scripts/mtest2make.py | 10 +++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index c69fbbd0cb..f3f7b9c191 100644 --- a/meson.build +++ b/meson.build @@ -3,8 +3,9 @@ project('qemu', ['c'], meson_version: '>=3D0.58.2', 'b_staticpic=3Dfalse', 'stdsplit=3Dfalse'], version: files('VERSION')) =20 -add_test_setup('quick', exclude_suites: 'slow', is_default: true) -add_test_setup('slow', env: ['G_TEST_SLOW=3D1', 'SPEED=3Dslow']) +add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: = true) +add_test_setup('slow', exclude_suites: ['thorough'], env: ['G_TEST_SLOW=3D= 1', 'SPEED=3Dslow']) +add_test_setup('thorough', env: ['G_TEST_SLOW=3D1', 'SPEED=3Dthorough']) =20 not_found =3D dependency('', required: false) keyval =3D import('keyval') diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 7067bdadf5..4b9c561b30 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -23,8 +23,9 @@ def names(self, base): print(''' SPEED =3D quick =20 -.speed.quick =3D $(foreach s,$(sort $(filter-out %-slow, $1)), --suite $s) -.speed.slow =3D $(foreach s,$(sort $1), --suite $s) +.speed.quick =3D $(foreach s,$(sort $(filter-out %-slow %-thorough, $1)), = --suite $s) +.speed.slow =3D $(foreach s,$(sort $(filter-out %-thorough, $1)), --suite = $s) +.speed.thorough =3D $(foreach s,$(sort $1), --suite $s) =20 .mtestargs =3D --no-rebuild -t 0 ifneq ($(SPEED), quick) @@ -52,11 +53,14 @@ def process_tests(test, targets, suites): for s in test_suites: # The suite name in the introspection info is "PROJECT:SUITE" s =3D s.split(':')[1] - if s =3D=3D 'slow': + if s =3D=3D 'slow' or s =3D=3D 'thorough': continue if s.endswith('-slow'): s =3D s[:-5] suites[s].speeds.append('slow') + if s.endswith('-thorough'): + s =3D s[:-9] + suites[s].speeds.append('thorough') suites[s].deps.update(deps) =20 def emit_prolog(suites, prefix): --=20 2.34.1 From nobody Sat May 4 06:57:40 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16432826265961019.0068280932119; Thu, 27 Jan 2022 03:23:46 -0800 (PST) Received: from localhost ([::1]:50544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD2sS-0005VK-73 for importer@patchew.org; Thu, 27 Jan 2022 06:23:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD2fy-0006mk-LO for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:53 -0500 Received: from [2a00:1450:4864:20::32f] (port=39461 helo=mail-wm1-x32f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD2fw-00069Y-Dp for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:49 -0500 Received: by mail-wm1-x32f.google.com with SMTP id o1-20020a1c4d01000000b0034d95625e1fso5627564wmh.4 for ; Thu, 27 Jan 2022 03:10:48 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s17sm1825742wrm.62.2022.01.27.03.10.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 03:10:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xv1Oqk8NywqMuugLo+bAn98NB59rQNvLmZjOgpaOoh0=; b=JmCYeru9JGPdXGssTebyQx333zKhTlL9y5dQW1P5gCFIMtwcG5vojrP5muCFCbmh0z UY71+zu1FVyVrZNu+NUEjqvW5GxthTF5uOovriOrrVkp3YTLi3V4gR8v0Oo+UqLqJZTT e/IEor8iYzje3XqHeKExS3HTZ79VZjXun+5SoujiEWUBRirFhOxirAStSnB/oKZCQB4Y YmbUcpX6u6PTib+cDcBOfWpj5ft+jWZ8gcTIB+BneyTqUJ+vUAq5ixB6KNGOqARVjiG9 7IqBZmwCU4dqEFBsNfXandaQkZissHUxC0tbVGETztLaUBysKLC40asx8DxkT9byqj4f IQIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Xv1Oqk8NywqMuugLo+bAn98NB59rQNvLmZjOgpaOoh0=; b=z3yZfFysJi092sm8jDgIz+GkH/jjjRZTqsTxlpDqRK0JSJ3PYPoOIqXkTIhcxktV00 0m4DUm4WhX1H1JxXwQHV2paNlKtvi8OndQgaNtWN4LojbkqvLwYCvzxgiHGqIcy5cUAk nM75JGJFpy5bwAHligx+V0XlGovTC1B2tq6iJbS1JljmWy6v/5JcxufBI3/UPYDQyMoq OOMBN+ZL2mCJgUxWLOwYWkPaxW+kEvirKTJmZeni+GHhYrH6wERkCg7SsQ9Zs6qLpTR4 igeuzjKhtVgIjtCUCeAvWyKwHVq9j4IzvsLDOkJpftkNzrFRuHUILIQqMPXI3TqOAB/q n8PQ== X-Gm-Message-State: AOAM5335+yg5ejLrWj2KwmXYSOHP8a2XcneC9zeQUziXZzwiYjNd4bxT fV2N6YI1f7QFQ6KvOfeCa8gsAWWvlnI= X-Google-Smtp-Source: ABdhPJwb4GLv51vU8scbz61v1I+YRTGZ/ZXv01br2IG1TRkGBQlYmmRq0A0BmPmOSUTG1hCsSAA6VA== X-Received: by 2002:a05:600c:4112:: with SMTP id j18mr11491717wmi.72.1643281847108; Thu, 27 Jan 2022 03:10:47 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/14] build: make check-block a meson test Date: Thu, 27 Jan 2022 12:10:33 +0100 Message-Id: <20220127111037.457901-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220127111037.457901-1-pbonzini@redhat.com> References: <20220127111037.457901-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32f (failed) 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=2a00:1450:4864:20::32f; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643282628247100001 Content-Type: text/plain; charset="utf-8" "meson test" can be asked to run tests verbosely; this makes it usable also for qemu-iotests's own harness, and it lets "make check-block" reuse mtest2make.py's infrastructure to find and build test dependencies. Adjust check-block.sh to use the standard exit code that reports a test as skipped. Alternatively, in the future we could make it produce TAP output, which is consistent with all other "make check" tests. Signed-off-by: Paolo Bonzini --- meson.build | 6 +++--- scripts/mtest2make.py | 10 +++++++++- tests/Makefile.include | 16 +++------------- tests/check-block.sh | 28 +++++++++++++--------------- tests/meson.build | 1 + tests/qemu-iotests/meson.build | 29 +++++++++++++++++++++++++++++ 6 files changed, 58 insertions(+), 32 deletions(-) create mode 100644 tests/qemu-iotests/meson.build diff --git a/meson.build b/meson.build index f3f7b9c191..f025623bab 100644 --- a/meson.build +++ b/meson.build @@ -3,9 +3,9 @@ project('qemu', ['c'], meson_version: '>=3D0.58.2', 'b_staticpic=3Dfalse', 'stdsplit=3Dfalse'], version: files('VERSION')) =20 -add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: = true) -add_test_setup('slow', exclude_suites: ['thorough'], env: ['G_TEST_SLOW=3D= 1', 'SPEED=3Dslow']) -add_test_setup('thorough', env: ['G_TEST_SLOW=3D1', 'SPEED=3Dthorough']) +add_test_setup('quick', exclude_suites: ['block', 'slow', 'thorough'], is_= default: true) +add_test_setup('slow', exclude_suites: ['block', 'thorough'], env: ['G_TES= T_SLOW=3D1', 'SPEED=3Dslow']) +add_test_setup('thorough', exclude_suites: ['block'], env: ['G_TEST_SLOW= =3D1', 'SPEED=3Dthorough']) =20 not_found =3D dependency('', required: false) keyval =3D import('keyval') diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 4b9c561b30..4d542e8aaa 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -79,7 +79,7 @@ def emit_prolog(suites, prefix): print(f'{prefix}-report.junit.xml $(all-{prefix}-xml): {prefix}-report= %.junit.xml: run-ninja') print(f'\t$(MAKE) {prefix}$* MTESTARGS=3D"$(MTESTARGS) --logbase {pref= ix}-report$*" && ln -f meson-logs/$@ .') =20 -def emit_suite(name, suite, prefix): +def emit_suite_deps(name, suite, prefix): deps =3D ' '.join(suite.deps) targets =3D f'{prefix}-{name} {prefix}-report-{name}.junit.xml {prefix= } {prefix}-report.junit.xml' print() @@ -87,6 +87,10 @@ def emit_suite(name, suite, prefix): print(f'ifneq ($(filter {prefix}-build {targets}, $(MAKECMDGOALS)),)') print(f'.{prefix}.build-suites +=3D {name}') print(f'endif') + +def emit_suite(name, suite, prefix): + emit_suite_deps(name, suite, prefix) + targets =3D f'{prefix}-{name} {prefix}-report-{name}.junit.xml {prefix= } {prefix}-report.junit.xml' print(f'ifneq ($(filter {targets}, $(MAKECMDGOALS)),)') print(f'.{prefix}.mtest-suites +=3D ' + ' '.join(suite.names(name))) print(f'endif') @@ -97,6 +101,10 @@ def emit_suite(name, suite, prefix): testsuites =3D defaultdict(Suite) for test in introspect['tests']: process_tests(test, targets, testsuites) +# HACK: check-block is a separate target so that it runs with --verbose; +# only write the dependencies +emit_suite_deps('block', testsuites['block'], 'check') +del testsuites['block'] emit_prolog(testsuites, 'check') for name, suite in testsuites.items(): emit_suite(name, suite, 'check') diff --git a/tests/Makefile.include b/tests/Makefile.include index 3aba622400..9157a57b1a 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -156,19 +156,9 @@ check: =20 ifeq ($(CONFIG_TOOLS)$(CONFIG_POSIX),yy) check: check-block -export PYTHON - -ifneq ($(filter check check-block check-build, $(MAKECMDGOALS)),) -ninja-cmd-goals +=3D \ - qemu-img$(EXESUF) \ - qemu-io$(EXESUF) \ - qemu-nbd$(EXESUF) \ - storage-daemon/qemu-storage-daemon$(EXESUF) \ - $(filter qemu-system-%, $(ninja-targets)) -endif - -check-block: $(SRC_PATH)/tests/check-block.sh run-ninja - @$< +check-block: run-ninja + $(if $(MAKE.n),,+)$(MESON) test $(MTESTARGS) $(.mtestargs) --verbose \ + --logbase iotestslog $(call .speed.$(SPEED), block block-slow block-thor= ough) endif =20 check-build: run-ninja diff --git a/tests/check-block.sh b/tests/check-block.sh index d98d49ad63..9afeea5275 100755 --- a/tests/check-block.sh +++ b/tests/check-block.sh @@ -1,6 +1,6 @@ #!/bin/sh =20 -# Honor the SPEED environment variable, just like we do it for the qtests. +# Honor the SPEED environment variable, just like we do it for "meson test" if [ "$SPEED" =3D "slow" ]; then format_list=3D"raw qcow2" group=3D @@ -16,9 +16,13 @@ if [ "$#" -ne 0 ]; then format_list=3D"$@" fi =20 +skip() { + echo "$*" + exit 77 +} + if grep -q "CONFIG_GPROF=3Dy" config-host.mak 2>/dev/null ; then - echo "GPROF is enabled =3D=3D> Not running the qemu-iotests." - exit 0 + skip "GPROF is enabled =3D=3D> Not running the qemu-iotests." fi =20 # Disable tests with any sanitizer except for specific ones @@ -36,36 +40,30 @@ for j in ${ALLOWED_SANITIZE_FLAGS}; do done if echo ${SANITIZE_FLAGS} | grep -q "\-fsanitize" 2>/dev/null; then # Have a sanitize flag that is not allowed, stop - echo "Sanitizers are enabled =3D=3D> Not running the qemu-iotests." - exit 0 + skip "Sanitizers are enabled =3D=3D> Not running the qemu-iotests." fi =20 if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then - echo "No qemu-system binary available =3D=3D> Not running the qemu-iot= ests." - exit 0 + skip "No qemu-system binary available =3D=3D> Not running the qemu-iot= ests." fi =20 if ! command -v bash >/dev/null 2>&1 ; then - echo "bash not available =3D=3D> Not running the qemu-iotests." - exit 0 + skip "bash not available =3D=3D> Not running the qemu-iotests." fi =20 if LANG=3DC bash --version | grep -q 'GNU bash, version [123]' ; then - echo "bash version too old =3D=3D> Not running the qemu-iotests." - exit 0 + skip "bash version too old =3D=3D> Not running the qemu-iotests." fi =20 if ! (sed --version | grep 'GNU sed') > /dev/null 2>&1 ; then if ! command -v gsed >/dev/null 2>&1; then - echo "GNU sed not available =3D=3D> Not running the qemu-iotests." - exit 0 + skip "GNU sed not available =3D=3D> Not running the qemu-iotests." fi else # Double-check that we're not using BusyBox' sed which says # that "This is not GNU sed version 4.0" ... if sed --version | grep -q 'not GNU sed' ; then - echo "BusyBox sed not supported =3D=3D> Not running the qemu-iotes= ts." - exit 0 + skip "BusyBox sed not supported =3D=3D> Not running the qemu-iotes= ts." fi fi =20 diff --git a/tests/meson.build b/tests/meson.build index 3f3882748a..d5e168d714 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,6 +1,7 @@ py3 =3D import('python').find_installation() =20 subdir('bench') +subdir('qemu-iotests') =20 test_qapi_outputs =3D [ 'qapi-builtin-types.c', diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build new file mode 100644 index 0000000000..3a9425d15c --- /dev/null +++ b/tests/qemu-iotests/meson.build @@ -0,0 +1,29 @@ +if have_tools and targetos !=3D 'windows' + qemu_iotests_binaries =3D [qemu_img, qemu_io, qemu_nbd, qsd] + qemu_iotests_env =3D {'PYTHON': python.full_path()} + qemu_iotests_formats =3D { + 'qcow2': 'quick', + 'raw': 'slow', + 'qed': 'thorough', + 'vmdk': 'thorough', + 'vpc': 'thorough' + } + + foreach k, v : emulators + if k.startswith('qemu-system-') + qemu_iotests_binaries +=3D v + endif + endforeach + foreach format, speed: qemu_iotests_formats + if speed =3D=3D 'quick' + suites =3D 'block' + else + suites =3D ['block-' + speed, speed] + endif + test('qemu-iotests ' + format, sh, args: [files('../check-block.sh'), = format], + depends: qemu_iotests_binaries, env: qemu_iotests_env, + suite: suites, + timeout: 0, + is_parallel: false) + endforeach +endif --=20 2.34.1 From nobody Sat May 4 06:57:40 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643283179718750.3041100606071; Thu, 27 Jan 2022 03:32:59 -0800 (PST) Received: from localhost ([::1]:33606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD31O-0004nM-N8 for importer@patchew.org; Thu, 27 Jan 2022 06:32:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD2fz-0006mz-RG for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:54 -0500 Received: from [2a00:1450:4864:20::42a] (port=45767 helo=mail-wr1-x42a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD2fy-00069h-6y for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:51 -0500 Received: by mail-wr1-x42a.google.com with SMTP id m14so3835262wrg.12 for ; Thu, 27 Jan 2022 03:10:48 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s17sm1825742wrm.62.2022.01.27.03.10.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 03:10:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ttURzTalLkLajQUhATr7fk42UhO1pdqdls5RkRt15E4=; b=Q4v0kRAbAbFziQiLU5C9pT819EYpA2icEWmA072ofrw4f3KL0BDymaEDsVHdv/GjzC BNjydgYz9kC8/HxaXzIf9TJaJnBHXkUO+Pl3TlMAlUVPAnLn/25HbYJ0NXHZVKdymqbq nTG5YGhWWEQb5115qMfaNkDQ+b+7bUfOjpAROBs+Tl5fiLL0ns8ETwBjRwFowmWj7Mh8 rP/m4ZvmrArSrGQOAjWCbYhf/9/tUW5FQJrURO/9ikUwrIU7+RBVEi6Z7y1lcBPei/eG eK3isA2cdcWR6/tWRSzUl+JdSDwMQzW+60CKsQKZ9MQq7WkZDOseNFM0q0RY8WO3Kps2 EKFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ttURzTalLkLajQUhATr7fk42UhO1pdqdls5RkRt15E4=; b=mrxEH7lo+OBYedD2cigNsSo0iwTWd+ZxSwH2skcowzBddDGvq82Jg+umxp4inNb6jm E0LtGYUD1v0ZXb4FLo97YkrMcTzj03tpuqEBmM010242I69nckukC/atgMwiMaH8dXoA PHcXLTfS1VR/VNZcqq4gemSLsNkhk1+z8k+s7uzBBPjireXf6gIPuq/8Yeosu6iGP0oS EmT+VxATnDc/c7tEELKFx7fTvt+LlxNl59RnDW53dNl4gxxIV0dNyRqyr95JB0YKSeMJ mwzFpwAhbabGfz3uuoMJG8u/6c74i2JvWDfBSB/8TLCMOFeGDlhbR1rfLmMle75Z2pl1 otXw== X-Gm-Message-State: AOAM533SJbM2jeBBJCqQDRWW+pWHQyOUD9HXUpwHJjf1hYoiaTuIw/Hp dYiiRudC3WBYzop2CoIK5WXz39Nnrrw= X-Google-Smtp-Source: ABdhPJwRNaEh3xm9MoJakuUgp0CjlJP0naWCohKAD9QxnY7L+JSUxSUQY8KRF47RuQxP8Jvh0z7B+w== X-Received: by 2002:a5d:5552:: with SMTP id g18mr2648578wrw.343.1643281847672; Thu, 27 Jan 2022 03:10:47 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/14] qemu-iotests: require at least an argument to check-block.sh Date: Thu, 27 Jan 2022 12:10:34 +0100 Message-Id: <20220127111037.457901-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220127111037.457901-1-pbonzini@redhat.com> References: <20220127111037.457901-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42a (failed) 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=2a00:1450:4864:20::42a; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643283183202100001 Content-Type: text/plain; charset="utf-8" This is anyway how check-block.sh is used in practice, and by removing the list of formats in the script we avoid duplication between meson.build and check-block.sh. Signed-off-by: Paolo Bonzini --- tests/check-block.sh | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tests/check-block.sh b/tests/check-block.sh index 9afeea5275..88e02453d2 100755 --- a/tests/check-block.sh +++ b/tests/check-block.sh @@ -1,19 +1,16 @@ #!/bin/sh =20 -# Honor the SPEED environment variable, just like we do it for "meson test" -if [ "$SPEED" =3D "slow" ]; then - format_list=3D"raw qcow2" - group=3D -elif [ "$SPEED" =3D "thorough" ]; then - format_list=3D"raw qcow2 qed vmdk vpc" - group=3D -else - format_list=3Dqcow2 - group=3D"-g auto" +if [ "$#" -eq 0 ]; then + echo "Usage: $0 fmt..." >&2 + exit 99 fi =20 -if [ "$#" -ne 0 ]; then - format_list=3D"$@" +# Honor the SPEED environment variable, just like we do it for "meson test" +format_list=3D"$@" +if [ "$SPEED" =3D "slow" ] || [ "$SPEED" =3D "thorough" ]; then + group=3D +else + group=3D"-g auto" fi =20 skip() { --=20 2.34.1 From nobody Sat May 4 06:57:40 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16432835332331022.298195900838; Thu, 27 Jan 2022 03:38:53 -0800 (PST) Received: from localhost ([::1]:42252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD376-0002XI-9X for importer@patchew.org; Thu, 27 Jan 2022 06:38:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39100) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD2g0-0006n0-4j for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:54 -0500 Received: from [2a00:1450:4864:20::42f] (port=42571 helo=mail-wr1-x42f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD2fy-00069w-C2 for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:51 -0500 Received: by mail-wr1-x42f.google.com with SMTP id a13so4045425wrh.9 for ; Thu, 27 Jan 2022 03:10:49 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s17sm1825742wrm.62.2022.01.27.03.10.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 03:10:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=47+Hg08W08lvJhFqSm9WCHIri+3t5fJ55l1Mgn9PMQs=; b=d6avR+QQUEL8BmySEplw/Gqp5Qa7Iqi8LHcJMO91oEYcFTK6mQiaBGR1q+8No7TZgN BEhp75x/zEpMEQe+wc7D2mrJXsPVU7NaZ3r3vCp1Sq7YDxt2W6LlkE/ld2N4ACrJoZoZ hmfYeffIrL+j4wWnTD9ETUmlMb7zk0jbm2a1Av7UveitAESjlBHnf2bJgqQhrZeUTqt2 LQf4/NiT1syC6+MVac07/GmHHXBpFKd+Unmq16qRyRKhNK0+0Rl3sk0+ePjFlAA0BwTP nZavDUXp0gy8laG2av2wJmExQR6ZqXvcdQzAfDlnrLMreY6OjdafsZrI3H+Lrjs9sipl Ftxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=47+Hg08W08lvJhFqSm9WCHIri+3t5fJ55l1Mgn9PMQs=; b=TQVrPEoEVVDplilFiJVOrVYwJ2qmmmXttUR+VIvGerL0LMSyP/C+81+vCsYvTeg7Gv huMW5TTfcAsrVZZdR9lhsxpUBbrdGsMMRuXYqPhPqKVHGD7rjHR9gZhoT/FcwkCqjq7A /OLsub0e2zr4bU3Ui6wQOLYAmMJX4+EaStQ/0EY80O2inR2nMERuFs71Z986UdGAvouC octzUiWVpRCVQO1L9E8W+I84DCHvYsFirHCivXJrpYU1FI48OppFbPycMmWGQEKMbLpS ns2H+oePjVuVnv7JGNJ9o5YQbEywpx/yqNDwfOHi3+AkntkzjCVNXbmm9G9HIQNbB0AE dGpw== X-Gm-Message-State: AOAM533QRNTwbEPY4FcU+Fxcq3CbdXU438IoLZhUIrpXgxDEaseZShia w2UGHXMzl8Mg3rNy5QHDiJhRKCcpv4c= X-Google-Smtp-Source: ABdhPJxWsFzC+10tPD6Qp4TtPKh6GOyl5Kj699LzQtwyl1LA2F3U+MAjG4s80Ej+s2iPm3I9SOU5Pg== X-Received: by 2002:a5d:64c1:: with SMTP id f1mr496990wri.5.1643281848259; Thu, 27 Jan 2022 03:10:48 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/14] check-block: replace -makecheck with TAP output Date: Thu, 27 Jan 2022 12:10:35 +0100 Message-Id: <20220127111037.457901-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220127111037.457901-1-pbonzini@redhat.com> References: <20220127111037.457901-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42f (failed) 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=2a00:1450:4864:20::42f; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643283536016100001 Content-Type: text/plain; charset="utf-8" Let "meson test" take care of showing the results of the individual tests, consistently with other output from "make check V=3D1". Signed-off-by: Paolo Bonzini --- tests/check-block.sh | 6 ++-- tests/qemu-iotests/check | 6 ++-- tests/qemu-iotests/meson.build | 1 + tests/qemu-iotests/testenv.py | 30 +++++++++---------- tests/qemu-iotests/testrunner.py | 49 +++++++++++++++++--------------- 5 files changed, 48 insertions(+), 44 deletions(-) diff --git a/tests/check-block.sh b/tests/check-block.sh index 88e02453d2..720a46bc36 100755 --- a/tests/check-block.sh +++ b/tests/check-block.sh @@ -14,8 +14,8 @@ else fi =20 skip() { - echo "$*" - exit 77 + echo "1..0 #SKIP $*" + exit 0 } =20 if grep -q "CONFIG_GPROF=3Dy" config-host.mak 2>/dev/null ; then @@ -79,7 +79,7 @@ JOBS=3D$(echo "$MAKEFLAGS" | sed -n 's/\(^\|.* \)-j\([0-9= ]\+\)\( .*\|$\)/-j \2/p') =20 ret=3D0 for fmt in $format_list ; do - ${PYTHON} ./check $JOBS -makecheck -$fmt $group || ret=3D1 + ${PYTHON} ./check $JOBS -tap -$fmt $group || ret=3D1 done =20 exit $ret diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 0c27721a41..75de1b4691 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -32,8 +32,6 @@ def make_argparser() -> argparse.ArgumentParser: =20 p.add_argument('-n', '--dry-run', action=3D'store_true', help=3D'show me, do not run tests') - p.add_argument('-makecheck', action=3D'store_true', - help=3D'pretty print output for make check') p.add_argument('-j', dest=3D'jobs', type=3Dint, default=3D1, help=3D'run tests in multiple parallel jobs') =20 @@ -53,6 +51,8 @@ def make_argparser() -> argparse.ArgumentParser: p.add_argument('--color', choices=3D['on', 'off', 'auto'], default=3D'auto', help=3D"use terminal colors. The defa= ult " "'auto' value means use colors if terminal stdout detec= ted") + p.add_argument('-tap', action=3D'store_true', + help=3D'produce TAP output') =20 g_env =3D p.add_argument_group('test environment options') mg =3D g_env.add_mutually_exclusive_group() @@ -164,7 +164,7 @@ if __name__ =3D=3D '__main__': if args.dry_run: print('\n'.join(tests)) else: - with TestRunner(env, makecheck=3Dargs.makecheck, + with TestRunner(env, tap=3Dargs.tap, color=3Dargs.color) as tr: paths =3D [os.path.join(env.source_iotests, t) for t in tests] ok =3D tr.run_tests(paths, args.jobs) diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index 3a9425d15c..5be3c74127 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -22,6 +22,7 @@ if have_tools and targetos !=3D 'windows' endif test('qemu-iotests ' + format, sh, args: [files('../check-block.sh'), = format], depends: qemu_iotests_binaries, env: qemu_iotests_env, + protocol: 'tap', suite: suites, timeout: 0, is_parallel: false) diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py index c33454fa68..0f32897fe8 100644 --- a/tests/qemu-iotests/testenv.py +++ b/tests/qemu-iotests/testenv.py @@ -287,21 +287,21 @@ def __enter__(self) -> 'TestEnv': def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> N= one: self.close() =20 - def print_env(self) -> None: + def print_env(self, prefix: str =3D '') -> None: template =3D """\ -QEMU -- "{QEMU_PROG}" {QEMU_OPTIONS} -QEMU_IMG -- "{QEMU_IMG_PROG}" {QEMU_IMG_OPTIONS} -QEMU_IO -- "{QEMU_IO_PROG}" {QEMU_IO_OPTIONS} -QEMU_NBD -- "{QEMU_NBD_PROG}" {QEMU_NBD_OPTIONS} -IMGFMT -- {IMGFMT}{imgopts} -IMGPROTO -- {IMGPROTO} -PLATFORM -- {platform} -TEST_DIR -- {TEST_DIR} -SOCK_DIR -- {SOCK_DIR} -GDB_OPTIONS -- {GDB_OPTIONS} -VALGRIND_QEMU -- {VALGRIND_QEMU} -PRINT_QEMU_OUTPUT -- {PRINT_QEMU} -""" +{prefix}QEMU -- "{QEMU_PROG}" {QEMU_OPTIONS} +{prefix}QEMU_IMG -- "{QEMU_IMG_PROG}" {QEMU_IMG_OPTIONS} +{prefix}QEMU_IO -- "{QEMU_IO_PROG}" {QEMU_IO_OPTIONS} +{prefix}QEMU_NBD -- "{QEMU_NBD_PROG}" {QEMU_NBD_OPTIONS} +{prefix}IMGFMT -- {IMGFMT}{imgopts} +{prefix}IMGPROTO -- {IMGPROTO} +{prefix}PLATFORM -- {platform} +{prefix}TEST_DIR -- {TEST_DIR} +{prefix}SOCK_DIR -- {SOCK_DIR} +{prefix}GDB_OPTIONS -- {GDB_OPTIONS} +{prefix}VALGRIND_QEMU -- {VALGRIND_QEMU} +{prefix}PRINT_QEMU_OUTPUT -- {PRINT_QEMU} +{prefix}""" =20 args =3D collections.defaultdict(str, self.get_env()) =20 @@ -310,5 +310,5 @@ def print_env(self) -> None: =20 u =3D os.uname() args['platform'] =3D f'{u.sysname}/{u.machine} {u.nodename} {u.rel= ease}' - + args['prefix'] =3D prefix print(template.format_map(args)) diff --git a/tests/qemu-iotests/testrunner.py b/tests/qemu-iotests/testrunn= er.py index 15788f919e..0eace147b8 100644 --- a/tests/qemu-iotests/testrunner.py +++ b/tests/qemu-iotests/testrunner.py @@ -152,10 +152,10 @@ def run_tests_pool(self, tests: List[str], =20 return results =20 - def __init__(self, env: TestEnv, makecheck: bool =3D False, + def __init__(self, env: TestEnv, tap: bool =3D False, color: str =3D 'auto') -> None: self.env =3D env - self.makecheck =3D makecheck + self.tap =3D tap self.last_elapsed =3D LastElapsedTime('.last-elapsed-cache', env) =20 assert color in ('auto', 'on', 'off') @@ -185,13 +185,16 @@ def test_print_one_line(self, test: str, """ Print short test info before/after test run """ test =3D os.path.basename(test) =20 - if self.makecheck and status !=3D '...': - if status and status !=3D 'pass': - status =3D f' [{status}]' - else: - status =3D '' + if test_field_width is None: + test_field_width =3D 8 =20 - print(f' TEST iotest-{self.env.imgfmt}: {test}{status}') + if self.tap: + if status =3D=3D 'pass': + print(f'ok {self.env.imgfmt} {test}') + elif status =3D=3D 'fail': + print(f'not ok {self.env.imgfmt} {test}') + elif status =3D=3D 'not run': + print(f'ok {self.env.imgfmt} {test} # SKIP') return =20 if lasttime: @@ -343,7 +346,7 @@ def run_test(self, test: str, last_el =3D self.last_elapsed.get(test) start =3D datetime.datetime.now().strftime('%H:%M:%S') =20 - if not self.makecheck: + if not self.tap: self.test_print_one_line(test=3Dtest, test_field_width=3Dtest_field_width, status =3D 'started' if mp else '...', @@ -372,7 +375,9 @@ def run_tests(self, tests: List[str], jobs: int =3D 1) = -> bool: notrun =3D [] casenotrun =3D [] =20 - if not self.makecheck: + if self.tap: + self.env.print_env('# ') + else: self.env.print_env() =20 test_field_width =3D max(len(os.path.basename(t)) for t in tests) = + 2 @@ -398,8 +403,6 @@ def run_tests(self, tests: List[str], jobs: int =3D 1) = -> bool: =20 if res.status =3D=3D 'fail': failed.append(name) - if self.makecheck: - self.env.print_env() if res.diff: print('\n'.join(res.diff)) elif res.status =3D=3D 'not run': @@ -412,16 +415,16 @@ def run_tests(self, tests: List[str], jobs: int =3D 1= ) -> bool: if res.interrupted: break =20 - if notrun: - print('Not run:', ' '.join(notrun)) + if not self.tap: + if notrun: + print('Not run:', ' '.join(notrun)) =20 - if casenotrun: - print('Some cases not run in:', ' '.join(casenotrun)) + if casenotrun: + print('Some cases not run in:', ' '.join(casenotrun)) =20 - if failed: - print('Failures:', ' '.join(failed)) - print(f'Failed {len(failed)} of {n_run} iotests') - return False - else: - print(f'Passed all {n_run} iotests') - return True + if failed: + print('Failures:', ' '.join(failed)) + print(f'Failed {len(failed)} of {n_run} iotests') + else: + print(f'Passed all {n_run} iotests') + return not failed --=20 2.34.1 From nobody Sat May 4 06:57:40 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643283276207821.4759987004339; Thu, 27 Jan 2022 03:34:36 -0800 (PST) Received: from localhost ([::1]:34722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD32x-0005Wj-Cu for importer@patchew.org; Thu, 27 Jan 2022 06:34:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD2g1-0006n2-Na for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:54 -0500 Received: from [2a00:1450:4864:20::332] (port=45816 helo=mail-wm1-x332.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD2fy-0006A0-CC for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:53 -0500 Received: by mail-wm1-x332.google.com with SMTP id j5-20020a05600c1c0500b0034d2e956aadso1603734wms.4 for ; Thu, 27 Jan 2022 03:10:49 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s17sm1825742wrm.62.2022.01.27.03.10.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 03:10:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i0MOTcOI0zXzL/XH9A/zmnk1FBFcFXsythCRvvyOsx4=; b=VZ8mt7nI+UA7b06GBP+/vnRsQ9zJ6mzceNeqnrMfTL74AjFpuuZH0x+RT9q9qx1/6q 5m9yQ9gakXBsCTI5BHPa/Z7YVUaMIlSc3EQthakw6aW98ai6/0sMfqGwRKyizN81RYmL 7MjGphUCxkrC/iiJAv4lwa/AYH7x1AfB5z1bPpnydyci1XFQzHNdUuLo9vE+BFgw4l7c QcJLBdG5JJOYQnYGQV0IL2UyhkQM0tpD8VeS1EPKHZe19LPdKsRwV+myHIp5OSJUOJSQ yg/+1gSdMkdRpOS7N1Uec+SZo0cbjHQ2287/aBcHkagNMR0vW+xenFH+3hOV0Nte5IgJ pkDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=i0MOTcOI0zXzL/XH9A/zmnk1FBFcFXsythCRvvyOsx4=; b=b5OTkZkOghos0nz1Q9UnhCIVyCPZXqvtPYqoWR7sxFwRCl2getuRwqzedBm/H0109f XdrBFJ4N/OsXk/u/9xI8SVokuuxoJVY4ysFDY0Sx4iH/Cy8zgjWRJ6OvrW/XsgvuZCD6 7KlQKyilVYWdfV6Lk2QFvJF144hfb0hMzkLu3ZtncnP/mbdVISuw/Se2sVfoLSjvGX3j Yyq9ZKi0plmCP6d5XTPjFw0EIjP5R0NyeDZ0O/CDD1GOmzedyCWkJzHHc4P4NXv367td Kz/84JEFACl8MNEz8ku59ogNBWlR+iQGoTlrQX3A4tlJT//8iakkKYVm3CzgkJIZVXHr r48g== X-Gm-Message-State: AOAM531TQnLYPldci7QBdqjg016zLEYnE3ocm5Kv9c3fMFsF9uYiVgpu 9GqCgNuPN1qHthhAwBIsNY+LQs/or+o= X-Google-Smtp-Source: ABdhPJzP4BMILMDpsnTjnDhTV2vm65ha6TZvcVwpLpGwS/U9hdC3ypdXTssEmsy9IQbQXqB2NYU2mQ== X-Received: by 2002:a7b:cf3a:: with SMTP id m26mr2732377wmg.4.1643281848970; Thu, 27 Jan 2022 03:10:48 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/14] qapi: Cleanup SGX related comments and restore @section-size Date: Thu, 27 Jan 2022 12:10:36 +0100 Message-Id: <20220127111037.457901-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220127111037.457901-1-pbonzini@redhat.com> References: <20220127111037.457901-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::332 (failed) 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=2a00:1450:4864:20::332; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x332.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643283279157100001 From: Yang Zhong The SGX NUMA patches were merged into Qemu 7.0 release, we need clarify detailed version history information and also change some related comments, which make SGX related comments clearer. The QMP command schema promises backwards compatibility as standard. We temporarily restore "@section-size", which can avoid incompatible API breakage. The "@section-size" will be deprecated in 7.2 version. Suggested-by: Daniel P. Berrang=C3=A9 Signed-off-by: Yang Zhong Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20220120223104.437161-1-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- docs/about/deprecated.rst | 13 +++++++++++++ hw/i386/sgx.c | 11 +++++++++-- qapi/machine.json | 4 ++-- qapi/misc-target.json | 22 +++++++++++++++++----- 4 files changed, 41 insertions(+), 9 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index e21e07478f..47a594a3b6 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -264,6 +264,19 @@ accepted incorrect commands will return an error. User= s should make sure that all arguments passed to ``device_add`` are consistent with the documented property types. =20 +``query-sgx`` return value member ``section-size`` (since 7.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Member ``section-size`` in return value elements with meta-type ``uint64``= is +deprecated. Use ``sections`` instead. + + +``query-sgx-capabilities`` return value member ``section-size`` (since 7.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Member ``section-size`` in return value elements with meta-type ``uint64``= is +deprecated. Use ``sections`` instead. + System accelerators ------------------- =20 diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c index 5de5dd0893..a2b318dd93 100644 --- a/hw/i386/sgx.c +++ b/hw/i386/sgx.c @@ -83,7 +83,7 @@ static uint64_t sgx_calc_section_metric(uint64_t low, uin= t64_t high) ((high & MAKE_64BIT_MASK(0, 20)) << 32); } =20 -static SGXEPCSectionList *sgx_calc_host_epc_sections(void) +static SGXEPCSectionList *sgx_calc_host_epc_sections(uint64_t *size) { SGXEPCSectionList *head =3D NULL, **tail =3D &head; SGXEPCSection *section; @@ -106,6 +106,7 @@ static SGXEPCSectionList *sgx_calc_host_epc_sections(vo= id) section =3D g_new0(SGXEPCSection, 1); section->node =3D j++; section->size =3D sgx_calc_section_metric(ecx, edx); + *size +=3D section->size; QAPI_LIST_APPEND(tail, section); } =20 @@ -156,6 +157,7 @@ SGXInfo *qmp_query_sgx_capabilities(Error **errp) { SGXInfo *info =3D NULL; uint32_t eax, ebx, ecx, edx; + uint64_t size =3D 0; =20 int fd =3D qemu_open_old("/dev/sgx_vepc", O_RDWR); if (fd < 0) { @@ -173,7 +175,8 @@ SGXInfo *qmp_query_sgx_capabilities(Error **errp) info->sgx1 =3D eax & (1U << 0) ? true : false; info->sgx2 =3D eax & (1U << 1) ? true : false; =20 - info->sections =3D sgx_calc_host_epc_sections(); + info->sections =3D sgx_calc_host_epc_sections(&size); + info->section_size =3D size; =20 close(fd); =20 @@ -220,12 +223,14 @@ SGXInfo *qmp_query_sgx(Error **errp) return NULL; } =20 + SGXEPCState *sgx_epc =3D &pcms->sgx_epc; info =3D g_new0(SGXInfo, 1); =20 info->sgx =3D true; info->sgx1 =3D true; info->sgx2 =3D true; info->flc =3D true; + info->section_size =3D sgx_epc->size; info->sections =3D sgx_get_epc_sections_list(); =20 return info; @@ -249,6 +254,8 @@ void hmp_info_sgx(Monitor *mon, const QDict *qdict) info->sgx2 ? "enabled" : "disabled"); monitor_printf(mon, "FLC support: %s\n", info->flc ? "enabled" : "disabled"); + monitor_printf(mon, "size: %" PRIu64 "\n", + info->section_size); =20 section_list =3D info->sections; for (section =3D section_list; section; section =3D section->next) { diff --git a/qapi/machine.json b/qapi/machine.json index c87c81b803..42fc68403d 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1207,7 +1207,7 @@ # # @memdev: memory backend linked with device # -# @node: the numa node +# @node: the numa node (Since: 7.0) # # Since: 6.2 ## @@ -1288,7 +1288,7 @@ # # @memdev: memory backend linked with device # -# @node: the numa node +# @node: the numa node (Since: 7.0) # # Since: 6.2 ## diff --git a/qapi/misc-target.json b/qapi/misc-target.json index 1022aa0184..4bc45d2474 100644 --- a/qapi/misc-target.json +++ b/qapi/misc-target.json @@ -344,9 +344,9 @@ # # @node: the numa node # -# @size: the size of epc section +# @size: the size of EPC section # -# Since: 6.2 +# Since: 7.0 ## { 'struct': 'SGXEPCSection', 'data': { 'node': 'int', @@ -365,7 +365,13 @@ # # @flc: true if FLC is supported # -# @sections: The EPC sections info for guest +# @section-size: The EPC section size for guest +# Redundant with @sections. Just for backward compatibilit= y. +# +# @sections: The EPC sections info for guest (Since: 7.0) +# +# Features: +# @deprecated: Member @section-size is deprecated. Use @sections instead. # # Since: 6.2 ## @@ -374,6 +380,8 @@ 'sgx1': 'bool', 'sgx2': 'bool', 'flc': 'bool', + 'section-size': { 'type': 'uint64', + 'features': [ 'deprecated' ] }, 'sections': ['SGXEPCSection']}, 'if': 'TARGET_I386' } =20 @@ -390,7 +398,9 @@ # # -> { "execute": "query-sgx" } # <- { "return": { "sgx": true, "sgx1" : true, "sgx2" : true, -# "flc": true, "section-size" : 0 } } +# "flc": true, "section-size" : 96468992, +# "sections": [{"node": 0, "size": 67108864}, +# {"node": 1, "size": 29360128}]} } # ## { 'command': 'query-sgx', 'returns': 'SGXInfo', 'if': 'TARGET_I386' } @@ -408,7 +418,9 @@ # # -> { "execute": "query-sgx-capabilities" } # <- { "return": { "sgx": true, "sgx1" : true, "sgx2" : true, -# "flc": true, "section-size" : 0 } } +# "flc": true, "section-size" : 96468992, +# "section" : [{"node": 0, "size": 67108864}, +# {"node": 1, "size": 29360128}]} } # ## { 'command': 'query-sgx-capabilities', 'returns': 'SGXInfo', 'if': 'TARGET= _I386' } --=20 2.34.1 From nobody Sat May 4 06:57:40 2024 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643282910701569.8334111866654; Thu, 27 Jan 2022 03:28:30 -0800 (PST) Received: from localhost ([::1]:59188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD2x3-00032T-M3 for importer@patchew.org; Thu, 27 Jan 2022 06:28:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD2g1-0006n1-5W for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:54 -0500 Received: from [2a00:1450:4864:20::430] (port=36490 helo=mail-wr1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nD2fz-0006A7-6s for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:10:52 -0500 Received: by mail-wr1-x430.google.com with SMTP id u15so4100247wrt.3 for ; Thu, 27 Jan 2022 03:10:50 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s17sm1825742wrm.62.2022.01.27.03.10.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 03:10:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lQe0j41ztfi+4RsroChzdgwOB474cFz+aWaWNOBPtVE=; b=nf9Miub53xncAK+sWpFNexBWzbJVfDUNmO/6c9XxLwZJCRCYOqzxKhx++v8TlvvDHb HVuzioGffQ2BttsL6szoimEKuYCxSb6cfj/YDhqwS405ZWmrS5zBuWp1jN1sV6sJzM53 BM70QTuTq8nNptPR3g9mrVE/1wEZMWx0Tvl9fU0MkZL4YaUsy3uQxIs4LHfn9GPBEBn4 zO4ieUa96unPM+pR8lCTMnQugeEFjcbd5c5E1i9r/Wx+4czKGDtD++EU0gpW43xF27sZ MipKPofqGyGnO3Rf6cTXyCD2qKuip2zaE+V+Sd5BDXHYFqXbSsG0LuJVEQEdCvE3DmNb xb7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=lQe0j41ztfi+4RsroChzdgwOB474cFz+aWaWNOBPtVE=; b=3tZ4UV4mWhArGXCyPwzFqZg+JCeudrv0jdYHI+SGyXwKUGyOXh6r4EqOJDqRESA0Zl 6VlAZnnCiu5MXf23lEzpfZ0feslxw1vo7NcJxacu31H9ZLoexs83mG1cbIpwlmAy0Xr5 C48rlL3XusBo7Ifr6UF/dqJH7bh33825Hx4dcou0dPrN4ydGDDne/4WgijRzwF7Q0y3D sybYLlxikOw9h9WA0LfWn2gDN+pOcgsywbdb6J19z9VpJ8KyhquE6bdS28eay5Zb3NX7 xdYAlrJe1M8d1qMvnanz5d66kOuQ16rD8gn1vCRpw6+h22e9k+3L4a75Dum/svamPmyn tTvQ== X-Gm-Message-State: AOAM531FdOVeO1Fl9UwJ3Y+OoSsbJdfylbeJL5WzW/CNP/YIBGqaZPIf kNvc9tQlOFwYgXGL7AKt+4Ii5Bd3oa4= X-Google-Smtp-Source: ABdhPJwCiaimnBhg6LIJmuR/qFW+H/A9L7bEadiePPi5bCaW/nxnRCKTNDzMreEMVz6L4e2jA3QuKg== X-Received: by 2002:adf:c448:: with SMTP id a8mr2623595wrg.697.1643281849981; Thu, 27 Jan 2022 03:10:49 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/14] configure: fix parameter expansion of --cross-cc-cflags options Date: Thu, 27 Jan 2022 12:10:37 +0100 Message-Id: <20220127111037.457901-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220127111037.457901-1-pbonzini@redhat.com> References: <20220127111037.457901-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::430 (failed) 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=2a00:1450:4864:20::430; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x430.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matheus Ferst Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643282912760100001 From: Matheus Ferst Without this fix, any use of --cross-cc-cflags-* causes a message like: $ ../configure --cross-cc-ppc64le=3Dclang --cross-cc-cflags-ppc64le=3D"-tar= get powerpc64le-unknown-linux-gnu -sysroot ..." ../configure: 1: eval: cross_cc_cflags_--cross-cc-cflags-ppc64le=3D-target:= not found ../configure: 3816: export: cross_cc_cflags_--cross-cc-cflags-ppc64le: bad = variable name Signed-off-by: Matheus Ferst Message-Id: <20220120173142.2755077-1-matheus.ferst@eldorado.org.br> [Fix other occurrences too, noted by Philippe Mathieu-Daud=C3=A9. - Paolo] Signed-off-by: Paolo Bonzini --- configure | 4 ++-- docs/devel/testing.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index e1a31fb332..e6cfc0e4be 100755 --- a/configure +++ b/configure @@ -402,7 +402,7 @@ for opt do ;; --cross-cc-*[!a-zA-Z0-9_-]*=3D*) error_exit "Passed bad --cross-cc-FOO o= ption" ;; - --cross-cc-cflags-*) cc_arch=3D${opt#--cross-cc-flags-}; cc_arch=3D${cc_= arch%%=3D*} + --cross-cc-cflags-*) cc_arch=3D${opt#--cross-cc-cflags-}; cc_arch=3D${cc= _arch%%=3D*} eval "cross_cc_cflags_${cc_arch}=3D\$optarg" cross_cc_vars=3D"$cross_cc_vars cross_cc_cflags_${cc= _arch}" ;; @@ -1328,7 +1328,7 @@ Advanced options (experts only): --extra-cxxflags=3DCXXFLAGS append extra C++ compiler flags CXXFLAGS --extra-ldflags=3DLDFLAGS append extra linker flags LDFLAGS --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 + --cross-cc-cflags-ARCH=3D use compiler flags when building ARCH guest t= ests --make=3DMAKE use specified make [$make] --python=3DPYTHON use specified python [$python] --sphinx-build=3DSPHINX use specified sphinx-build [$sphinx_build] diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index d744b5909c..92d40cdd19 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -1324,7 +1324,7 @@ for the architecture in question, for example:: =20 $(configure) --cross-cc-aarch64=3Daarch64-cc =20 -There is also a ``--cross-cc-flags-ARCH`` flag in case additional +There is also a ``--cross-cc-cflags-ARCH`` flag in case additional compiler flags are needed to build for a given target. =20 If you have the ability to run containers as the user the build system --=20 2.34.1