From patchwork Thu Sep 29 11:41:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610577 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp866286pvb; Thu, 29 Sep 2022 05:48:19 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6/Eg5XpAcuOHYV6u1NO9UedmpOzCbA7yfKHDkhLoaJ5ziQeZZZpzEfOwk1bDMYyeFFJ8dd X-Received: by 2002:a05:620a:1a96:b0:6cd:f115:62dd with SMTP id bl22-20020a05620a1a9600b006cdf11562ddmr1060748qkb.286.1664455699590; Thu, 29 Sep 2022 05:48:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664455699; cv=none; d=google.com; s=arc-20160816; b=qGYwiMcF79vEn2kpg701rf28NNC9D6agteFjHxO/4yowKhTwONu36aKEfTwIICk5y6 +nCtjsv2XrWgNPf6Uo9YpZHPp0PrTdpGhyjgLImpLqE9GLiA9w7hTBpWnzl+j1XSgMFR LC+k5kkbskKoa7TMx7x0/j30G2QsdVJco2FJNUousU/+6ly5TnscNRfDbSUz9RHiXnUO b4w8TiMzIIrpDEOmnI9QsPfSzbT/5iUVagefjpmtkCdWQO0RkEzuKvTZjJYREL3TO0ot AHmmmndxIVhLOe+IP6aBTdkZhQbs3S1XoC6r4BwGR1CDP/H7jWedX7XocZW5fy4fqJ01 JghA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uPGGdG5dRWC86HcWiL9VqOOjNj0Gz/5VllmDKDHfDFo=; b=EVAwwsVkJRAS69uH749WEasN/re8xsL5KsVdweU38MsoVz9CQcPPT5picC/Ij8Oz3m Nl6hUXTbUX+PBi3Sq76MjtSWefRghuzH7I6Q2ayDI/2jOh/jQ57aNpEAQTryFbsMAT0S 9Zr1om4nzdjev0YXl5LgFJZ3/MU/QlSSrsNQNumH0aLEcepH6Jjw9bwb+9mDWbCqjJfR Si7w4KXdALYEWWbw98zf4sqpbylBAeKD812glLm6X1u26ph8o86ouTAOFKE3mEXMfKj9 A6rIzdj6I/NLwXCJCle83SxPSJre9SDNeoRCyJ4CLTjzItuP5Nlh+WsQzEyTwJx5DEfY ZX+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dr0L9tWx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r20-20020ae9d614000000b006cc8273ef72si1174150qkk.543.2022.09.29.05.48.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 05:48:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dr0L9tWx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odsxf-0002Iv-1j for patch@linaro.org; Thu, 29 Sep 2022 08:48:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrw5-0004NZ-Vp for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:39 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:46753) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrw3-0001C1-Cn for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:37 -0400 Received: by mail-wr1-x432.google.com with SMTP id bk15so1727074wrb.13 for ; Thu, 29 Sep 2022 04:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=uPGGdG5dRWC86HcWiL9VqOOjNj0Gz/5VllmDKDHfDFo=; b=dr0L9tWxdO+/MeFfIi3Ge1RmGcpH1L2RQXaAh6yhbKlIftd50pooDkTJvfrIFDbG38 KHA1idTzBQTLpf1sCJFUh/uYFjZqrcAWwbUmu2EEo890UQk/oXUXmPBwbROou14J9QB2 gNzQzuolicMeSsIJ7lrhKq7++KCjxNC3+Q6GbzAIN2qkcSPsVgRNwkXVh1m9RDVRzzgz YbcqrAEKdeXufy1MesgjeHynNDMdWXJOwk9KZra910+KIeQ7DLNeHRP/R1LzC4sG/1Cm 8CSliT6ErcUqGz1RBC5esBvc4S6yfnF/mlz32dqXAbLJDZ4gepT+iwWL2cPnj/wIJrQd 7GGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=uPGGdG5dRWC86HcWiL9VqOOjNj0Gz/5VllmDKDHfDFo=; b=n+IbJsxrstAPG5j4TTXDAJuRJJwuFXSK2XgaR3ninoUPagOrm8fpjnGIcLmNTPfP+e wxeNLl/OdWEW/YhCJg5sq7LQZDF6at4XWBMF+ZIx+I3I5OiwCIsidHt7e+stzkqLx4At fibACoMCFxS3gIOMpRG7Jajjk27y7ATATF9ILUdnCU/TqY6XjimZZbNTcbrIuGfJ8Oj7 Y/aEfbn1UYYjIij7FTS4k9U1GP6HRLPYe0+BDvztqzG41F/UeEB7WpiP4+NI5BcMu6q6 WtgNUY3JWYU6miugVfCri4Swr9eNlizOfUpBfj0F6MAr2RWRbQ9RFAbU41DjutvA5B9q WZfg== X-Gm-Message-State: ACrzQf2LFDktJsbO0cmV+AgsnVLzCMCdhXDIIE7Vs9fOX7A2OpjjZMIi jyxFSvsXsWaWlRX3zvCwtzzhvA== X-Received: by 2002:adf:e2c1:0:b0:22c:c2c0:4fa7 with SMTP id d1-20020adfe2c1000000b0022cc2c04fa7mr1997936wrj.382.1664451753098; Thu, 29 Sep 2022 04:42:33 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id k15-20020adfd22f000000b0021badf3cb26sm6897349wrh.63.2022.09.29.04.42.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:32 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 531DA1FFB8; Thu, 29 Sep 2022 12:42:31 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, "Lucas Mateus Castro (alqotel)" , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 01/51] scripts/ci/setup: ninja missing from build-environment Date: Thu, 29 Sep 2022 12:41:41 +0100 Message-Id: <20220929114231.583801-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Lucas Mateus Castro (alqotel)" ninja-build is missing from the RHEL environment, so a system prepared with that script would still fail to compile QEMU. Tested on a Fedora 36 Signed-off-by: Lucas Mateus Castro (alqotel) Message-Id: <20220922135516.33627-2-lucas.araujo@eldorado.org.br> Signed-off-by: Alex Bennée --- scripts/ci/setup/build-environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index 232525b91d..b5acaf9118 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -153,6 +153,7 @@ - make - mesa-libEGL-devel - nettle-devel + - ninja-build - nmap-ncat - perl-Test-Harness - pixman-devel From patchwork Thu Sep 29 11:41:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610580 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp869623pvb; Thu, 29 Sep 2022 05:55:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5b/TqjLfyh24g/sIea+jSnsDaTiBuVKXrrfaZdq9cYjg2nRl0BEhB7ygCnTPVJbRdQEHTw X-Received: by 2002:a0c:aada:0:b0:4af:6229:1821 with SMTP id g26-20020a0caada000000b004af62291821mr2196880qvb.6.1664456138997; Thu, 29 Sep 2022 05:55:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664456138; cv=none; d=google.com; s=arc-20160816; b=ZXY4gAWQEAzb+6puB5a9LHwA7daDpQs87MhLLnC+zREWlglBDfBRE55JQTwWE+gVGJ sZAxCARs8+3dwY/tKxYmOozVbA0pmnVq7W2Hj5PS76KMP0lT2gVlMR6W3/RaOTkJAhnT BY/aL/Z7RaNAHqhaLfubRSbhtEjn1oXlfQPRlS83a/TQLMR3tfuCTwELlN1+5nT1vR0W YcU6UCcPnosjPtK9kjU9uXfp4zG/EE4RP14NBPb7PFe/WUUjPytm68/4JPooH3mljX2t TQOJt/j1AJ7waJ25qAWBRtRWtje3k08Ww50VtlHIL3sSOKAVpvVfVZ4jeaEbzQYV/jvp DZBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wHR3jK6kXQ31QwdzvCyerN1s1Kpqv3ZTDSaBoALKKnM=; b=WS3DIRPcv/6ILtM29yi2mcZCax1Nn2G3eCqMdf+0BU/WH5jR/l5Sp2MTcVJp3EryC8 0OUFWVH27SJ2qPG0/R19kaqHbXxvr/uaY8M+TCmCQBog0lsrr4YkZlfUdgS5AYE18dRH q0FNzMjoNx3UVNfDfc7w8lpXKL+PAY0VYRV0Jmn8Z0Go+eVnL+aCiruLLMRThblflm7i 7GgXOGXO4iD88t+qkS7jVXgRqAvFQDo1837TUGvc+CkQTP14at0F2qjm4NafpwnSDhtu t6fgUHMVBOOEng7VboAXFri9AFC1bC8b6MZx9ydEStJiwyE6Jk7k8KhMsnL9AJ4DyN21 bNXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j7aV+1R7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x28-20020a05620a0b5c00b006cebe06478dsi1037616qkg.659.2022.09.29.05.55.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 05:55:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j7aV+1R7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odt4k-0000fA-Gn for patch@linaro.org; Thu, 29 Sep 2022 08:55:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrw6-0004Na-2D for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:39 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:38696) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrw3-0001CC-DZ for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:37 -0400 Received: by mail-wm1-x332.google.com with SMTP id c192-20020a1c35c9000000b003b51339d350so3048814wma.3 for ; Thu, 29 Sep 2022 04:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=wHR3jK6kXQ31QwdzvCyerN1s1Kpqv3ZTDSaBoALKKnM=; b=j7aV+1R7+2myKSxXMopBfSeXoWJhGN5fjOD8dcJXJp1jikX7pXL1HY6J/K+nUVtDJ5 BWXQ/t0pkjlLcRIkkTugZ71Ir4eVbeG3dPQTVT3wWYyqNyw3VWR4EyF0Kh4IZNFmXcXV YCaQ/Cm6TVu9r82FTtSOqPvW/WFVSnHy2HKfxKtbETucl5Uls1Sf7OwafTlljbxx0wY7 fm9HKjKdEaCt1jd3twReEmf0VOUnjixM5Nw0CTFWj1Q2k6Zy0vOENdXtxo8mUrCgSxjI 4g9u4hII4W8gO4Q4AtqO2lKZECHwiwTwlwGiKGhfibCNs712ybdWrcaKYC+pbCojlW7Z a/Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=wHR3jK6kXQ31QwdzvCyerN1s1Kpqv3ZTDSaBoALKKnM=; b=S1LC5+ZZWFW/siyRtQqqdk3Xaj5YYv8zs90Z9qE7rUY4OASOdKiyLW6F3or71xTDwn SPeVj35dLIf63glQRh7flIzduTI3zEnzS1LCAFOjc+JVTpJ+DPS+jFcfadsisXX1j5ZP 3O6vf7N86RcmyHibhTf8GmRfALtqXlhaAzI4T0u+b/HfNF7KoRLIPr3GyFZqB0teHlyb YH1ecKtZEY+77tH+1H2lxyS7MGW7eBLNz9re/KCwuxLI5A6tbFrmLMs/iuEQad88Ae62 O/CFZASKZkwtS78Yg0FXpynAVOmQDVglMdSgRkZFl/aQL4LiRtLQ5IDcuWfb1go7BGzP Q02w== X-Gm-Message-State: ACrzQf1qBeeKZVIc+KS7qs9P8JXnHPKq02SqCcb6SIvRDBS5ufQF2L54 I2A7DgoBIoxdF/JXZuBGdK3RLA== X-Received: by 2002:a7b:c4c2:0:b0:3b4:fdc4:6df9 with SMTP id g2-20020a7bc4c2000000b003b4fdc46df9mr1939967wmk.123.1664451753532; Thu, 29 Sep 2022 04:42:33 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id k1-20020a056000004100b00228dbf15072sm1917941wrx.62.2022.09.29.04.42.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:32 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6A2B51FFBA; Thu, 29 Sep 2022 12:42:31 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, "Lucas Mateus Castro (alqotel)" , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 02/51] scripts/ci/setup: Fix libxen requirements Date: Thu, 29 Sep 2022 12:41:42 +0100 Message-Id: <20220929114231.583801-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Lucas Mateus Castro (alqotel)" XEN hypervisor is only available in ARM and x86, but the yaml only checked if the architecture is different from s390x, changed it to a more accurate test. Tested this change on a Ubuntu 20.04 ppc64le. Signed-off-by: Lucas Mateus Castro (alqotel) Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220922135516.33627-3-lucas.araujo@eldorado.org.br> Signed-off-by: Alex Bennée --- scripts/ci/setup/build-environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index b5acaf9118..49292715d3 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -97,7 +97,7 @@ state: present when: - ansible_facts['distribution'] == 'Ubuntu' - - ansible_facts['architecture'] != 's390x' + - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64' - name: Install basic packages to build QEMU on Ubuntu 20.04 package: From patchwork Thu Sep 29 11:41:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610574 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp863044pvb; Thu, 29 Sep 2022 05:42:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7SwtQLgzncObJbfqh4GRrwrFuwZhBT8qw5uzHmmPb2P7pMq1XdG5o/H4q6HSq57fx5D8Eu X-Received: by 2002:a05:622a:1a01:b0:35b:a454:dd01 with SMTP id f1-20020a05622a1a0100b0035ba454dd01mr2198122qtb.350.1664455320061; Thu, 29 Sep 2022 05:42:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664455320; cv=none; d=google.com; s=arc-20160816; b=oNgHXW2dX3T3m66k7gqW/9aA618TKUkQexzgMC40rVsblwptt9supZMl82kBFYwXb7 yCciMS809ylK3/EyxB9c8tLxO8Ugymsrd+4UjGhNgBxu3lc1ekbdgoTDt2mVnGZuOLfd UM4VMinq1gb6aILGXB3hOy/tTvsdQxiipvV152ZvGvrRdAkeaIE9AKpUqTVw9nz3IztJ onqyg7NA5R0aKiWmynkS5oIKCGFjkUYX6mxAIw9x7ohk5xhuxOdh+ZFw0PpRxKvhBW8F yCzkZAlatfGZ79HSbkWsxY/K1eBxal6EeI/pCfmOZsH2WEmjx9fPyK4YTUAAQS7sR8hJ Xulg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=65+UILTR2n+02yVdRAJfamHM00Ug7ZaNlHVk2cPv0CI=; b=l4h9N7iC4WwnY0wEm1pfeEmE3pimyCMCmT0KkB6J9hUY5ZhGAa0ZNhFdOzP7At42M2 HRJ5QksTlg0qn4/8QWyCTIzstaqeclOk/Gq3Rou/lxV5ym74Vw2FXtCLeqflRL/7DZPD N3W8PjddsapQqX4shhNUJVu5lIDTsJO/jlc7LAdMOBcrdg/jxfFnjNYJUmba0IHvuHHR nnDfDjP9Nc7EGj8SQejcYExsfMO4M8GhUnDXXsMK+NvmVp2qW3nvGXoD3C4igyeNEKQs ngduCSqBngkTVW8aDceP9XBx0b0RuoDn02iWsEXjYaigueB5nlmk7/MtxSpo5lGV14ad ytBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="EUyUrP/j"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r2-20020ae9d602000000b006bbdcb5febfsi1140875qkk.152.2022.09.29.05.41.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 05:42:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="EUyUrP/j"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odsrX-0004gV-GD for patch@linaro.org; Thu, 29 Sep 2022 08:41:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrw6-0004Nb-09 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:39 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:39486) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrw3-0001CG-Cb for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:37 -0400 Received: by mail-wr1-x42e.google.com with SMTP id cc5so1752117wrb.6 for ; Thu, 29 Sep 2022 04:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=65+UILTR2n+02yVdRAJfamHM00Ug7ZaNlHVk2cPv0CI=; b=EUyUrP/jB1ZfwthM3GxK5bM9MVbytMEpXXAYEqJ5YnfuO+o72OL8lTaKhgA9zCubMI uGUwfa2RNvfnKz595AiaE4wlo+jgUNr4Fbj9byO9pFJdhKamyyknfmTEDfX1flvqOcMf zKqXuR6stLjHV+POPD0YhzOF3+5sKdHDZ9Dj4arJtc6Yce+tAjIzYkGu+MhkaOvPor8R 1HckpqUpxkylkbLJxcIZQGGLAhaKazs7skHOE9rSyotUWekXoGg1wt3iOfZWgM2pec40 oprkeq1qccKPK0UaZxeY9tFkMmRRPrqSoCDRof6VNWggfCB3SDJIijcmk7g4qzXAokb1 aaSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=65+UILTR2n+02yVdRAJfamHM00Ug7ZaNlHVk2cPv0CI=; b=2zwwd+jTPqsHIF1qyx3B/CQJCTimy9Dvmt4nuCB8eE/OmnkrtVJiXWI4LSZ5e2AEKr ZxbdQwz/GYAalNbClmLE5OgVd1RgfAZvUWDsPYT/KZTiSaSS+qDMrKDAxbnuMcVfQHK+ iXxNTrRX2sGVmDbqmktulhSa+iUbK+O3urfPikbv8QHx2imFZH8QQryMCupeWvJBmmpM j8CczEYPZ0hkUfV/FVAiCA5PEd7Yk8bK6OoXzyo1YToR69W7gAfixZw+Av0T/qyhns/Y 7yqZGlTXHqiifRiDJDYBabpO7grljvWEByVd8pQ+mnNXthz1iHeOCOgAt+MJiWD6CQ9T MNBA== X-Gm-Message-State: ACrzQf002rNDgQRNZ6fUqp/RrzIz3QH7B8SHHHZY6k+Oz8M1xsVFOLqy tvXseof9J/azrNzzkZr3LhLcoA== X-Received: by 2002:adf:f78e:0:b0:22c:db44:31c9 with SMTP id q14-20020adff78e000000b0022cdb4431c9mr888309wrp.609.1664451754069; Thu, 29 Sep 2022 04:42:34 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m13-20020a056000180d00b0022ae4f8395dsm6506206wrh.96.2022.09.29.04.42.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:32 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 817F01FFBB; Thu, 29 Sep 2022 12:42:31 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, "Lucas Mateus Castro (alqotel)" , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 03/51] scripts/ci/setup: spice-server only on x86 aarch64 Date: Thu, 29 Sep 2022 12:41:43 +0100 Message-Id: <20220929114231.583801-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Lucas Mateus Castro (alqotel)" Changed build-environment.yml to only install spice-server on x86_64 and aarch64 as this package is only available on those architectures. Signed-off-by: Lucas Mateus Castro (alqotel) Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220922135516.33627-4-lucas.araujo@eldorado.org.br> Signed-off-by: Alex Bennée --- scripts/ci/setup/build-environment.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index 49292715d3..b04c2b7cee 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -160,7 +160,6 @@ - python36 - rdma-core-devel - spice-glib-devel - - spice-server - systemtap-sdt-devel - tar - zlib-devel @@ -168,3 +167,14 @@ when: - ansible_facts['distribution_file_variety'] == 'RedHat' - ansible_facts['distribution_version'] == '8' + + - name: Install packages only available on x86 and aarch64 + dnf: + # Spice server not available in ppc64le + name: + - spice-server + state: present + when: + - ansible_facts['distribution_file_variety'] == 'RedHat' + - ansible_facts['distribution_version'] == '8' + - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64' From patchwork Thu Sep 29 11:41:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610581 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp869648pvb; Thu, 29 Sep 2022 05:55:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM54k53LV04iGNS9V0WwWT1TXoaKU5poX3whdzlwIjlZXea33om0NQzyi7lQ/3O5/GMkMncm X-Received: by 2002:a05:620a:ccd:b0:6ce:3e34:f588 with SMTP id b13-20020a05620a0ccd00b006ce3e34f588mr2037331qkj.566.1664456140240; Thu, 29 Sep 2022 05:55:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664456140; cv=none; d=google.com; s=arc-20160816; b=YJoVD7TC0zlRgx13QLFHvYaQCbuG7H7lMQIchOvlOQb/S8IUkFHUvCw4l4L4Q9g80j jFvXTI9ZHd69CiC52KWeDP8ZGJUd23Y/C3GUymVH3LlcL937mUHG0i+VadG+01YJTpHW REsU8jSnLKOhlZQ9TJnymHM1jksDrum5JDqKqThT6ZkN+zY9eXI+g/d27O5iPSaUyaP/ sKwisMkzzuq1/G+mS6JqO2a9BsTG4WvcjEyBaacC/f5EEcVk3VfuX+sea8xXbmgnvb9S OWCU99BDqyQzHVUEfRz8qH2C03pVgeZLVavM9LAqK53glfnsDswIhEujYZJEPCdYHwWH w6xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=g36e2wLY9UUYXFbTpJgshX42etL7qePtKpco9+krQd8=; b=G/Qx5u/LIAYGo/64f5XrkRrOdx0f2akOx2+QgHaiFRkqqshsXPflo9OAGkh5OiOiYB eZMLyXlCx4wXCv1oRLClCCgFY2przpR4REg6QZsANYZElDTqJIR+uGRqucGTK717MbdA qKf+Qx3APIblgWZ6TDbgmm1xtuBS9JkYaOwpiI9KFOylDu1gAoSHGekdfApB8sqF90h0 csApt3j6fZama+F8oRRANkphnuVTL8ivpErzIbBFmetxx11A/sUO93AV4FjZfGAQSsOQ 49VBDSaQIUuGSszW6w1hbj3vswQe2GJp9kWKXJBAeT3EpOtGkVqYAe4A4JLpUUzATkp0 RSwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AjQSKKUU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ee20-20020a05620a801400b006bb91e28915si1203162qkb.460.2022.09.29.05.55.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 05:55:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AjQSKKUU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odt4l-0000gp-Qo for patch@linaro.org; Thu, 29 Sep 2022 08:55:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrw7-0004Nj-BW for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:39 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:51053) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrw3-0001CM-Vr for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:38 -0400 Received: by mail-wm1-x32d.google.com with SMTP id ay36so781840wmb.0 for ; Thu, 29 Sep 2022 04:42:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=g36e2wLY9UUYXFbTpJgshX42etL7qePtKpco9+krQd8=; b=AjQSKKUUdq3KVvLyrYvx7b4wc6SiVANiklRFEnKdxdyN91t8cnX64YXg55u+5adKxw lVwdmnB9zA0WVCfNmv2UBZ0ssboeQniVsEw8SG0WbCeDT3L00NQbFlcKC2XiTk8cwJdg DxHRvky8QQh+bgL/c5pWoiuH7e87upwqfaG4ehy/94Psyxz6ufgQP1cvtiafhOh7HHSy esaxu9SUiR+UECC3tZ6S1mmyCvbTiG18+hZtoPZiB7hnSSUs1Vs6MpC5k4bLzcfqajoF KMiwOqDyn5SsVE2i6kpRsXJDdCW6nveVBVDKdNQLNkG3DPgzQj/zl3GWIs9/GUlHPYmM 35vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=g36e2wLY9UUYXFbTpJgshX42etL7qePtKpco9+krQd8=; b=yVwRR2w4kdm06wTwJk/DMnNF5p+EUkurACc/SLg90V2AN1Hk+HvYjvtPTb6EvIctmB aP6qGCs7b1PNb0zY4tAoEImJNUa5BAyppnRvaWHGdxXVlloxi6KFQ117TelV6iRohnjh Inu5EBV0ePdZ/EVaqiwz/WJ5upYlzOWdzvJuKLT9yTxwgWp24bYI+N5likviVmbIoVek OE2ZmGR9d2aCIKXmjZUDg+xSPTlSTeZRP/QW7nrAbnP7wNjafG4VAgcTvo34J8c8zmJ3 D09dk2GQVZG/P5evAybMNnKDnP2RfymsiGIQbx2Ptk+Dap3l8c2dikdZGZWpSb9ad5V9 6ysg== X-Gm-Message-State: ACrzQf3u/ew/5Zi5WpQ0TTVBPUQqKFohe9L1iykyV1xYTqVa+r5SIfTj VzmjspUeY/VWl9EbOCumT7SOxg== X-Received: by 2002:a05:600c:282:b0:3b4:76c8:da3c with SMTP id 2-20020a05600c028200b003b476c8da3cmr2067801wmk.153.1664451754566; Thu, 29 Sep 2022 04:42:34 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id c11-20020a5d528b000000b00228dc37ce2asm6195879wrv.57.2022.09.29.04.42.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:33 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 999951FFBC; Thu, 29 Sep 2022 12:42:31 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, "Lucas Mateus Castro (alqotel)" , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 04/51] tests/docker: run script use realpath instead of readlink Date: Thu, 29 Sep 2022 12:41:44 +0100 Message-Id: <20220929114231.583801-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Lucas Mateus Castro (alqotel)" The alpine docker image only comes with busybox, which doesn't have the '-e' option on its readlink, so change it to 'realpath' to avoid that problem. Suggested-by: Daniel P. Berrangé Signed-off-by: Lucas Mateus Castro (alqotel) Message-Id: <20220922135516.33627-5-lucas.araujo@eldorado.org.br> Signed-off-by: Alex Bennée --- tests/docker/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/run b/tests/docker/run index 421393046b..9eb96129da 100755 --- a/tests/docker/run +++ b/tests/docker/run @@ -15,7 +15,7 @@ if test -n "$V"; then set -x fi -BASE="$(dirname $(readlink -e $0))" +BASE="$(dirname $(realpath $0))" # Prepare the environment export PATH=/usr/lib/ccache:/usr/lib64/ccache:$PATH From patchwork Thu Sep 29 11:41:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610572 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp857416pvb; Thu, 29 Sep 2022 05:31:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4Ac5LrRFXwZokikefnDEfNIgCSbuaxexHHjj8otFBbD+QRGRn4p8ILMWDR/ZOLhbAstFjN X-Received: by 2002:ae9:f209:0:b0:6ce:24c1:13d5 with SMTP id m9-20020ae9f209000000b006ce24c113d5mr2025863qkg.330.1664454706417; Thu, 29 Sep 2022 05:31:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664454706; cv=none; d=google.com; s=arc-20160816; b=rSWZHxp3WoKgGuuOQrpIPY7aXStsL0nxJJ4ny+zpA0qOe58GsWq34zsY4TXYOHNWlu AXjo+5uOR77kgbl1zxyjHJwcCx/J+ZISurMBrcGzpgUYUf5mjP9CsMo7ans3mnXvS9it MMXKyDWmPca8GRpRhBLi5dVN39PRhJJattfWcVOYjiQWGX5mEs08uqu79ZXc9WqkUdLk FAfls638gvl+nZDnrO9UkrzGg54va02MoiBbx9g7125afr0xirlDzjz83tTyBH+F0Y1y fi8OSlMUxEdUU8i2zuhDsRu5tPhn52ok3R28CRdmpOoGEzQxdPYiXYXx3bd1b8gpFCun CfuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Diq8ZN9f6nzxeYGGdF9jWCCGVvSqsoLnUON4PzOL4RU=; b=x01PtgxjhVm8AeqayCUEdVGj8LuunSKJxLi7xVuGufmI2rdPls6bzOWuLiTfa0VX/M cR+gMEhaV/6Yc5JUyCEYipOD8tKcYOnEWH8K7KP4wxUd86pzX5p7rteFqgKsucbJS51B dlv9aLeVkaCSxrsOdWfvaclnm1JMT31YRSX/qz+2+Rsa4xlMQlbHPS6e/tBdqJb2JTJz rSgvoQIjHAi03B9ATu1gg/BhBjeSj74crzTWon8kuWYmbnCwGV5C/NwMSGEE6+xNPXFP Us/gX6FavPzvoLmcwpmRCMT1gknwVYKceHqJh1BWauZyI1NwlKEWSYVOAXNrss5PFnmK wVCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hHSrXGga; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gd16-20020a05622a5c1000b0031ef7b2ffedsi1217943qtb.62.2022.09.29.05.31.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 05:31:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hHSrXGga; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odshd-0006za-Nb for patch@linaro.org; Thu, 29 Sep 2022 08:31:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrw7-0004Nl-C9 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:39 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:43771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrw4-0001Cr-S2 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:38 -0400 Received: by mail-wr1-x431.google.com with SMTP id h7so1730540wru.10 for ; Thu, 29 Sep 2022 04:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=Diq8ZN9f6nzxeYGGdF9jWCCGVvSqsoLnUON4PzOL4RU=; b=hHSrXGgaXoh/Z9nPkPbKaSxA0TDdRNbrHh6XUDKnV5Z8MXOESHRjdWdPBIon6H8LWv BxpKtia6metZZxukF2+HKg2VGIfUHO5xem1NUXXQcoK0usSBVyEecL7MogwNtLBy6xD2 h8LjI3Wt1CGU8VZgj2P+FeraX+3r0+5sR8dfPUqTfELN3N53afn8Wt+WM5gJU2Mf9wZp JxGPymUQc8f8cNTUi7FfzpVm0w03Eel3lzcFMG4Y6hvhMqAuxqRWrYRbz8o5FGnrQFT+ kQkrjfu8ZBKqbC5Vby5+2JTQ6mZGMVkT4x/GLFHp3+bVjdOGPKtL7tjJBf4pOSH0PY47 I3uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=Diq8ZN9f6nzxeYGGdF9jWCCGVvSqsoLnUON4PzOL4RU=; b=pr2Lj/Y4ftffx97pw8BkEc1Ef9EaEhxETQyK764hrZRcMjcJOnPaUOIPNpL0B4GkhT 4eHCTWz8vxB3qVkr0iNaMmFlAkSiu2a15NkvSBCXsDH1jmaaDaiPSCHmrgkddAc2DksA jXdha+xUa5aBzxhJFGJMgxr3ApBO08aT/76NOhLPwTZCOCHPp8x5U+BzsLVNWD/ufN+W /6kTKr7G445j6mF4+0D8BAnzIv+UzBw6Mi8MDWNMkZvpHDWCT+XQ4GFsqJFMVMTg2MJc AGOxEct8BmAvGiw8HCpJ3pdRbVb0tBlurbgXgoOzW54SsyiEva+w67OwIqVGEPxCSlpq yLkQ== X-Gm-Message-State: ACrzQf3ilCJLgBH4KK3955/SBMVdZ1frQbXbYyl2TgP7OVj1bWJnVu9/ nosJOXOdN4BVZ+KrPcA+wEDGNw== X-Received: by 2002:a5d:6dad:0:b0:22c:cedf:8e56 with SMTP id u13-20020a5d6dad000000b0022ccedf8e56mr2060567wrs.596.1664451755531; Thu, 29 Sep 2022 04:42:35 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id t14-20020a1c770e000000b003a5ffec0b91sm4092411wmi.30.2022.09.29.04.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B1B581FFBD; Thu, 29 Sep 2022 12:42:31 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 05/51] configure: move detected gdb to TCG's config-host.mak Date: Thu, 29 Sep 2022 12:41:45 +0100 Message-Id: <20220929114231.583801-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When tests/tcg gained it's own config-host.mak we forgot to move the GDB detection. Fixes: 544f4a2578 (tests/tcg: isolate from QEMU's config-host.mak) Signed-off-by: Alex Bennée Message-Id: <20220922145832.1934429-6-alex.bennee@linaro.org> --- configure | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure b/configure index dc53e4df03..52ae4adffc 100755 --- a/configure +++ b/configure @@ -2453,6 +2453,8 @@ if test -n "$gdb_bin"; then gdb_version=$($gdb_bin --version | head -n 1) if version_ge ${gdb_version##* } 9.1; then echo "HAVE_GDB_BIN=$gdb_bin" >> $config_host_mak + else + gdb_bin="" fi fi @@ -2537,6 +2539,11 @@ echo "# Automatically generated by configure - do not modify" > $config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak echo "HOST_CC=$host_cc" >> $config_host_mak +# versioned checked in the main config_host.mak above +if test -n "$gdb_bin"; then + echo "HAVE_GDB_BIN=$gdb_bin" >> $config_host_mak +fi + tcg_tests_targets= for target in $target_list; do arch=${target%%-*} From patchwork Thu Sep 29 11:41:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610575 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp863096pvb; Thu, 29 Sep 2022 05:42:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7xKmLbcD16gZWLXMXyinF5fW/qVEFw5tml3SvdPhF0QLyHP1b+IfUrKWOOeYgPP84vn4b6 X-Received: by 2002:ae9:e007:0:b0:6ce:b5a4:1069 with SMTP id m7-20020ae9e007000000b006ceb5a41069mr1940074qkk.642.1664455329243; Thu, 29 Sep 2022 05:42:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664455329; cv=none; d=google.com; s=arc-20160816; b=UV8Xn3kFAlfURNOM1iZtgvt4uSkaYTp7+z4OclLPLXPGhbao7bUUWZ3ueopJKn9c3E C/ZktSOoiw2uQHWwxQHulpRlBJJenl9k2knTVOfYWyZJZ3VrcHenK/07M8HELn1WS7d8 ExC6LqGqYCGrADOgCqlm84Sie5RzFFte1ZFFjgbfAO4FJvW0y4IZdjqk9VOWSneCxUEg Z8EC8y2N23zTPmdeKR1sZXX/Q453JZLJlP95L66xGZeLAeaiU0e1zW9Rh4ducCo+rC2F 9Y42ioto/E9SFbnqBlZ11WW0HUFTssBaqgTtR52NAL9z4gTxAaOH4ftuYt8L3CSYWLn+ 5S2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/XRSkW0C7jayMRrat52qAwjXUjYVSmaLK9PMjNjbqoY=; b=fMx9NVsKw+X5iRNhZNdrKFQCiRQUP0NDghY3seKKLIKR2n6Ix63pXy+22Gc7xDWwUs IhWkEbEaYBp4LSQaGYKTRwnvin2vw9g8RUoTPzhQO/dGjgVzF8J5LI0N6XD7zXoFsUva owLecNdwDniuBnmAhIfJbR58jUvyiTE+xHT2B+2idXxTdEivF3OSYerqxsbH87JvlulN THutPTvqVVJ1jYIl/yh4nk0k/zcaVVTG/khpLhORBu0n46WD6vDWiEtznQGZ3NOZ2e0d P/ju5UVKw2Qx/sAITjCOgI8oy7CJ/A1KQ+nTsgoO6N7EjY7VPk779wbMqsHmUu0VzC0O dpuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NiCbuhAf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id fg14-20020a05622a580e00b00344578f20aasi1277231qtb.217.2022.09.29.05.42.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 05:42:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NiCbuhAf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odsrg-0004xq-P3 for patch@linaro.org; Thu, 29 Sep 2022 08:42:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrw7-0004Nk-CB for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:39 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:55024) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrw4-0001Ch-Hm for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:38 -0400 Received: by mail-wm1-x331.google.com with SMTP id iv17so767334wmb.4 for ; Thu, 29 Sep 2022 04:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=/XRSkW0C7jayMRrat52qAwjXUjYVSmaLK9PMjNjbqoY=; b=NiCbuhAfgD611DVFtOiV433p34ngOWQs+e60199kzXV/MbTELqaLxd0/BsZG5UPJdm vVyn4hNaN6G3iC1lkAOAJZ5fXoTOkr325YDakI7YA/BQBWmud5AxM3abBz3szQFbdm5L DdmUs1prkYCoLhGWKBHBfotavwWNwUsvLd/xcy35Da1hjJUCF+5fmJLET66IO4KUXcVQ z1p4w0BrIAgxS8m/Y9Fw/zEOHXW3CTaekiSF+M4dltdVzA04CG0sfwHmwyoHrgx23P2B 9xtjg440VfT9tUkW8RabVqI65ueYpwoHaqLQ6KfzqIh8yotId+3wGZpv3B4Dt/JNev5n m2zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=/XRSkW0C7jayMRrat52qAwjXUjYVSmaLK9PMjNjbqoY=; b=iufkbTsKiGR5gov9Fkts230io798d1usr4vIemXSawlKtLVpLpZe7crI87Jt8FQx5U xlnH7cB51EfkewbTZ7z62a2seVnihcsog3EKxM7z8oiMwcUcTIHtcOJUOjth2aB0dkW4 GppYbi1Qw9n8vk0oKGgbzRSxMMP8ygC3ZA8NaRkE1rN+Ct9TPvQp6m8Wt9tiIZrUJSKo Kex5x0c1/MTtWMzhYk3LADFnVXd+BvxBAWB9QFnsLhCQ1RaJLoQQjZOGEFik7YrCfhNU rX7YeRZ+q+AYOFN/EhQYtcrlrF+JbgivCMPqa5RJZLUW1fGCSU3oeafd3dq9Wz4SmR5r Zfdg== X-Gm-Message-State: ACrzQf0/N3ePkk0LGoxbgfeKcqx4o8nv78lbwa+qU4w4FT/6NCyEjXoY Yky81CNDw1cm7N9+Lo6WxLccSw== X-Received: by 2002:a05:600c:3b12:b0:3b4:a6ea:1399 with SMTP id m18-20020a05600c3b1200b003b4a6ea1399mr10218273wms.49.1664451755158; Thu, 29 Sep 2022 04:42:35 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j1-20020a5d4481000000b0022ae401e9e0sm6361567wrq.78.2022.09.29.04.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C8A471FFBE; Thu, 29 Sep 2022 12:42:31 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, Anton Johansson , Alessandro Di Federico , Paolo Montesel , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 06/51] target/hexagon: add flex/bison/glib2 to qemu.yml Date: Thu, 29 Sep 2022 12:41:46 +0100 Message-Id: <20220929114231.583801-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Anton Johansson Note, the glib2-native mapping exists separately from the normal glib2 mapping. The latter uses a `foreign` cross-policy-default, and libvirt-ci is not able to support package mappings for multiple cross-compilation policies. This will probably change in the future. Signed-off-by: Alessandro Di Federico Signed-off-by: Paolo Montesel Signed-off-by: Anton Johansson Signed-off-by: Alex Bennée Message-Id: <20220804115548.13024-9-anjo@rev.ng> --- tests/lcitool/projects/qemu.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index d9f826f8eb..0d92819249 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -3,6 +3,7 @@ packages: - alsa - bash - bc + - bison - brlapi - bzip2 - bzip2-libs @@ -19,6 +20,7 @@ packages: - diffutils - dtrace - findutils + - flex - fuse3 - g++ - gcc @@ -26,6 +28,7 @@ packages: - gettext - genisoimage - glib2 + - glib2-native - glib2-static - glusterfs - gnutls From patchwork Thu Sep 29 11:41:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610573 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp859504pvb; Thu, 29 Sep 2022 05:35:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4wvhP3BrrTk0LyojD/phps+91SogrmOsL1IMuHWFAk8mMThq9FcbIeivohrIhlrAViUygF X-Received: by 2002:a05:6214:2aaa:b0:4ac:acbd:7ef8 with SMTP id js10-20020a0562142aaa00b004acacbd7ef8mr2213251qvb.126.1664454917056; Thu, 29 Sep 2022 05:35:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664454917; cv=none; d=google.com; s=arc-20160816; b=DyIbyubheaNHpRCBRwrDkCjBAt28qdOk03BLhnha/GBulG6FvW3j9UTmDRMmw+euM7 a0fO3PAFt7/aQL8io0JuExRbNXtRveAXP0r3IKxz87kTdBy9o3r90L67c0xbNWmlZ0kP eh0XfdwBVj+vcZf/ePgOBcLb5wtBV6O+p4h/sAVz7ZpTJnp634ruQ/QySAJGYSXIIMqx P2ZlnE1EIpyrHfc6HG54X0qac3M1n5A4ry2TwRkX+JGiPO3G+jzIwcE9TknbT+lQjTPS jxcz9olzoD3agwVkBYt08GmdpqH6mtVBx3kWjJnSiZfnpIvkWuMW5EGB1slKHY6WghUZ Cq5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=w1BOfNfTbPWbCCE6wFUXTgdO0ZaYbGzKjJsePIlPIOs=; b=mjAw0h+A15t/tL0ui3zIfU8pdMMjtnUyCrh4dkfATu48GZd37wUDfRJVyzXEIsh/pp 6MclohhKVv1u2TPipxyhGS5pmlg+CttkkCHs8oHEHtSyuugeAEQwBlmTubZkn8Wu7t6/ JeTEiWjfzaTvihKwnRg1vT7Lx670S88yESPxY0TknexwL2ZgF1xtnaOkkoUb+hmewgW8 kEoN5VIoE5ctDDVXnksVnhsKA0usq4NJQIFQ++QQTSEWqcyFymqf2BXOlUSWhnS1h9Zv F4eejeiXiiXRJnLuj8uY7otEh6hOs3RHnvooK3s3jyva9wbceZMOxF5H0UlWEkK9qE61 t0oQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wzDSUtqn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d63-20020a37b442000000b006cc892dbd1fsi1101450qkf.335.2022.09.29.05.35.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 05:35:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wzDSUtqn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odsl2-0000V7-FA for patch@linaro.org; Thu, 29 Sep 2022 08:35:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrw9-0004Qr-Fr for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:41 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:44603) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrw6-0001DD-0L for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:41 -0400 Received: by mail-wr1-x42e.google.com with SMTP id c11so1731690wrp.11 for ; Thu, 29 Sep 2022 04:42:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=w1BOfNfTbPWbCCE6wFUXTgdO0ZaYbGzKjJsePIlPIOs=; b=wzDSUtqndCNJsl4STjdpK3A4trf0XSaj42XHJR9BHBmE0KlccyTdTHaaX5HlMTonPv OzbF8Y87FWT6ktIVWyRf6v6t/GUeahZE4117rqyyj8VAnLHFnfYezG28UH5vQwAk6mOA 8WlSUCTEgssgKVAyQ2skgIucmh3NMiluSwSHs+OEo1iCNYpGxUvURIeBJLVDwmIVG93Q kE3fl78mtEChAQnF2b2qm/d1s7A/Sx3yJE8J6ZO/CCKO4RraPUCsRQ2/ooiyLLA2U60O /DxCHtO7r67/t6ZC63oriYQ/GRd2o+6yG/g0WGjcML2uA/1uU1hkLcdm/788dhV+Egwd y6/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=w1BOfNfTbPWbCCE6wFUXTgdO0ZaYbGzKjJsePIlPIOs=; b=J+O64P/nZ/Lfds9kxaKyLbgGCjl2cglS2sG8cq1OY8Elyaw86Pl6sStvjQMJVjRZzI QJ0wj2mq0plp1mnE+si97XP+urrB03KqTISDPkNLJjnWFZnXO2GgMUDDl9NPVJfhmpyl FZBL2FFdjJb2s9QE/Un/3tTPVgQ7VbuPkGOKW0zzxqGnUB+pk7m+4ArY7BHQVD/TdW42 r566NNH32F1jyJ7xjIg7i5CMXXuTJpdgRBnkZLkRV0hBWk2AxMUZoOSWqCvQQI+NQbnQ P6VoKUSfhfwoMXCqVwp86GLjh7c5D2aLZgvlHnI0tWi+asEy8EKijnksr/QV0AslUC10 Wy3w== X-Gm-Message-State: ACrzQf2QDZ1p+ZptORyuOJsZfgF4CC8Sd7nG8a9KowoqKlWK4IsGHvjv 19CzIQSJY51xJk1zCYsUTXMvyg== X-Received: by 2002:a5d:6dad:0:b0:22c:cedf:8e56 with SMTP id u13-20020a5d6dad000000b0022ccedf8e56mr2060621wrs.596.1664451756462; Thu, 29 Sep 2022 04:42:36 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id k9-20020a5d6289000000b00226dfac0149sm6324553wru.114.2022.09.29.04.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 236B51FFBF; Thu, 29 Sep 2022 12:42:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, Anton Johansson , =?utf-8?q?Ale?= =?utf-8?q?x_Benn=C3=A9e?= , Ed Maste , Li-Wen Hsu , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 07/51] target/hexagon: regenerate docker/cirrus files Date: Thu, 29 Sep 2022 12:41:47 +0100 Message-Id: <20220929114231.583801-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Anton Johansson This patch updates the docker and cirrus files with the new packages by running tests/lcitool/refresh Signed-off-by: Anton Johansson Signed-off-by: Alex Bennée Message-Id: <20220804115548.13024-10-anjo@rev.ng> --- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- .gitlab-ci.d/cirrus/macos-11.vars | 2 +- tests/docker/dockerfiles/alpine.docker | 2 ++ tests/docker/dockerfiles/centos8.docker | 2 ++ tests/docker/dockerfiles/debian-amd64-cross.docker | 3 +++ tests/docker/dockerfiles/debian-amd64.docker | 2 ++ tests/docker/dockerfiles/debian-arm64-cross.docker | 3 +++ tests/docker/dockerfiles/debian-armel-cross.docker | 3 +++ tests/docker/dockerfiles/debian-armhf-cross.docker | 3 +++ tests/docker/dockerfiles/debian-mips64el-cross.docker | 3 +++ tests/docker/dockerfiles/debian-mipsel-cross.docker | 3 +++ tests/docker/dockerfiles/debian-ppc64el-cross.docker | 3 +++ tests/docker/dockerfiles/debian-s390x-cross.docker | 3 +++ tests/docker/dockerfiles/fedora.docker | 2 ++ tests/docker/dockerfiles/opensuse-leap.docker | 2 ++ tests/docker/dockerfiles/ubuntu2004.docker | 2 ++ 17 files changed, 39 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars index 1a5959810f..c3db1d7d30 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars index 5e5aafd7e5..d31faa787f 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/macos-11.vars b/.gitlab-ci.d/cirrus/macos-11.vars index bec6e862d4..aee9f50de6 100644 --- a/.gitlab-ci.d/cirrus/macos-11.vars +++ b/.gitlab-ci.d/cirrus/macos-11.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='brew' PIP3='/usr/local/bin/pip3' -PKGS='bash bc bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' +PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme' PYTHON='/usr/local/bin/python3' diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 806cb19f17..7d6e95275a 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -13,6 +13,7 @@ RUN apk update && \ attr-dev \ bash \ bc \ + bison \ bzip2 \ bzip2-dev \ ca-certificates \ @@ -30,6 +31,7 @@ RUN apk update && \ dtc-dev \ eudev-dev \ findutils \ + flex \ fuse3-dev \ g++ \ gcc \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index 3c29883332..d89113c0df 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -17,6 +17,7 @@ RUN dnf distro-sync -y && \ alsa-lib-devel \ bash \ bc \ + bison \ brlapi-devel \ bzip2 \ bzip2-devel \ @@ -31,6 +32,7 @@ RUN dnf distro-sync -y && \ device-mapper-multipath-devel \ diffutils \ findutils \ + flex \ fuse3-devel \ gcc \ gcc-c++ \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 7d2feb7bf7..9047759e76 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -13,6 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ bash \ bc \ + bison \ bsdextrautils \ bzip2 \ ca-certificates \ @@ -22,11 +23,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ diffutils \ exuberant-ctags \ findutils \ + flex \ gcovr \ genisoimage \ gettext \ git \ hostname \ + libglib2.0-dev \ libpcre2-dev \ libspice-protocol-dev \ llvm \ diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index 8d78ba2484..a8b728ca64 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -13,6 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ bash \ bc \ + bison \ bsdextrautils \ bzip2 \ ca-certificates \ @@ -23,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ diffutils \ exuberant-ctags \ findutils \ + flex \ g++ \ gcc \ gcovr \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index b7ba2c527f..17a5709245 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -13,6 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ bash \ bc \ + bison \ bsdextrautils \ bzip2 \ ca-certificates \ @@ -22,11 +23,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ diffutils \ exuberant-ctags \ findutils \ + flex \ gcovr \ genisoimage \ gettext \ git \ hostname \ + libglib2.0-dev \ libpcre2-dev \ libspice-protocol-dev \ llvm \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index 9b1778261e..701fc70db0 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -13,6 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ bash \ bc \ + bison \ bsdextrautils \ bzip2 \ ca-certificates \ @@ -22,11 +23,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ diffutils \ exuberant-ctags \ findutils \ + flex \ gcovr \ genisoimage \ gettext \ git \ hostname \ + libglib2.0-dev \ libpcre2-dev \ libspice-protocol-dev \ llvm \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index addbc9a793..5a11fe3900 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -13,6 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ bash \ bc \ + bison \ bsdextrautils \ bzip2 \ ca-certificates \ @@ -22,11 +23,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ diffutils \ exuberant-ctags \ findutils \ + flex \ gcovr \ genisoimage \ gettext \ git \ hostname \ + libglib2.0-dev \ libpcre2-dev \ libspice-protocol-dev \ llvm \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index 1bb7d8e184..9b90a4d6ff 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -13,6 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ bash \ bc \ + bison \ bsdextrautils \ bzip2 \ ca-certificates \ @@ -22,11 +23,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ diffutils \ exuberant-ctags \ findutils \ + flex \ gcovr \ genisoimage \ gettext \ git \ hostname \ + libglib2.0-dev \ libpcre2-dev \ libspice-protocol-dev \ llvm \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index a94b459b23..02feaf26cb 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -13,6 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ bash \ bc \ + bison \ bsdextrautils \ bzip2 \ ca-certificates \ @@ -22,11 +23,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ diffutils \ exuberant-ctags \ findutils \ + flex \ gcovr \ genisoimage \ gettext \ git \ hostname \ + libglib2.0-dev \ libpcre2-dev \ libspice-protocol-dev \ llvm \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index c641fd5d0e..97d3872ee2 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -13,6 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ bash \ bc \ + bison \ bsdextrautils \ bzip2 \ ca-certificates \ @@ -22,11 +23,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ diffutils \ exuberant-ctags \ findutils \ + flex \ gcovr \ genisoimage \ gettext \ git \ hostname \ + libglib2.0-dev \ libpcre2-dev \ libspice-protocol-dev \ llvm \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index c0cbe09e66..95585e9e56 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -13,6 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ bash \ bc \ + bison \ bsdextrautils \ bzip2 \ ca-certificates \ @@ -22,11 +23,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ diffutils \ exuberant-ctags \ findutils \ + flex \ gcovr \ genisoimage \ gettext \ git \ hostname \ + libglib2.0-dev \ libpcre2-dev \ libspice-protocol-dev \ llvm \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index b39d311bbc..fe84166ca1 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -23,6 +23,7 @@ exec "$@"' > /usr/bin/nosync && \ alsa-lib-devel \ bash \ bc \ + bison \ brlapi-devel \ bzip2 \ bzip2-devel \ @@ -37,6 +38,7 @@ exec "$@"' > /usr/bin/nosync && \ device-mapper-multipath-devel \ diffutils \ findutils \ + flex \ fuse3-devel \ gcc \ gcc-c++ \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 041cf9c1ff..d80064756f 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -12,6 +12,7 @@ RUN zypper update -y && \ alsa-lib-devel \ bash \ bc \ + bison \ brlapi-devel \ bzip2 \ ca-certificates \ @@ -22,6 +23,7 @@ RUN zypper update -y && \ dbus-1 \ diffutils \ findutils \ + flex \ fuse3-devel \ gcc \ gcc-c++ \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index e1f4ed7c80..24594afc15 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -13,6 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ bash \ bc \ + bison \ bsdmainutils \ bzip2 \ ca-certificates \ @@ -23,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ diffutils \ exuberant-ctags \ findutils \ + flex \ g++ \ gcc \ gcovr \ From patchwork Thu Sep 29 11:41:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610585 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp872446pvb; Thu, 29 Sep 2022 06:00:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6L2I7v5peL+eBHjfnELCK7p1QrO5RhqkqmcC+MRhqKB39coOSZvOQdQf6XfcqFMKXdLtKu X-Received: by 2002:a0c:b295:0:b0:496:b91a:f5f4 with SMTP id r21-20020a0cb295000000b00496b91af5f4mr2296124qve.20.1664456435988; Thu, 29 Sep 2022 06:00:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664456435; cv=none; d=google.com; s=arc-20160816; b=VbwQ1S7yXr7/oqLhkDjX70J0pP7d325A4rMfyL+nYCzUb4QaS6qZSBW4a5ZE4ofbO6 h30bOHpFjfkiJmTlHtSs2ScaRBfdAl2D9UYYo1IsQ18juf5evkpYz3vMorfoiEPqVAET uvhOaIxLFSvqp8/uT/e2S3L3tZ5GuIlsv5xnzqjMZgG8hp/j+NxsBrxkCDJZFimVDFu9 Bt1oT7j4z7NxSrJN6olNyUw9o5bKtF6xCerX9BZ73K0/ac6qt6HinqPpUkOLZyqk9J/0 8lXyC6UZNlYeQJUTdvr9wY10tKi4a+YHbQ/JU53Y35+6ID3W8eIlbWptHgrOJrIYQM7s ryjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=U6pzoGmye/soVbf/lv98NM957nVkbZaRaRV3Ma5l18Q=; b=MFQiwMwdpZxsB3QLDb0C5gtoNAQ6js1EHa4goSyOP4vDGuLSBCHTQh/RnYlwPfk+XZ AdUycNXv2Z9qX4vdR4BvPSyn/Ev9NOgBqyamuNEli3JL2eIA8T1CcdusIBtoon/VbvqD xl55B3Z08qNrWKP++mQqwWEliq1CnzFMzsueHFMIcFAa+N1YxVUU0H0p5D9IU7w0RT4T vXpH6MayN5FeF06+Lf1PZzeHAy2VFdMYCqUdO8MOm0oT9TfPU7utFB/jx2tDrVSkVDY3 aFDInkQbEFcg1y2AyfYSgeMFX3OFEjak3wH5j1ZKjI2c4KYNCDrJfACf87Y4u7tF67kh 7rNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TepAKlUL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id hf6-20020a05622a608600b0035ce734e127si1150249qtb.432.2022.09.29.06.00.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:00:35 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TepAKlUL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odt9W-0007Hs-PH for patch@linaro.org; Thu, 29 Sep 2022 09:00:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrw9-0004Qj-5J for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:41 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:37618) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrw7-0001DK-3i for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:40 -0400 Received: by mail-wr1-x433.google.com with SMTP id bq9so1758637wrb.4 for ; Thu, 29 Sep 2022 04:42:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=U6pzoGmye/soVbf/lv98NM957nVkbZaRaRV3Ma5l18Q=; b=TepAKlULP8gJos0TiqOmdBGAlpgkRzMPjpS7mQTIu0TA9v1sOAVQ4VLDCZMRlZqbXI 9ZCmuAopHrYJ4u2/4uqR+7eEc00APC094cvXTOjmFAZBRFthACM41W8NRQxTo2phBnS6 Axq9NbyIMCsdJVybjdf0gCVSlkLl5o4eTOLdWmfMg3tPwNpVN19tq9jxX5FusakLecA4 Pl5mab7HrR9moZ+Sgl5c9X5FVyYqUShJ2HYfj38ifw9VZFax6IgRTGATa4qQaNwrczRv fvtR4u1fdxRypqb6g5RkPeQLmOqHmBnlkH/i+thOHuDaziqie0lelP1BohywLaWWu9Kv DzqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=U6pzoGmye/soVbf/lv98NM957nVkbZaRaRV3Ma5l18Q=; b=B/pGFF7or+KJbH9KWHWHrMh2L33Hn395NsT6y9Gk+OIw85Yd70O3T5ba/6Ub1Ye34s wZdumWv8Wqa9d0mvqaRwN9BdgJgGXmrx/EGy3MsPfEhOeDcCK5TxINCSSlTDY+HC52b3 F4pyPREI7AKVKC9ACc+cNnwnf39I/mb4KyKWQDew5OHWHP7TW9iwJZqZC3/OOebhLC7u uHSHVClCz0+GALf1Fey3qHzch2t7wrUtRGZbsgGSLJUn9Vk+aURQ10E5U2uyTHYv0fJk qTSetc/ovQnx+8ZVRSHUPQ1h5tUs63T6rNWgJJ/tGkIMtxCdVP1Fp/xvsmuGNTBzk0QL cdNA== X-Gm-Message-State: ACrzQf1AAgHofAVPqAbczbKGRcPauXmh1e70XV8X9TNme1HYbwRca+M7 Znm4TLDQwfUoclKB/x0xkoLonQ== X-Received: by 2002:a5d:460f:0:b0:22c:c851:40d4 with SMTP id t15-20020a5d460f000000b0022cc85140d4mr1980570wrq.130.1664451757198; Thu, 29 Sep 2022 04:42:37 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l3-20020a05600c1d0300b003a62400724bsm4472982wms.0.2022.09.29.04.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4421C1FFC0; Thu, 29 Sep 2022 12:42:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, Anton Johansson , =?utf-8?q?Ale?= =?utf-8?q?x_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 08/51] target/hexagon: manually add flex/bison/glib2 to remaining containers Date: Thu, 29 Sep 2022 12:41:48 +0100 Message-Id: <20220929114231.583801-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Anton Johansson Adds our build-time dependencies to containers which build qemu-hexagon, but aren't covered by libvirt-ci. Signed-off-by: Anton Johansson Signed-off-by: Alex Bennée Message-Id: <20220804115548.13024-11-anjo@rev.ng> --- .gitlab-ci.d/windows.yml | 6 ++++-- tests/docker/dockerfiles/debian-riscv64-cross.docker | 3 +++ tests/docker/dockerfiles/fedora-i386-cross.docker | 2 ++ tests/docker/dockerfiles/fedora-win32-cross.docker | 3 +++ tests/docker/dockerfiles/fedora-win64-cross.docker | 3 +++ 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 86a4339c48..70571b29a3 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -33,7 +33,8 @@ msys2-64bit: extends: .shared_msys2_builder script: - .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed - diffutils git grep make sed + bison diffutils flex + git grep make sed mingw-w64-x86_64-capstone mingw-w64-x86_64-curl mingw-w64-x86_64-cyrus-sasl @@ -67,7 +68,8 @@ msys2-32bit: extends: .shared_msys2_builder script: - .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed - diffutils git grep make sed + bison diffutils flex + git grep make sed mingw-w64-i686-capstone mingw-w64-i686-curl mingw-w64-i686-cyrus-sasl diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker index 594d97982c..9715791e0b 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -16,13 +16,16 @@ RUN apt update && \ # Install common build utilities RUN DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \ + bison \ bc \ build-essential \ ca-certificates \ debian-ports-archive-keyring \ dpkg-dev \ + flex \ gettext \ git \ + libglib2.0-dev \ ninja-build \ pkg-config \ python3 diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker index 0a3ec346e6..7eec648d2d 100644 --- a/tests/docker/dockerfiles/fedora-i386-cross.docker +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker @@ -1,9 +1,11 @@ FROM registry.fedoraproject.org/fedora:34 ENV PACKAGES \ + bison \ bzip2 \ ccache \ diffutils \ + flex \ findutils \ gcc \ git \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index a06bd29e8e..aca37aabc4 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -3,13 +3,16 @@ FROM registry.fedoraproject.org/fedora:35 # Please keep this list sorted alphabetically ENV PACKAGES \ bc \ + bison \ bzip2 \ ccache \ diffutils \ findutils \ + flex \ gcc \ gettext \ git \ + glib2-devel \ hostname \ make \ meson \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index b71624330f..3642766479 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -3,13 +3,16 @@ FROM registry.fedoraproject.org/fedora:35 # Please keep this list sorted alphabetically ENV PACKAGES \ bc \ + bison \ bzip2 \ ccache \ diffutils \ findutils \ + flex \ gcc \ gettext \ git \ + glib2-devel \ hostname \ make \ meson \ From patchwork Thu Sep 29 11:41:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610576 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp864054pvb; Thu, 29 Sep 2022 05:44:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6/X4Glm+GhT11JuCHbz08P91THJgLqf2otjCMbRLPe9TE3aAkvsxcN85RFeRUWNPmt5c6G X-Received: by 2002:a37:2e84:0:b0:6cf:8dd4:7adc with SMTP id u126-20020a372e84000000b006cf8dd47adcmr1959171qkh.723.1664455454473; Thu, 29 Sep 2022 05:44:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664455454; cv=none; d=google.com; s=arc-20160816; b=Sj1QeRpYsqIB0ZjrsFK9bq57M2k9M71J/UHLi4qiukEbaWxepx2diaXhtgILe4wdrC FwFjUbfrERx70cy24uRDTW/MGB7TSSRT3N4ZfiV556qnTr8OtHOHhBIcRcp8/VmjNMej hn3TuokEYyLUtm/1/nvBB3WA3uLja9lynsB1ul4st6jMPfdLcnvj1ra/lEZs0beYzakq Ia+c9JMIP2hypsXUb4SMoTe7JKIKG3S2YrsaGZg32wKR0Oxy89yPYP/md/ZJnyrjDNJQ HGs8n5XLNuxsAjS3+w8rO1oWnyWYE0psE1O5iWa0zxKpoi5Jh/Wh1MPI/ey4dggKpcr/ q0ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=U138ZH3NxNJ5/EzN4d8hsKRI/emesbQsSGY0U7Ek0FM=; b=CWTvq+HgpLldJALJFs75Jbga2MlA47WKzcrCFtPnbiSQspvpn3znB07pHrCYGRGvAW b2aVTtz1aKhjAbcPgYlXsQLdb0rt4i/SzwlSFoFlX6PFkFZ8FnLUZSCIdgDswmymfquN 0fG2TJqRupQJDZtnGcW03B9Ngp4y5UfBHRB1S3KRCyiQsqJbm5nr1tkyd0IV0W8MkNHD /y4vuCo2NX706uajFiPGM82nMuFuEd5Ut0Cmxmqpm4AOQT+UN4IMEBQWtH9jgfe3CDQd Ix7scUGopB+rgQMttGaetsA/swUNM3Ckycfbg/aRoJ+rhJsPoPiPk1Bs5LpC5om5sf1F jFlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VHvHyoXk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m14-20020a05620a290e00b006ce1bdff175si1467677qkp.132.2022.09.29.05.44.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 05:44:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VHvHyoXk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odsth-0006kU-V7 for patch@linaro.org; Thu, 29 Sep 2022 08:44:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrwB-0004Ud-2v for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:43 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:51791) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrw8-0001Dx-Ex for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:42 -0400 Received: by mail-wm1-x335.google.com with SMTP id o5so774880wms.1 for ; Thu, 29 Sep 2022 04:42:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=U138ZH3NxNJ5/EzN4d8hsKRI/emesbQsSGY0U7Ek0FM=; b=VHvHyoXkY7ltvpJZ0LL+me0rKCGkWGuQBYHkWhse4Pl76AopbP6IAEK6RsWJ4YLwvB SmpM/UI1PoP7rseCua9Q4dZIs/niXu/Ah8hARr8FBHnJQncSOPeOKM6RH8DXbfM/0IIi 6PvXu/LNUfVOG0bI5Qi1e15psYm5omY9m1IO3m12V7DnnMlSpHrz0vaLByyEj2WNQdPo qCO7zfns0IXOFDKMHvb6/BQsX5vSC6930M8/GYPiq1oDZdlTq8JQIYaE1tSz5wp4ozKs SFS9vlYKm2UqjkaVLrbskt1JntXvYWhHC3Jv18EdYORea/r0EX1qtWAYNRDKw97o6sTW PpaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=U138ZH3NxNJ5/EzN4d8hsKRI/emesbQsSGY0U7Ek0FM=; b=TjZKCgltTW5asJU0+YGlJfUuUvNYZ3bk03WR4Pkz81svLAcB0VsS5EyO5cVz1kZ2Ma uRg00oaTT2arWc3G7bQOYf5Pwj2dxFa9hkSOZGkxvIzJ30lrqYycel9VVMEcPLFd8ZSL oENKB1r+efbs2/bI6jx6lBMe+dlw9m9vzhAOfed3ZBWnFOKkaWCiOuYCWMV+27zD591g zvUAO8ZxxTsaYMKKlbBd/JTN7YhDWqu7F/wKNOgNumeDJ/KpD1LJrerKcxyMghiCMw4X CPfNRbhFeMH/d7Lg3119rQCxM1VQTn8M+ZyCpIw1g8NQntm6sDmd0eszrwfgn1vvqmBB BrCA== X-Gm-Message-State: ACrzQf3zjGFKM8kH92LVWulkam9QyLswgOunY3pIRIIcM2OTrzrg1Tli xhaQrQGPY5aJZ3/9cy4KR0yc1g== X-Received: by 2002:a05:600c:154e:b0:3b4:bf17:32fc with SMTP id f14-20020a05600c154e00b003b4bf1732fcmr10482047wmg.70.1664451758792; Thu, 29 Sep 2022 04:42:38 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id i6-20020adfefc6000000b0022ccbc7efb5sm2733529wrp.73.2022.09.29.04.42.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 634BA1FFC1; Thu, 29 Sep 2022 12:42:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 09/51] tests/docker: update fedora-win[32|64]-cross with lcitool Date: Thu, 29 Sep 2022 12:41:49 +0100 Message-Id: <20220929114231.583801-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Convert another two dockerfiles to lcitool and update. I renamed the helper because it is not Debian specific. Signed-off-by: Alex Bennée --- .../dockerfiles/fedora-win32-cross.docker | 139 ++++++++++++------ .../dockerfiles/fedora-win64-cross.docker | 137 ++++++++++++----- tests/lcitool/refresh | 48 +++--- 3 files changed, 225 insertions(+), 99 deletions(-) diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index aca37aabc4..11f153e397 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -1,46 +1,103 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --layers all --cross mingw32 fedora-35 qemu +# +# https://gitlab.com/libvirt/libvirt-ci + FROM registry.fedoraproject.org/fedora:35 -# Please keep this list sorted alphabetically -ENV PACKAGES \ - bc \ - bison \ - bzip2 \ - ccache \ - diffutils \ - findutils \ - flex \ - gcc \ - gettext \ - git \ - glib2-devel \ - hostname \ - make \ - meson \ - mingw32-bzip2 \ - mingw32-curl \ - mingw32-glib2 \ - mingw32-gmp \ - mingw32-gnutls \ - mingw32-gtk3 \ - mingw32-libffi \ - mingw32-libjpeg-turbo \ - mingw32-libpng \ - mingw32-libtasn1 \ - mingw32-libusbx \ - mingw32-nettle \ - mingw32-nsis \ - mingw32-pixman \ - mingw32-pkg-config \ - mingw32-SDL2 \ - msitools \ - perl \ - python3 \ - python3-PyYAML \ - tar \ - which +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y && \ + nosync dnf install -y \ + bash \ + bc \ + bison \ + bzip2 \ + ca-certificates \ + ccache \ + ctags \ + dbus-daemon \ + diffutils \ + findutils \ + flex \ + gcovr \ + genisoimage \ + git \ + glib2-devel \ + glibc-langpack-en \ + hostname \ + llvm \ + make \ + meson \ + ninja-build \ + nmap-ncat \ + openssh-clients \ + pcre-static \ + perl-base \ + python3 \ + python3-PyYAML \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx_rtd_theme \ + rpm \ + sed \ + sparse \ + spice-protocol \ + tar \ + tesseract \ + tesseract-langpack-eng \ + texinfo \ + util-linux \ + which && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -RUN dnf install -y $PACKAGES -RUN rpm -q $PACKAGES | sort > /packages.txt +RUN nosync dnf install -y \ + mingw32-SDL2 \ + mingw32-SDL2_image \ + mingw32-bzip2 \ + mingw32-curl \ + mingw32-gcc \ + mingw32-gcc-c++ \ + mingw32-gettext \ + mingw32-glib2 \ + mingw32-gnutls \ + mingw32-gtk3 \ + mingw32-libgcrypt \ + mingw32-libjpeg-turbo \ + mingw32-libpng \ + mingw32-libtasn1 \ + mingw32-nettle \ + mingw32-nsis \ + mingw32-pixman \ + mingw32-pkg-config && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc -# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV ABI "i686-w64-mingw32" +ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson" ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-w64-mingw32- +ENV DEF_TARGET_LIST i386-softmmu diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 3642766479..8938c28554 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -1,43 +1,102 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --layers all --cross mingw64 fedora-35 qemu +# +# https://gitlab.com/libvirt/libvirt-ci + FROM registry.fedoraproject.org/fedora:35 -# Please keep this list sorted alphabetically -ENV PACKAGES \ - bc \ - bison \ - bzip2 \ - ccache \ - diffutils \ - findutils \ - flex \ - gcc \ - gettext \ - git \ - glib2-devel \ - hostname \ - make \ - meson \ - mingw32-nsis \ - mingw64-bzip2 \ - mingw64-curl \ - mingw64-glib2 \ - mingw64-gmp \ - mingw64-gtk3 \ - mingw64-libffi \ - mingw64-libjpeg-turbo \ - mingw64-libpng \ - mingw64-libtasn1 \ - mingw64-libusbx \ - mingw64-pixman \ - mingw64-pkg-config \ - msitools \ - perl \ - python3 \ - python3-PyYAML \ - tar \ - which +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y && \ + nosync dnf install -y \ + bash \ + bc \ + bison \ + bzip2 \ + ca-certificates \ + ccache \ + ctags \ + dbus-daemon \ + diffutils \ + findutils \ + flex \ + gcovr \ + genisoimage \ + git \ + glib2-devel \ + glibc-langpack-en \ + hostname \ + llvm \ + make \ + meson \ + ninja-build \ + nmap-ncat \ + openssh-clients \ + pcre-static \ + perl-base \ + python3 \ + python3-PyYAML \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx_rtd_theme \ + rpm \ + sed \ + sparse \ + spice-protocol \ + tar \ + tesseract \ + tesseract-langpack-eng \ + texinfo \ + util-linux \ + which && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -RUN dnf install -y $PACKAGES -RUN rpm -q $PACKAGES | sort > /packages.txt +RUN nosync dnf install -y \ + mingw64-SDL2 \ + mingw64-SDL2_image \ + mingw64-bzip2 \ + mingw64-curl \ + mingw64-gcc \ + mingw64-gcc-c++ \ + mingw64-gettext \ + mingw64-glib2 \ + mingw64-gnutls \ + mingw64-gtk3 \ + mingw64-libgcrypt \ + mingw64-libjpeg-turbo \ + mingw64-libpng \ + mingw64-libtasn1 \ + mingw64-nettle \ + mingw64-pixman \ + mingw64-pkg-config && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc -# Specify the cross prefix for this image (see tests/docker/common.rc) -ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32- --disable-capstone +ENV ABI "x86_64-w64-mingw32" +ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw64.meson" +ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32- +ENV DEF_TARGET_LIST x86_64-softmmu diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index fc604d8a21..783497a989 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -93,7 +93,7 @@ debian11_extras = [ ] -def debian_cross_build(prefix, targets): +def cross_build(prefix, targets): conf = "ENV QEMU_CONFIGURE_OPTS --cross-prefix=%s\n" % (prefix) targets = "ENV DEF_TARGET_LIST %s\n" % (targets) return "".join([conf, targets]) @@ -121,45 +121,55 @@ try: # generate_dockerfile("debian-amd64-cross", "debian-11", cross="x86_64", - trailer=debian_cross_build("x86_64-linux-gnu-", - "x86_64-softmmu," - "x86_64-linux-user," - "i386-softmmu,i386-linux-user")) + trailer=cross_build("x86_64-linux-gnu-", + "x86_64-softmmu," + "x86_64-linux-user," + "i386-softmmu,i386-linux-user")) generate_dockerfile("debian-arm64-cross", "debian-11", cross="aarch64", - trailer=debian_cross_build("aarch64-linux-gnu-", - "aarch64-softmmu,aarch64-linux-user")) + trailer=cross_build("aarch64-linux-gnu-", + "aarch64-softmmu,aarch64-linux-user")) generate_dockerfile("debian-armel-cross", "debian-11", cross="armv6l", - trailer=debian_cross_build("arm-linux-gnueabi-", - "arm-softmmu,arm-linux-user,armeb-linux-user")) + trailer=cross_build("arm-linux-gnueabi-", + "arm-softmmu,arm-linux-user,armeb-linux-user")) generate_dockerfile("debian-armhf-cross", "debian-11", cross="armv7l", - trailer=debian_cross_build("arm-linux-gnueabihf-", - "arm-softmmu,arm-linux-user")) + trailer=cross_build("arm-linux-gnueabihf-", + "arm-softmmu,arm-linux-user")) generate_dockerfile("debian-mips64el-cross", "debian-11", cross="mips64el", - trailer=debian_cross_build("mips64el-linux-gnuabi64-", - "mips64el-softmmu,mips64el-linux-user")) + trailer=cross_build("mips64el-linux-gnuabi64-", + "mips64el-softmmu,mips64el-linux-user")) generate_dockerfile("debian-mipsel-cross", "debian-11", cross="mipsel", - trailer=debian_cross_build("mipsel-linux-gnu-", - "mipsel-softmmu,mipsel-linux-user")) + trailer=cross_build("mipsel-linux-gnu-", + "mipsel-softmmu,mipsel-linux-user")) generate_dockerfile("debian-ppc64el-cross", "debian-11", cross="ppc64le", - trailer=debian_cross_build("powerpc64le-linux-gnu-", - "ppc64-softmmu,ppc64-linux-user")) + trailer=cross_build("powerpc64le-linux-gnu-", + "ppc64-softmmu,ppc64-linux-user")) generate_dockerfile("debian-s390x-cross", "debian-11", cross="s390x", - trailer=debian_cross_build("s390x-linux-gnu-", - "s390x-softmmu,s390x-linux-user")) + trailer=cross_build("s390x-linux-gnu-", + "s390x-softmmu,s390x-linux-user")) + + generate_dockerfile("fedora-win32-cross", "fedora-35", + cross="mingw32", + trailer=cross_build("i686-w64-mingw32-", + "i386-softmmu")) + + generate_dockerfile("fedora-win64-cross", "fedora-35", + cross="mingw64", + trailer=cross_build("x86_64-w64-mingw32-", + "x86_64-softmmu")) # # Cirrus packages lists for GitLab From patchwork Thu Sep 29 11:41:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610586 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp874329pvb; Thu, 29 Sep 2022 06:03:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM75NUZTlxAiq/SLaTj3g5XtaHhEiCEYGRH5tYts1BK3EiwUzRonm4UtfUvo6X/IAA203ESs X-Received: by 2002:ae9:e816:0:b0:6cd:d849:859c with SMTP id a22-20020ae9e816000000b006cdd849859cmr2069847qkg.287.1664456583805; Thu, 29 Sep 2022 06:03:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664456583; cv=none; d=google.com; s=arc-20160816; b=M6m9nz/e11dY12UZ1AGMRDT9a1CcckI+Fk32K8Oc9tGbHf/5T2VManYy3L8GzTJuxd jkjGcVIGTv2FSpKQKLvFcS+PKo8T5ygdRb/6iYbzNmShMJqCd65AApDlCvSXgsiIybE8 vpKvUuNQXdjxy64i8Am9VIWBD8KL0BGRYGgLZwm9UHbcxD3Jh4CqlOXtrMZnho7onxgR sixuZrNoaYDs+283kZ76CXVGmd0WtTKpc0rKjqI7zJl1rJm68KpsSnE2vzqMwTC11C1E msKt/KhjPIRUDCQVZ7oT2vI1UdC0AEYOuIBFBaaQG2EFg0E19XTwOiqgynZrIbfGpkBV wNPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tKgPLnostqoY4L/p2DucxUV0/Pq8eRS4n+qkjOj2vjo=; b=zDnvPqgLb408TsVnBMI7+sY/J/zKT59YS9DRUQrQmBToLPkkNgAyFjQ3MsMPvQO+L4 rq1jxg58BwTDeFb7QsbNhdtJ8TZ6QduTtdbMXxYGa2aLB14m20jtY1RBvKFMwG8t5q71 baU+qkmUaE3TjRRoMz+m1SG4mtXcFLeRtcRK4/FiSf/1289+WdRfKS9BF3hpZhUVDAN4 Zsr7UCBy8TcL6OnTtyGGI4u2w+H6z5eyd+1Jd7hSURRuhR/mcg94ZbS1apZYACkWhisJ RwSHt8LNWDzYyOSKQUDyVweXaSs5dJMXSlw3sJgjr6VhDxfx7OS0MHYji/DBPaUkFS/B 1WoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cZAwXsXi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d27-20020ac800db000000b0035bb0d84c92si1170645qtg.565.2022.09.29.06.03.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:03:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cZAwXsXi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odtBv-00013p-9k for patch@linaro.org; Thu, 29 Sep 2022 09:03:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrw9-0004Qp-BS for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:41 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:37849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrw7-0001Dk-6F for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:41 -0400 Received: by mail-wm1-x330.google.com with SMTP id z13-20020a7bc7cd000000b003b5054c6f9bso3057391wmk.2 for ; Thu, 29 Sep 2022 04:42:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=tKgPLnostqoY4L/p2DucxUV0/Pq8eRS4n+qkjOj2vjo=; b=cZAwXsXiG8G6gmcWVtx4GoTSyZi2vo4fgCiIX0zZkTWPHCg+lBmvotxC1kTJ3H4Gpb 5OOTvq05IUYxUFb+kMIxF1PEIRxCag895EgjZqY4Mni9pujFgHinjvwHt5kkVmP3VgL9 XQpiSMs/ajwpK2HQ/rWAIK2QbpKOvy8MQFMP+o/LD1MSa3sbpoy+XVVfDD8RnndQ7kai 1l1ZI2MlF7q2dIAWxJzcMfFTakB3cHriWTjyJM1Ke5/faFZHXJI66vtt27cxO6xy2b48 sdLuDaq5xAB6xFGxiVpu6rhuWF6+dMoyyS77vm639gaic684a6zWuhZfj5Z/e76wAY8T 1XDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=tKgPLnostqoY4L/p2DucxUV0/Pq8eRS4n+qkjOj2vjo=; b=4xNTk+JwJ4KphtTKKIy7G5F8XIWWgdm5HVxuCjM8dLDstvunLH4wFnB/hAk7rqpkfZ Dgv7UpHWic/5yLwPps6Ztem9xTg1SJEDnqNiHCJK47rlzVP3f132Os3DbQw+BfjjXkFu Y95tefoCPrzMfEcsUa5aZTrTaS0iMbUS+9oUJcI8gs4mgegVFHvaGDhxvhgv4ZJPKcc0 xR/GNBzmAY1DfMtnKU0LG54ke/fIGBHcZvpHYM/JqdS3Pq954T/KCjtvtQWYvAL+FOSe s98Qh2xP9MwHBp7KzFbXdF+e5deyI/uyA3u0/1XZuyxVMWOpofxspoistbMmaJFr9EFf 67Yg== X-Gm-Message-State: ACrzQf3Ma+hQKCYExbmqPWll7CQpmnRy5OjKOgQwkvZRvr7pMWbBPkX2 qgz/7m9TaQ1c/XDwVLE9yiCpMQ== X-Received: by 2002:a05:600c:1e13:b0:3b4:74c3:620b with SMTP id ay19-20020a05600c1e1300b003b474c3620bmr10551359wmb.168.1664451757635; Thu, 29 Sep 2022 04:42:37 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o9-20020a05600c510900b003a845621c5bsm4725676wms.34.2022.09.29.04.42.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7D0E21FFC2; Thu, 29 Sep 2022 12:42:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 10/51] tests/docker: move alpine from edge to tagged release Date: Thu, 29 Sep 2022 12:41:50 +0100 Message-Id: <20220929114231.583801-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Tracking alpine-edge like debian-sid is a moving target. Usually such rolling releases are marked as "allow_failure: true" in our CI. However as alpine presents a musl based distro and provides useful extra coverage lets track a release branch instead to avoid random breakages. Signed-off-by: Alex Bennée Message-Id: <20220929105548.542555-1-alex.bennee@linaro.org> Reviewed-by: Thomas Huth --- tests/docker/dockerfiles/alpine.docker | 4 ++-- tests/lcitool/refresh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 7d6e95275a..9b7541261a 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all alpine-edge qemu +# $ lcitool dockerfile --layers all alpine-316 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/alpine:edge +FROM docker.io/library/alpine:3.16 RUN apk update && \ apk upgrade && \ diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 783497a989..ce0b24c0b1 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -107,7 +107,7 @@ try: # # Standard native builds # - generate_dockerfile("alpine", "alpine-edge") + generate_dockerfile("alpine", "alpine-316") generate_dockerfile("centos8", "centos-stream-8") generate_dockerfile("debian-amd64", "debian-11", trailer="".join(debian11_extras)) From patchwork Thu Sep 29 11:41:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610579 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp867320pvb; Thu, 29 Sep 2022 05:50:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM65SdqK6OMe2sFzsZ/K4233hCkKK9nKMnd0vTyoqC2xE0pxpiqk+2ym3Hbmf57Sd4UmLG7r X-Received: by 2002:a05:6214:daf:b0:49f:5ce8:e628 with SMTP id h15-20020a0562140daf00b0049f5ce8e628mr2250029qvh.115.1664455837147; Thu, 29 Sep 2022 05:50:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664455837; cv=none; d=google.com; s=arc-20160816; b=wE3NMXm5cXKfVGfj3kFB+QU8oe3LijR7Dy4d09xOLtEV77P7NY1UoEAAe/Ivry/q6k HlmI5qj1+6Hrjr8w7JAAc2plmTjub43nDr4BBs8WwZ9NTZ9+t7sNR9z2NeGfy5zMaI/7 t1qGeWJQ5KtcpEN2ewakgkkYJ8gnUxFS5pJDpTDE/vdseQ/wWS0nUbTeX5huEwPnjxPD eAGmVPh+oZs+QT4KwIkdiV4YSgA/NDa2/o04lOAZ2hmd/R7zwwp8PjAN6Pd+/mq6dBrm rqeqcBhUOfFCZTrZ6F2CTOKawvq8VjhVTeA0fLpN/WBna8FslOCy5BPeZ8+zfCDqE/Yu cBTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=b19pLmx/0RxOSHcyQbQM8vk8qEN24/JWEcEYJzVYwNg=; b=pOe/n+VBlqA8xUYY7zjG0TU0pExtVcFr3IJcAWFzdZKgxt0f25LTJzoJ5A+ge0fQy0 bvgrG0Fe29SJeSVvP1hS105ZulA16yOlSerZeQLUXSUHzgYw5NQvyGrNis+fiP7lINJu 5BWmcSXO8mXHnKGYkrLwtF8l1bUST0J90gM69B/M9nDBybQxEpke7I+re1e+p2/EQpwT XuoZRMy5mrQLkwi0v8/CZIH9pvGC3r0NLhy+xaEfk8AZj3uKjG7/EqlGGZgupgyAzx5o GNWYP4jFr7IoF+fE3wIFaEWDD5Q0lJME8bezz1k57nXTT7RvpzEjlkOAY13iCIpZ0EDl JOyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D3iBeKmT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id cm12-20020a05622a250c00b0035b9a35a97csi1284980qtb.456.2022.09.29.05.50.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 05:50:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D3iBeKmT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odszs-0004KK-KV for patch@linaro.org; Thu, 29 Sep 2022 08:50:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrwB-0004Ue-3Z for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:43 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:44601) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrw9-0001EZ-B7 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:42 -0400 Received: by mail-wr1-x42b.google.com with SMTP id c11so1731940wrp.11 for ; Thu, 29 Sep 2022 04:42:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=b19pLmx/0RxOSHcyQbQM8vk8qEN24/JWEcEYJzVYwNg=; b=D3iBeKmTtnFBEixw6SYuxZwDafICEsockz8DiNxOkJHfyZFLJzkIeq6q+sJK0TX1BO wcov+jU5qz+06ydkL1icYhMDL36t9BbrbhMkSDBocis8leFoxpOwX3NuqpimkCJeJiMm USWZoQ5i+uzKN3bdMfXRdxaWNRDeHQ9pVepidP0nCUM5mIAXgpiZbYY+IOWpBZmPHgbs on3cuexlWPqaIwDkcRIUn2piGTh/yWNU3xq980NCtGA6KOTyRiMC6bgHvUc9wWDnlcPS AnuA48hrafVG6DinPBUX1FOv6zLqeHwbAuiTvDDQ1nw1TyZEhnX9/rsxJ605UFFRxqy+ Oe+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=b19pLmx/0RxOSHcyQbQM8vk8qEN24/JWEcEYJzVYwNg=; b=abgchFbPlK1BN51CCnkOATtAGxLP004GkV/e5XNJvRicCnJJb8CCMXLBJk2QuFywcG IxuB+/BYW7u7n+J6mMnzle7lLX7zsePB859eonEEjrcsX+aL64vbM9OXMptfZrRuHwwe Zn/ra0l76xSxd+dId0k+XgEO6riHKl+RP8Xd+ifN3eYLQN+VCImGWfPpLY3+xWXsCeCl 6jb1ArPtF2r9/6khmiVw63WeraHP+op91O5C6Az3R8urFcf612gppwna8KH4fNcP7lW/ rt2cchHiWV4aVS2b+uO5N77ki9L56jKAYSEAKXaxLebBcU2jZnNT1AMO3kkcrqlr9yjt Q88g== X-Gm-Message-State: ACrzQf11YnAFLThcbi4bmMbPx2hByO5W6kzlZubwnw9Se66aBBrl7Ykc wa3Y7DLWAYGm9palK+Fi+dkLUA== X-Received: by 2002:a5d:58fc:0:b0:22c:cefc:be99 with SMTP id f28-20020a5d58fc000000b0022ccefcbe99mr1980087wrd.457.1664451759968; Thu, 29 Sep 2022 04:42:39 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id z4-20020adfe544000000b0022cdbc76b1bsm460160wrm.82.2022.09.29.04.42.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:35 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 94A0A1FFC3; Thu, 29 Sep 2022 12:42:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Laurent Vivier Subject: [PATCH v1 11/51] tests/qtest: bump up QOS_PATH_MAX_ELEMENT_SIZE Date: Thu, 29 Sep 2022 12:41:51 +0100 Message-Id: <20220929114231.583801-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" It seems the depth of stack we need to support can vary depending on the order of the init constructors getting called. It seems --enable-lto shuffles things around just enough to push you over the limit. Signed-off-by: Alex Bennée Fixes: https://gitlab.com/qemu-project/qemu/-/issues/1186 Acked-by: Thomas Huth Acked-by: Paolo Bonzini Message-Id: <20220927213501.4069117-1-alex.bennee@linaro.org> --- tests/qtest/libqos/qgraph.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/libqos/qgraph.h b/tests/qtest/libqos/qgraph.h index 6e94824d09..5c0046e989 100644 --- a/tests/qtest/libqos/qgraph.h +++ b/tests/qtest/libqos/qgraph.h @@ -24,7 +24,7 @@ #include "libqos-malloc.h" /* maximum path length */ -#define QOS_PATH_MAX_ELEMENT_SIZE 50 +#define QOS_PATH_MAX_ELEMENT_SIZE 64 typedef struct QOSGraphObject QOSGraphObject; typedef struct QOSGraphNode QOSGraphNode; From patchwork Thu Sep 29 11:41:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610578 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp866396pvb; Thu, 29 Sep 2022 05:48:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5wXTYL+/FHTdXuME8wcRFEl5feLxkMmkzzOZa8lWWoSXWZmu9k8Ettez6BRY0rXVxmFHVX X-Received: by 2002:a05:6214:29c2:b0:4ad:68be:8c57 with SMTP id gh2-20020a05621429c200b004ad68be8c57mr2290176qvb.3.1664455712851; Thu, 29 Sep 2022 05:48:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664455712; cv=none; d=google.com; s=arc-20160816; b=rvyegKRYnPWbTDkDLRitVfbNkhxwqo2Jczx0N2uUAp2OlfF5zCIsaSFNPWvkFzPOzo hYhnktA9LJ5RawllJ3KLSWGZqPckeBi4ZdMSLNW6skJDUSK2aRgCRc9uCRjcy/4tqGzg FxLgWwBJIo9p3O5icyQMFNOLVW5Kuin85s3L71mOy2qJbTJfjxaakXpJA6h0cJmoTD33 +ExuMoP56fHY5g5LgMfycXmvu5Y5wgJn2CuuVXcneSuxJ1cH6Hf35cPUvsB9nycMuGW6 Uxt9lfdjpC3oLb+c++W/qqp3sm6WBCvvdexkqyD1X+5zb+AmWnzhwAugxrJuyJos1eBG jpHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nhWT7dn5jhHKp/a/I3xktJp1WlGBzEtR15pMyKD1w7s=; b=gd2h/QuJuuixcULZfFNcokbdE5ksqEmo/ICPQhkO2JG80sjEWjDncoNIby8Mn10sJY XhYC6DvD3NBU7PAaIUpZhRTGlIJfT2JmhotPEjNUnhNfQBiuzJxsDvU4Lri3ifDHXHZW NqyIBDv23gxzZR6Q+J0RZaSZPyZlaw7jV4z+I4jqJmta1qfdaIKAYEJ93NzLJppzC5Iq mpZ95usOGX3pq/wYA1NDyhqmZlk47Xx9VZ8lGCFffIUnHE7Le0EGoy64yuhrpd6wZFKd oS9RpeGrKd4i41VepF62xDlDwplBMxylxepr3qKsE9N9TZtlE4ugdWArDuoN9URSh5LS QXmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sJDwU4Oi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r136-20020a37a88e000000b006b8e6d7e1edsi1153676qke.261.2022.09.29.05.48.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 05:48:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sJDwU4Oi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odsxs-0002RN-9b for patch@linaro.org; Thu, 29 Sep 2022 08:48:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrw7-0004OJ-Q5 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:40 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:35781) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrw5-0001Cy-NX for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:39 -0400 Received: by mail-wr1-x430.google.com with SMTP id u10so1641076wrq.2 for ; Thu, 29 Sep 2022 04:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=nhWT7dn5jhHKp/a/I3xktJp1WlGBzEtR15pMyKD1w7s=; b=sJDwU4OivINnhIbUJ6XrelocPypzGM7kWgWQG1YKHetGB3tZSIACOQOpsiyLs7d5aK /+uEGgEhuPzo1nlx9u9QeMRcsw/b1bYC9mEPZnyIa/YUiMqRCA7VeZkY71mdrABf27fz TcymzoWrjOmg6dDKdy7CLh5AjEkEp5xRhVSn5+dSuHcKYCcNCqLt1c82nK4b6RPcXMv1 WQBQ5xDBsXGhB/c3xA0pCggttyxI9bIVXHmRPNRCmzwIvvIzJioNInWQcfqEpMNMnDSi yn3+kAR2yBbB0jpHUy0zSO78qup5hD+kBE5cvKr5NMIMeBzPfHxVhAvs6FNK9+j3YZac ocvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=nhWT7dn5jhHKp/a/I3xktJp1WlGBzEtR15pMyKD1w7s=; b=7mUxUpyH8oyboun04oyTuU1fZOvh1RRe2e0CAPDEgPeh+SSeLVssPnm9MBnbt1bXa7 bKBXIpC70rq3cqXS9BePLCHzWfRDZ3d8FGTwCcZcff3ECCQgSA5pHLLtSB7Xp0eerALt YK1AtYUBBKQuAZ+uYLidT9KWnku3uY8C9RAxDRdnaBuwRpvapymw3alyK88momC7+IFy yix9NRLEKkUmaNKzx4e8rdMW2H5Y3PE9LKd95spuDRgQX33MylyO8fKgNIhLuSxSp5tC pY0Ei17Hy/4vAATwwwnJak+dXFamjHznko194wO0mVbXf9c8LtFh+KJ3SQrwmSNAL6oQ nU5A== X-Gm-Message-State: ACrzQf2vc1sKz2pDs9ysEV44pCrru1eAOAyC8J48Q+rgiWtDjNPIeG1O YpwTNtc7rdieiQGUYyMVPDJj6g== X-Received: by 2002:adf:fe08:0:b0:22b:311:afcd with SMTP id n8-20020adffe08000000b0022b0311afcdmr1950501wrr.629.1664451756036; Thu, 29 Sep 2022 04:42:36 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id k15-20020adfd22f000000b0021badf3cb26sm6897482wrh.63.2022.09.29.04.42.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:35 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ACD0F1FFC4; Thu, 29 Sep 2022 12:42:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 12/51] configure: do not invoke as/ld directly for pc-bios/optionrom Date: Thu, 29 Sep 2022 12:41:52 +0100 Message-Id: <20220929114231.583801-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Just use using the compiler binary, with -nostdlib in the case of the linker; the compiler driver (whether i686-*-gcc, or x86_64-*-gcc with the -m32 option) will then pick the right magic option to as and ld. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- configure | 22 +++++----------------- pc-bios/optionrom/Makefile | 12 ++++-------- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/configure b/configure index 52ae4adffc..aaa09fb957 100755 --- a/configure +++ b/configure @@ -2298,23 +2298,11 @@ probe_target_compiler i386-softmmu if test -n "$target_cc" && test "$targetos" != "darwin" && test "$targetos" != "sunos" && \ test "$targetos" != "haiku" && test "$softmmu" = yes ; then - # Different host OS linkers have different ideas about the name of the ELF - # emulation. Linux and OpenBSD/amd64 use 'elf_i386'; FreeBSD uses the _fbsd - # variant; OpenBSD/i386 uses the _obsd variant; and Windows uses i386pe. - for emu in elf_i386 elf_i386_fbsd elf_i386_obsd i386pe; do - if "$target_ld" -verbose 2>&1 | grep -q "^[[:space:]]*${emu}[[:space:]]*$"; then - ld_i386_emulation="$emu" - break - fi - done - if test -n "$ld_i386_emulation"; then - roms="pc-bios/optionrom" - config_mak=pc-bios/optionrom/config.mak - echo "# Automatically generated by configure - do not modify" > $config_mak - echo "TOPSRC_DIR=$source_path" >> $config_mak - echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_mak - write_target_makefile >> $config_mak - fi + roms="pc-bios/optionrom" + config_mak=pc-bios/optionrom/config.mak + echo "# Automatically generated by configure - do not modify" > $config_mak + echo "TOPSRC_DIR=$source_path" >> $config_mak + write_target_makefile >> $config_mak fi probe_target_compiler ppc-softmmu diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index e90ca2e1c6..3e06c11dea 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -20,28 +20,24 @@ override CFLAGS += $(call cc-option, -fcf-protection=none) # Flags for dependency generation override CPPFLAGS += -MMD -MP -MT $@ -MF $(@D)/$(*F).d -override CFLAGS += $(filter -W%, $(QEMU_CFLAGS)) override CFLAGS += $(call cc-option, -fno-pie) +override CFLAGS += $(call cc-option, -no-pie) override CFLAGS += -ffreestanding -I$(TOPSRC_DIR)/include override CFLAGS += $(call cc-option, -fno-stack-protector) override CFLAGS += $(call cc-option, -Wno-array-bounds) -Wa = -Wa, -override ASFLAGS += -32 -override CFLAGS += $(call cc-option, $(Wa)-32) - -override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds +override LDFLAGS = -nostdlib -Wl,-T,$(SRC_DIR)/flat.lds pvh.img: pvh.o pvh_main.o %.o: %.S - $(call quiet-command,$(CC) $(CPPFLAGS) -E -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$@") + $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<,"AS","$@") %.o: %.c $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,"CC","$@") %.img: %.o - $(call quiet-command,$(LD) $(LDFLAGS) -s -o $@ $^,"BUILD","$@") + $(call quiet-command,$(CC) $(CFLAGS) $(LDFLAGS) -s -o $@ $^,"BUILD","$@") %.raw: %.img $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"BUILD","$@") From patchwork Thu Sep 29 11:41:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610589 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp882082pvb; Thu, 29 Sep 2022 06:13:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4HOcLY26ns94JsbVPyzBhQDdllCm463hYx8sYqa9EgcrH6r86X6n7oKm2J/dDTaTYt8M6m X-Received: by 2002:a05:620a:4709:b0:6ce:d97a:fc9a with SMTP id bs9-20020a05620a470900b006ced97afc9amr2070096qkb.340.1664457181616; Thu, 29 Sep 2022 06:13:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664457181; cv=none; d=google.com; s=arc-20160816; b=P0ZJo9jQxJOiat4Tsip0DS2IDWuAWOelVR24x9GcFj3deVIriQ3skdImeNwLaUvL+/ URQsD84260lkFcuaXFJ8jVc9+yrSTdx9lsSgKyQ9ZNZD24bgX8p7CWvTFf5LmWXEnnZO MlBLmTZ2w3mYW8OwmmGqI8zMRS7weH3SuADKeSbwAsRYDVh8vQzvGuN7TCdVnEqzMM6s oEog/n6M6pspukL73f1R94NegtZ2yC/VZQzxaqxP8A79LReu6YOxBYrS/aLcI/2Yajfu fmnfl1Eq0zcx7/GeLDyhbNlIE8JjtMsa2LMMSftse9W1jUcqAvGH7wrnQp4Kp5d2yZ1j iHEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jvR/TDSR8cw2AhfrQlMzvGus+KFpvWKO7FCeQd/PjXU=; b=AHSD4a0Xsn/dFCfSuBDa6OIIjAE4xA6crrBSWJoAVb687iCV69pZ73WLlnnFHdOBht 9d3i0tQa3zdaQpnI3OCr8gKqwNNNUpMGrdl1E/zzQQWLbkTbR0iViSYQhFlWEO2rVt+z Vu5l9+apmK3UDYSJyt7sXIMp45mVuBQSJopzGvZQlz2nB8LD0hXkIlJocL3o2AapTdob m3gXemnwJr9Yzd9mJExJzk6BUwMcIdipK6WuCCU14xbYk17PIrmkph/TftHlBBRpuEic 5O0hfrlnIRZXHuo3wjP+d8qpPE1vQ80Nk65O2Ky5Lk15/5QL6jKJMKrsF8EkOnjYYDcM o/fQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uLi7xHYm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id jx11-20020a0562142b0b00b004aaaad81dffsi4783769qvb.199.2022.09.29.06.13.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:13:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uLi7xHYm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odtLZ-0007F7-5j for patch@linaro.org; Thu, 29 Sep 2022 09:13:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrwC-0004Xn-EJ for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:44 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:39486) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrwA-0001CG-Gq for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:44 -0400 Received: by mail-wr1-x42e.google.com with SMTP id cc5so1752637wrb.6 for ; Thu, 29 Sep 2022 04:42:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=jvR/TDSR8cw2AhfrQlMzvGus+KFpvWKO7FCeQd/PjXU=; b=uLi7xHYm8Cj3LFxxImqi4dXcixnyVoWVtroM3Ai/PvQEvbHSup1SyjKVP/P658fGMR V91WX3+9hKsEduaunB+9UTDOJzx0ah66S8buBs3K9TAbdqZrztt+yEUF89t8bm0ly90G 9PlZI1v1pAYkW32XQXQs10MOO+n13a0c5l9pVpSPQ4ebYiBOIZ2NK/9kf1aiKh6PI5at nk1SQh+8dfOrIP+IxHW+4s4+sTIBt4H0MslzEtR9Rcbn2EAYsa7hSpoIWraRjHZrYBeA e3R1HIeSWKkjajRNVlObpAMQ5xoUKW1Iv0OObtZT3vedUTfIpfkOVcJ1LmCpaTN+PIO8 b7yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=jvR/TDSR8cw2AhfrQlMzvGus+KFpvWKO7FCeQd/PjXU=; b=eHBO2F9Rl2MJnwTy6n0rDwLKy4YCHljRGXQKyNALnAu0mEvwwhPb2ulU9kvCY74NWj k3b64JR7wSyjDIG9vGCWE/zzJ/yjCO14YZ/KhbP8ZG02IiytEtERpDb2JQ5CP6fvBtxD bao9u7Iu1cXfBdG8amZ6S1wYPw6ywvHI7btFnasrzo0VMCI3N2SOD4kAFvJBVNR3pDTb VOVdWVZPdRqab/qkAeWf3Iw/iCZyFihdmcPEd0P/GdQD0cRjCO7Sam4pqmUsVvgan89H RHfGiX2eBBeThS7tA//UStzxVM0QOOx3PrwP4EOs/iQMbGc6oQIABrpyFqKsWQnPBzHZ Djjw== X-Gm-Message-State: ACrzQf2Y98WsNuYG31sEUStLvjKGXhNDSM44/uOPJ52w71J3bNHzsTVp PAye3E527Jobm8MsFsgfbRyh5A== X-Received: by 2002:a5d:460f:0:b0:22c:c851:40d4 with SMTP id t15-20020a5d460f000000b0022cc85140d4mr1980809wrq.130.1664451761795; Thu, 29 Sep 2022 04:42:41 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m6-20020adfe946000000b0022af63bb6f2sm4349086wrn.113.2022.09.29.04.42.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C32011FFB7; Thu, 29 Sep 2022 12:42:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 13/51] pc-bios/optionrom: detect CC options just once Date: Thu, 29 Sep 2022 12:41:53 +0100 Message-Id: <20220929114231.583801-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini In preparation for adding Docker container support, detect compiler options just once rather than once per Make run; container startup overhead is substantial and doing the detection just once makes things faster. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- pc-bios/optionrom/Makefile | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 3e06c11dea..f514e4f84b 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -8,23 +8,33 @@ all: multiboot.bin multiboot_dma.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bi CFLAGS = -O2 -g -quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) -cc-option = $(if $(shell $(CC) $1 -c -o /dev/null -xc /dev/null >/dev/null 2>&1 && echo OK), $1, $2) - -override CFLAGS += -march=i486 -Wall $(EXTRA_CFLAGS) -m16 +NULL := +SPACE := $(NULL) # +TARGET_PREFIX := $(patsubst %/,%:$(SPACE),$(TARGET_DIR)) -# If -fcf-protection is enabled in flags or compiler defaults that will -# conflict with -march=i486 -override CFLAGS += $(call cc-option, -fcf-protection=none) +quiet-@ = $(if $(V),,@) +quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) # Flags for dependency generation override CPPFLAGS += -MMD -MP -MT $@ -MF $(@D)/$(*F).d -override CFLAGS += $(call cc-option, -fno-pie) -override CFLAGS += $(call cc-option, -no-pie) +override CFLAGS += -march=i486 -Wall $(EXTRA_CFLAGS) -m16 override CFLAGS += -ffreestanding -I$(TOPSRC_DIR)/include -override CFLAGS += $(call cc-option, -fno-stack-protector) -override CFLAGS += $(call cc-option, -Wno-array-bounds) + +cc-test = $(CC) -Werror $1 -c -o /dev/null -xc /dev/null >/dev/null 2>/dev/null +cc-option = if $(call cc-test, $1); then \ + echo "$(TARGET_PREFIX)$1 detected" && echo "override CFLAGS += $1" >&3; else \ + echo "$(TARGET_PREFIX)$1 not detected" $(if $2,&& echo "override CFLAGS += $2" >&3); fi + +# If -fcf-protection is enabled in flags or compiler defaults that will +# conflict with -march=i486 +config-cc.mak: Makefile + $(quiet-@)($(call cc-option,-fcf-protection=none); \ + $(call cc-option,-fno-pie); \ + $(call cc-option,-no-pie); \ + $(call cc-option,-fno-stack-protector); \ + $(call cc-option,-Wno-array-bounds)) 3> config-cc.mak +-include config-cc.mak override LDFLAGS = -nostdlib -Wl,-T,$(SRC_DIR)/flat.lds @@ -50,7 +60,10 @@ include $(wildcard *.d) clean: rm -f *.o *.d *.raw *.img *.bin *~ +distclean: + rm -f config-cc.mak + # suppress auto-removal of intermediate files .SECONDARY: -.PHONY: all clean +.PHONY: all clean distclean From patchwork Thu Sep 29 11:41:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610582 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp870293pvb; Thu, 29 Sep 2022 05:56:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5viEm3dunmY8VUR3G6pKIU7E8hxVZTbmXHteA7smbqJXEn2Vmi/TH3yY5UNxA6e8RF32dS X-Received: by 2002:a37:424e:0:b0:6ce:b59:5735 with SMTP id p75-20020a37424e000000b006ce0b595735mr2062489qka.115.1664456217710; Thu, 29 Sep 2022 05:56:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664456217; cv=none; d=google.com; s=arc-20160816; b=vIP6pXa2eOaflXpCFBhHi1NRO9x0BOEdujeGek7q3dAG8AeKsYyl69eP5OkE78IpJE H4fKiQSNIs6S7BXdAgzwNqRO0XP+6+PJCctp3uXstb/HxrHhZ2THQHDRP1IUIJ+bdQII nFOVA8j4yRpuBxKi8S43Qr5ykv9aX4ynXd552WRAYuBrdybRccR8yHvs3TqgZNhliwdf EAC1DyndOPL1ld/LHrqO/6f3y5SZ2o49TEdq2ASs3zJ9emEoJ2WU3ztVoAI7IN0gTs6t GWpX284s2UZ6XnL8QV8x3Pb6mCB5KpDgHjBwEF5QJUaeFLxXyaG2LUv8l0BvRFQTFYbJ jDrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uQdXxIltIBqxlqRXaWUabtXFolq1I3oIKJXyfpV9mzg=; b=o2u1VJKfCDnm2fZU/F6A2XGaKxI350HTSSpBPb4dpMKsCjW0BuGZJRScDmiV6OfWm2 Vs9feZjDjoBSGArImhjRfFOVTPuB1qRu7T0rG/6Hhk+pfo/rJobB3/CaBg6U152g1hqo u+GXledWXvowkcRSivnI3ZgO0mfu3AVQT/RNhEFImrfYbJBXgvuS6ZFewal8acO2h6dm omS71WzO08PB6kYfblsVmPsRjhfP1ti9+tya6EN+tc2aHszxoj+s5kbortJqtpE0Wdme diKZdk/TlpnzjboQjxvg8Jzos8VnmE8pelMiD6FtI9h0CT74ddmP/tdoIYiVzkawRenj 0c3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DMXbG7L3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y13-20020a37f60d000000b006cebeaa4cb0si1040258qkj.650.2022.09.29.05.56.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 05:56:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DMXbG7L3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odt61-0002gW-6c for patch@linaro.org; Thu, 29 Sep 2022 08:56:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60264) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrwC-0004YD-TB for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:44 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:42604) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrwB-0001F1-3w for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:44 -0400 Received: by mail-wm1-x336.google.com with SMTP id o20-20020a05600c4fd400b003b4a516c479so597213wmq.1 for ; Thu, 29 Sep 2022 04:42:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=uQdXxIltIBqxlqRXaWUabtXFolq1I3oIKJXyfpV9mzg=; b=DMXbG7L3W4U8nB50T0H7Sthy9mrno10SnPPbj3vL7qJfCkLlMk3ss/pB+JBw7oDS6w x75wGLmFSfUO35woQvlPTbB06ydKh8DK+3e8qYUHepl29tJdY6v/s7rO+PioeTBw1Xos 60L7aAA6F20pBLLUXQVYvF5VfPRD5TcPIMzteLgtd9Yas05UkxvLUGzRfo9Li+5dPmGH 3TR4h0CCS0Oxa0ROGQfjVb9jslaUfp53NKpcBHgfZno1Pj8AeSTler+j5tj+D4afa5sU Yd2GGwsL7j4lV0640qG1xGos93qU+qmPSyRLbF3gv1PUxjI0dexebFvN+Vi52Cdn7kSz HnWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=uQdXxIltIBqxlqRXaWUabtXFolq1I3oIKJXyfpV9mzg=; b=7SL27EdHfg/vREeKbDYsM3m8/9utv+8zF5IOjJBF4tYRcC3FrJhmbhMYaxmZmh7ZSu ynLpHXHpCJsihSSxljzOhn1v+5d9h6EDI36c58suvPzbGBgS3QWkramb+TN9doVgsnXt h3R++4tdAC8FvRWbv6ubcRQMkvJiQp4KqZolrKQ0ITf0P16+GimpGeZbsNBXmAMDxydz LfdZeGd/K6xhgfgXonJpXBao9DtfcUgjB/q3VYeJHaosV2W/Cg7DBHq3WUof6hzmNDSr duHmRckjVIP9o9NBOBs3L5IL2FV2tFNmzqavG4wBCFK1DPAYan1waEDD2JpEKNqFyvQc PjzQ== X-Gm-Message-State: ACrzQf1k6v+BaNU3NvGYmWLiuXP2oewSck7vopbkpBH/7TzTWaRCyh47 KaDdNkkLlS6Asy9gAyAlsUr8kA== X-Received: by 2002:a7b:c8d6:0:b0:3b4:868b:afc3 with SMTP id f22-20020a7bc8d6000000b003b4868bafc3mr10077214wml.66.1664451761349; Thu, 29 Sep 2022 04:42:41 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id v13-20020a05600c214d00b003b505d26776sm4060860wml.5.2022.09.29.04.42.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DE16D1FFC5; Thu, 29 Sep 2022 12:42:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Cornelia Huck , Thomas Huth , Christian Borntraeger , qemu-s390x@nongnu.org (open list:S390 general arch...) Subject: [PATCH v1 14/51] pc-bios/s390-ccw: detect CC options just once Date: Thu, 29 Sep 2022 12:41:54 +0100 Message-Id: <20220929114231.583801-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini In preparation for adding Docker container support, detect compiler options just once rather than once per Make run; container startup overhead is substantial and doing the detection just once makes things faster. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- pc-bios/s390-ccw/netboot.mak | 7 ++----- pc-bios/s390-ccw/Makefile | 33 +++++++++++++++++++++++++-------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak index 7639da194c..ee59a5f4de 100644 --- a/pc-bios/s390-ccw/netboot.mak +++ b/pc-bios/s390-ccw/netboot.mak @@ -16,12 +16,9 @@ s390-netboot.elf: $(NETOBJS) libnet.a libc.a s390-netboot.img: s390-netboot.elf $(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@") -# SLOF is GCC-only, so ignore warnings about GNU extensions with Clang here -NO_GNU_WARN := $(call cc-option,-Werror $(QEMU_CFLAGS),-Wno-gnu) - # libc files: -LIBC_CFLAGS = $(EXTRA_CFLAGS) $(CFLAGS) $(NO_GNU_WARN) $(LIBC_INC) $(LIBNET_INC) \ +LIBC_CFLAGS = $(EXTRA_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \ -MMD -MP -MT $@ -MF $(@:%.o=%.d) CTYPE_OBJS = isdigit.o isxdigit.o toupper.o @@ -55,7 +52,7 @@ libc.a: $(LIBCOBJS) LIBNETOBJS := args.o dhcp.o dns.o icmpv6.o ipv6.o tcp.o udp.o bootp.o \ dhcpv6.o ethernet.o ipv4.o ndp.o tftp.o pxelinux.o -LIBNETCFLAGS = $(EXTRA_CFLAGS) $(CFLAGS) $(NO_GNU_WARN) $(LIBC_INC) $(LIBNET_INC) \ +LIBNETCFLAGS = $(EXTRA_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \ -DDHCPARCH=0x1F -MMD -MP -MT $@ -MF $(@:%.o=%.d) %.o : $(SLOF_DIR)/lib/libnet/%.c diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile index c8784c2a08..965e633f43 100644 --- a/pc-bios/s390-ccw/Makefile +++ b/pc-bios/s390-ccw/Makefile @@ -6,9 +6,12 @@ include config-host.mak CFLAGS = -O2 -g MAKEFLAGS += -rR +NULL := +SPACE := $(NULL) # +TARGET_PREFIX := $(patsubst %/,%:$(SPACE),$(TARGET_DIR)) + +quiet-@ = $(if $(V),,@) quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) -cc-option = $(if $(shell $(CC) $1 $2 -S -o /dev/null -xc /dev/null \ - >/dev/null 2>&1 && echo OK),$2,$3) VPATH_SUFFIXES = %.c %.h %.S %.m %.mak %.sh %.rc Kconfig% %.json.in set-vpath = $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath $(PATTERN) $1))) @@ -25,22 +28,33 @@ QEMU_DGFLAGS = -MMD -MP -MT $@ -MF $(@D)/$(*F).d $(call quiet-command,$(CCAS) $(EXTRA_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) \ -c -o $@ $<,"CCAS","$(TARGET_DIR)$@") -.PHONY : all clean build-all +.PHONY : all clean build-all distclean OBJECTS = start.o main.o bootmap.o jump2ipl.o sclp.o menu.o \ virtio.o virtio-scsi.o virtio-blkdev.o libc.o cio.o dasd-ipl.o -EXTRA_CFLAGS := $(EXTRA_CFLAGS) -Wall -EXTRA_CFLAGS += $(call cc-option,-Werror $(EXTRA_CFLAGS),-Wno-stringop-overflow) +EXTRA_CFLAGS += -Wall EXTRA_CFLAGS += -ffreestanding -fno-delete-null-pointer-checks -fno-common -fPIE EXTRA_CFLAGS += -fwrapv -fno-strict-aliasing -fno-asynchronous-unwind-tables -EXTRA_CFLAGS += $(call cc-option, $(EXTRA_CFLAGS), -fno-stack-protector) -EXTRA_CFLAGS += $(call cc-option, $(EXTRA_CFLAGS), -Wno-array-bounds) EXTRA_CFLAGS += -msoft-float -EXTRA_CFLAGS += $(call cc-option, $(EXTRA_CFLAGS),-march=z900,-march=z10) EXTRA_CFLAGS += -std=gnu99 LDFLAGS += -Wl,-pie -nostdlib +cc-test = $(CC) -Werror $1 -c -o /dev/null -xc /dev/null >/dev/null 2>/dev/null +cc-option = if $(call cc-test, $1); then \ + echo "$(TARGET_PREFIX)$1 detected" && echo "EXTRA_CFLAGS += $1" >&3; else \ + echo "$(TARGET_PREFIX)$1 not detected" $(if $2,&& echo "EXTRA_CFLAGS += $2" >&3); fi + +config-cc.mak: Makefile + $(quiet-@)($(call cc-option,-Wno-stringop-overflow); \ + $(call cc-option,-fno-stack-protector); \ + $(call cc-option,-Wno-array-bounds); \ + $(call cc-option,-Wno-gnu); \ + $(call cc-option,-march=z900,-march=z10)) 3> config-cc.mak +-include config-cc.mak + +LDFLAGS += -Wl,-pie -nostdlib + build-all: s390-ccw.img s390-netboot.img s390-ccw.elf: $(OBJECTS) @@ -63,3 +77,6 @@ ALL_OBJS = $(sort $(OBJECTS) $(NETOBJS) $(LIBCOBJS) $(LIBNETOBJS)) clean: rm -f *.o *.d *.img *.elf *~ *.a + +distclean: + rm -f config-cc.mak From patchwork Thu Sep 29 11:41:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610591 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp887818pvb; Thu, 29 Sep 2022 06:21:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4ygy0mq4gGZZUMWdQS/lgJ1QuG+ZW9mqS1OvJSKs0eOowiuxXl6b/HVRmNcrGJtL0QTrgW X-Received: by 2002:ac8:598b:0:b0:35c:d6a4:ba0a with SMTP id e11-20020ac8598b000000b0035cd6a4ba0amr2313736qte.663.1664457711470; Thu, 29 Sep 2022 06:21:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664457711; cv=none; d=google.com; s=arc-20160816; b=l9GEtodt19J5+WDZVim77f9KkahEJs4qjsPE/BgrvItc0rwXhsUEDu4Re3u8NTciot J40FE7h7Qy2LWTfG+vR3g9aj2kAC7n9XZlkcMiE6lRCW7d/eWk7ae0lRj+osyJQV/SVh BDNKc6lzTeFdQoclQaGuOF1kQ4+t0ZJ5t/mNCewVMnyyqnlpuLBSgMQFFv07CNYmARw+ Z1dZDauyG6xUWUHhwPq328OAgrilEhnteci3J8/Z+yfowSveickMQP8dKLx395x1Ty+L O8R05u9Zir7oG+faNDP5l3+pbYrrJqx6UQq1jMdczAQx/1Vki47VOr1PY6ZNk5hrWIN2 edkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ftciCRJk7qPjoxyx1ixtcBcODABLdBXn8O/3ifVXrzE=; b=FKTlQdbGFtIgZWu3ySpsatjzCxKumo8NyT6I+33WhQeDndnjcmRPc7PzFrXhpN/Zp7 g1pHAm4HcNVjPcqdug0Vbaz0FrIV+5YKJM/70TpMXI3TOBPbQZc/ssGd3GsvtKSlZDAh 3IPKsq2VQUcBpb2EzHyVdNvzhqkWSBR9oZmiJVvw47NyHTS6OKTQs4fv3J3tWvz7hJKO DenD3ksWZ+0q2vkaG9fru1SNhLMLGfS0SIV+I2JWDzCr/twIRoweBvpG/7eu7VnX4SSY DGNllFwAJ6L33crqRZ0L7FSr59f7hbqja8vTZREUWHgZBOOCnKAANwvdWg8/H6GqKbrG Pjkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oKIemvRY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bq22-20020a05622a1c1600b0035cb8f99cccsi1210015qtb.484.2022.09.29.06.21.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:21:51 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oKIemvRY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odtU6-00054Y-U7 for patch@linaro.org; Thu, 29 Sep 2022 09:21:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrwD-0004a6-Me for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:45 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:41539) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrwC-0001Fa-1P for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:45 -0400 Received: by mail-wm1-x332.google.com with SMTP id fn7-20020a05600c688700b003b4fb113b86so601604wmb.0 for ; Thu, 29 Sep 2022 04:42:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=ftciCRJk7qPjoxyx1ixtcBcODABLdBXn8O/3ifVXrzE=; b=oKIemvRYhbku3DpOvwXFaacaIwt2j5s8nSciAs6K8TKBYT/F6wq90HwXW+9g1w8SWl Y2dAr6iYiX4xxp4YON6SIHiIxiypMXjF0/6uTbW4MeDMa1vmFeIaMhuJXe/4/ODXXOy+ 5mKCbGqfJXyojKCAJJWKb/5Ab9JyLFZBPbD/rFOGv9gyks93p8UVLFDHnJGmwrDgQHbf sAqAR9QocMV0BwSJFPZiHyuA/wB/gBJ+c9wxfZqa209Q2mTAsAN3bN6xn6mr5WsLyzvh tXPk6Wt4R19wdw9YPTwSGREsnmV0Pv5zFDEkn0QGQ98u3pFv+dKoyQy5cBf8IsOKQhOi INkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=ftciCRJk7qPjoxyx1ixtcBcODABLdBXn8O/3ifVXrzE=; b=j/uiLQrG8M7a3peaab6r+3n8X7kQ0JC8mykGu72090EpE7Sm6AucCa74Vcnyhn6LyA 3c/XhRoz2ifh/qKUHpqk4iaxAQIVCHBMHIbLVt6Kxgz/8qs2HKGsLh+4dUXnY81I5Srd ip4oARi2ZmbEqOj+hm1i5Wz+v0r+Jt/5IYzziUhPPioFeIDd/Fhmr9gGyJqSIFf8h78z oZICmG6pY7JBR8x7oMTdi03fWGKQLnEeZbymUCaiwi4/wev0txmZ133/NUMou2w+VWPZ MEV76yFmd1OPtAkYk5AEKzV5N3sZtOXPtovIKjwCP/8Izirp1FdpRjBnf4uMrwLuehSU 7Y2w== X-Gm-Message-State: ACrzQf3W4kj/AJ+siPtcRlwbFPd1G2bPzENwaotk9tqmnVtQ+aaGs7un DO66pitABQzmdzKCt340YoTeyg== X-Received: by 2002:a05:600c:216:b0:3b4:874c:61e6 with SMTP id 22-20020a05600c021600b003b4874c61e6mr10494584wmi.116.1664451762741; Thu, 29 Sep 2022 04:42:42 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n43-20020a05600c502b00b003a83ca67f73sm4406718wmr.3.2022.09.29.04.42.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 021791FFC6; Thu, 29 Sep 2022 12:42:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Alexey Kardashevskiy , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Daniel Henrique Barboza , David Gibson , Greg Kurz , qemu-ppc@nongnu.org (open list:Virtual Open Firm...) Subject: [PATCH v1 15/51] vof: add distclean target Date: Thu, 29 Sep 2022 12:41:55 +0100 Message-Id: <20220929114231.583801-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- pc-bios/vof/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pc-bios/vof/Makefile b/pc-bios/vof/Makefile index 8809c82768..990f26af31 100644 --- a/pc-bios/vof/Makefile +++ b/pc-bios/vof/Makefile @@ -19,4 +19,6 @@ vof.elf: entry.o main.o ci.o bootmem.o libc.o clean: rm -f *.o vof.bin vof.elf *~ -.PHONY: all clean +distclean: + +.PHONY: all clean distclean From patchwork Thu Sep 29 11:41:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610584 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp872319pvb; Thu, 29 Sep 2022 06:00:35 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7a8n/e98sZ6hqSXTb6Q2G3b+OMj5Sr97T5M4CKwc3pMNeXtjALRs8TtIQxMbbwljkz7QxU X-Received: by 2002:a05:6214:2621:b0:4af:9c01:a747 with SMTP id gv1-20020a056214262100b004af9c01a747mr2329042qvb.120.1664456435463; Thu, 29 Sep 2022 06:00:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664456435; cv=none; d=google.com; s=arc-20160816; b=IGa5ug1No1Mm4o9QXaZqF8AjzOPhJjb3BIupa913+7mNgczoizoDLC/E/qIES8elOW lrLqiQrL+t0jmKXrVGs6n9S0v3QaPD3OJtm/qgXpId1XpmoPKY3vYUc0y+g6Fb8FUV7K fJ9L8e4av8DMgH1NZDiybWgR0xw7a2pBvDbXXLdbZKPWlhO1VaqwfS38kPG5hEMQiPn+ lWMslChWxhyuNvxQ+WxOb76otua+rBT14XSAIyovCIDstNWf9tnF4l+zhs3xH+31OxX5 au0N5TY0inF5Jb4RFYt1qKRUX5wjgN16uRyD1H2YAAgiYo3qdVbyunD1RsQthc8aUDxm ycjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=yjAfNNAxyxkA6bbj5wcYil3jVmy6SPpXlGorSEsyun4=; b=kfWv0IoD6JSY1rIVte6LuWlsBYOeOBJzkbmTdVnndaZXhBkqz3JSap4IgbJpe1At1u yHYM+i2D4CTxlV8RGOEYws4mBB2hBgdTPheB3vRGPYrT4Ilv3fmjL4uFmyNweH2ekO1U baJaqfeYfeOByCAnSffAEomeyode7ad/dWcfGgahs2ehSjwsVJ6TkfhADX2YR5H/ohWR L42ZkrHpM0p3IS3DlLEfm69rt12quLx9qG5ZEc7SUGbMQWKkrnx7NeTVns7rq++txP// WqoITSYyapzvAj4HEeouiZXXjLpQ0vf0HSrmQxJV7vMMUX1WqgAFjqIZnLY5EHwpQTBU g7yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JDsAagkE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o23-20020ac85557000000b0033ab157759asi1063058qtr.771.2022.09.29.06.00.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:00:35 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JDsAagkE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odt9V-0007Hi-8B for patch@linaro.org; Thu, 29 Sep 2022 09:00:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrwD-0004aO-PT for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:46 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:46753) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrwB-0001C1-Q0 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:45 -0400 Received: by mail-wr1-x432.google.com with SMTP id bk15so1727760wrb.13 for ; Thu, 29 Sep 2022 04:42:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=yjAfNNAxyxkA6bbj5wcYil3jVmy6SPpXlGorSEsyun4=; b=JDsAagkEEFKbFUNpJV8Ehr2/EV1dnLT/tb5FRIwFncCgL7SMnoPMDOb1KrMB1U3+1i tcj2Hw633usg8Bhty/JYq8sn8zWI0huuJ+q0VZt4xlNzgdsy8MZTO0+BGXCqdBOj4rdq YGxFPTGXBZFPxAJFvrCemFeMApwBJqIH35BptcGQ82JnbH7WoD1OL3JvB+J8hgOLacwT 7dTXH4XQIu7U8WlCOPGhFaSpsupYoCTRh/ge4l4KOhrbKdHJ74aiiZOgmd/oPDgiFx7a V9DnCerLZvwb3uX1EsAujgQhXcsbPGSQvcyTePE/8vxa1lJudU8xrG+syYyZ+BmYgdTC qYKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=yjAfNNAxyxkA6bbj5wcYil3jVmy6SPpXlGorSEsyun4=; b=fr3uW9W4YjsUDQqG+sNA8ngWv9KJMmH0j51xg/s3t0ofDwv+E+BGScv0kQSST21G7C 3azvTQtQe3eXWaflCY0QWUSo+cAkVI4uMyVqGK9t74bl3AlQcyX++U66nX0q/yNtZZS1 SuxsZxSp4Ics6X82fWvkM/M7loaUGNbIUx9mbchxHB5F5sTCahA7Yk9GngL7DdPk2hJt m9YCmrC2iCMRRNy7otxiCORhNqPmb6KYOw11+lFKfGCjvq0j2i0FPfBDUjhYdOlgXocC dKG/9p13KMHk2GkARY6MvIvLhTIH1UuN71svbJ8PHWxpmNDXEsx3vxrO4zQARyqw9FIq 3hMw== X-Gm-Message-State: ACrzQf297FGZKfwfU9YNhNZTh0iJXGciIFuPagq4PMG9wlX7c1Bbt/l6 DQuOHI1TE0NskiQcb7HBeTaCVQ== X-Received: by 2002:a5d:5944:0:b0:22a:c2d1:e3fe with SMTP id e4-20020a5d5944000000b0022ac2d1e3femr1913484wri.261.1664451763101; Thu, 29 Sep 2022 04:42:43 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id s15-20020adfeccf000000b00228d6edade0sm6745785wro.46.2022.09.29.04.42.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1814A1FFC7; Thu, 29 Sep 2022 12:42:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 16/51] build: add recursive distclean rules Date: Thu, 29 Sep 2022 12:41:56 +0100 Message-Id: <20220929114231.583801-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b576cba5a8..0fcde48bec 100644 --- a/Makefile +++ b/Makefile @@ -186,7 +186,7 @@ include $(SRC_PATH)/tests/Makefile.include all: recurse-all -ROMS_RULES=$(foreach t, all clean, $(addsuffix /$(t), $(ROMS))) +ROMS_RULES=$(foreach t, all clean distclean, $(addsuffix /$(t), $(ROMS))) .PHONY: $(ROMS_RULES) $(ROMS_RULES): $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" TARGET_DIR="$(dir $@)" $(notdir $@),) @@ -194,6 +194,7 @@ $(ROMS_RULES): .PHONY: recurse-all recurse-clean recurse-all: $(addsuffix /all, $(ROMS)) recurse-clean: $(addsuffix /clean, $(ROMS)) +recurse-distclean: $(addsuffix /distclean, $(ROMS)) ###################################################################### @@ -214,7 +215,7 @@ dist: qemu-$(VERSION).tar.bz2 qemu-%.tar.bz2: $(SRC_PATH)/scripts/make-release "$(SRC_PATH)" "$(patsubst qemu-%.tar.bz2,%,$@)" -distclean: clean +distclean: clean recurse-distclean -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || : rm -f config-host.mak qemu-bundle rm -f tests/tcg/config-*.mak From patchwork Thu Sep 29 11:41:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610595 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp897911pvb; Thu, 29 Sep 2022 06:40:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7zwMcDCHMM2zYfPAl5zpdDfcQZvB3bkeZolU9GNaJQOAJKHxo2EUKIZ/8zk+V51d0dfi8c X-Received: by 2002:a05:622a:151:b0:35d:53eb:c16e with SMTP id v17-20020a05622a015100b0035d53ebc16emr2425385qtw.174.1664458805563; Thu, 29 Sep 2022 06:40:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664458805; cv=none; d=google.com; s=arc-20160816; b=ik3Xm4fxUs1NJR/7WL8vZadrz8SgVR2rhyK9p2OfYBR1IbDdMaNHep8Svlhxz01SXt +HCwHkmzGc3JhjRVWUCQWjMAGGYsye/MAr1A4eFeNyZnkXDAzKGgoX3lEachEidGSA4z bmzNO5UYgWU/kN8F9YM0rSbuvE0pAIRhv+VKCqD+UwUxLrSYyu1LZmLhY43E0JfoBrtW 9KyjsQeW+9O0qUe/8tSsPm6Pf79Upfn3G09FEoUHs19q6+i90X9/8CjRV6zwHvIsD7zE JLogffiKe6Njvywu1EiGNqgGiMvh4+BkEZ4Y5OfllhBulzq9TBZBB70juNhyeGdKN/Vf Mh+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bDsi1hD1+ihs67mXhxzoSRQtyb3yN1ThtBgdcOSD36c=; b=C61UYcGBuSmgGyIvFT7urpdCYbfbLsYd1KgWv7/ThVmFwLn53FtifCq9Sm0yuMcdj/ 3SODqs8RarmNxRpe+Ih4O8mYQCGEmcuzsoLWRfZuHXzkxMtET5uJFUp45deK4MI31s5j 4FciWnYnRoeDBar+lL3NYBeTlMa+ZU+rmjZHgg18Uwn6B8cLw+p/22ams6Z77yTj4GMt hFEgCznodJM+8Rwo/Y8rGesCFf1/I1jGHQoaEpv7wP+qaAW6cZiU+UTd+/JvpCgse1qp cv3NOKL39qg7VS4+CgHXpkGmagulsViPIOqZJtPC5/lIIsbea8ejKgj7PMKkaV29Df1/ Z/Aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pKD8eQXF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r12-20020a0562140c4c00b0049911b37513si4426781qvj.454.2022.09.29.06.40.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:40:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pKD8eQXF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odtll-0000wW-3j for patch@linaro.org; Thu, 29 Sep 2022 09:40:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3J-0000NV-2U for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:06 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:46069) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods3B-0002O4-Vq for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:01 -0400 Received: by mail-wm1-x331.google.com with SMTP id d12-20020a05600c3acc00b003b4c12e47f3so596499wms.4 for ; Thu, 29 Sep 2022 04:49:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=bDsi1hD1+ihs67mXhxzoSRQtyb3yN1ThtBgdcOSD36c=; b=pKD8eQXF49dNFMfhSCUfvN2ESHSotI5Jk5EEjIZuAur/sBUmbgDsbwtGoUFNqc3Muw /KEORLv2pAkS/FUawfakmP9HUhE/Sax8/G4WMtRfhQrJKMtabW9Jz6HWYKOBYbUoxLO1 vWFvIDpM+fbIQ1bW08ixO9973jLv5sZ0nXh7Lylz5hUmDUMUZtToqJ9MOZFRGfKznVZe I+Iumn+790KZOwA6JhXd31AlsBZJP1JzGcZa39Ko2cPi+SPWPQoULOEd47JSrNYrWXAI +Plpa9npxcIX7kNAdQc4BjtLnitX6htT0DMDoWIiGcWleqya9zqlX7GtKZktLXKhZkXV uhIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=bDsi1hD1+ihs67mXhxzoSRQtyb3yN1ThtBgdcOSD36c=; b=AnGqHPyBoBnpjuOGeBZsQ+fpBH4D3dG2Udh6EWcrbFUgDNtn7Ep+kluezaRQmiYiP9 pU2gjWz25o280C/o2Dk4a6HUfeykGpXDMyFnZQ7Awygi7mjcNhYwjY9k8scBWEqmVy1L dW+ZMgYY9E+L9Z73OBA8EaF8XiKQTjWGbHf+X+RqjFvPEQETZVzNREvzzbG4kynrC1T7 Rc4KWfiCIv2Z9EXwBU+FPOTcve45tJ/SBUF/5zFE6SAJp7ji1NA8vPlek7RIpVDtPdjy j18fAw8lmHJcu8hB7klUpoOea6M16rfhV9t7XWqw2tO+m5Ui9e/I8yRSrXjD2oH9zaYM 8TYw== X-Gm-Message-State: ACrzQf1B8SS3fnuKm0zY7xRXj35pEUsAra5Ew1Y6K+kqV87W13+37RP0 34bnmNpJZqaTFRGFNLqYgrYuqA== X-Received: by 2002:a05:600c:35d2:b0:3b4:a897:d48 with SMTP id r18-20020a05600c35d200b003b4a8970d48mr10573298wmq.48.1664452195739; Thu, 29 Sep 2022 04:49:55 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m11-20020a05600c4f4b00b003b31c560a0csm4369306wmq.12.2022.09.29.04.49.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 31C011FFC8; Thu, 29 Sep 2022 12:42:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 17/51] configure: return status code from probe_target_compiler Date: Thu, 29 Sep 2022 12:41:57 +0100 Message-Id: <20220929114231.583801-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini For now, return 1 for container-based compilers. This will change as soon as ROMs will be buildable with them. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- configure | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/configure b/configure index aaa09fb957..f3984bb193 100755 --- a/configure +++ b/configure @@ -2147,6 +2147,7 @@ probe_target_compiler() { target_ranlib= target_strip= fi + test -n "$target_cc" } write_target_makefile() { @@ -2294,10 +2295,9 @@ done # Mac OS X ships with a broken assembler roms= -probe_target_compiler i386-softmmu -if test -n "$target_cc" && - test "$targetos" != "darwin" && test "$targetos" != "sunos" && \ - test "$targetos" != "haiku" && test "$softmmu" = yes ; then +if test "$targetos" != "darwin" && test "$targetos" != "sunos" && \ + test "$targetos" != "haiku" && test "$softmmu" = yes && \ + probe_target_compiler i386-softmmu; then roms="pc-bios/optionrom" config_mak=pc-bios/optionrom/config.mak echo "# Automatically generated by configure - do not modify" > $config_mak @@ -2305,8 +2305,7 @@ if test -n "$target_cc" && write_target_makefile >> $config_mak fi -probe_target_compiler ppc-softmmu -if test -n "$target_cc" && test "$softmmu" = yes; then +if test "$softmmu" = yes && probe_target_compiler ppc-softmmu; then roms="$roms pc-bios/vof" config_mak=pc-bios/vof/config.mak echo "# Automatically generated by configure - do not modify" > $config_mak @@ -2316,8 +2315,7 @@ fi # Only build s390-ccw bios if the compiler has -march=z900 or -march=z10 # (which is the lowest architecture level that Clang supports) -probe_target_compiler s390x-softmmu -if test -n "$target_cc" && test "$softmmu" = yes; then +if test "$softmmu" = yes && probe_target_compiler s390x-softmmu; then write_c_skeleton do_compiler "$target_cc" $target_cc_cflags -march=z900 -o $TMPO -c $TMPC has_z900=$? From patchwork Thu Sep 29 11:41:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610598 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp899822pvb; Thu, 29 Sep 2022 06:43:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Q1W/oAEspoolamcsyfN6fyPq1cq3xKycLTFBnvasU1eBNZJGhgbRSOhOQpx2u8rljE4/h X-Received: by 2002:a05:6214:2345:b0:473:a82c:34eb with SMTP id hu5-20020a056214234500b00473a82c34ebmr2588215qvb.9.1664459034308; Thu, 29 Sep 2022 06:43:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664459034; cv=none; d=google.com; s=arc-20160816; b=i+eBIJVXbrl1UAwj17BHVErSM0cpHnByFp6rE0X7FbYp2yNFWfeht10cyDgpf/PPFF fcTrbsmVVz4ljQVOZAisuozBQ+PawqQzAGRc7FzdaBdDeVUknFQTJnx9FP7j6HbRXtXO nvP+eClYsK9MsepAaQI+GfjRoqskeLO6EmjeevO8ywy3qlYrbS+N7wO0rzslR1Xq83bB Goit70MCeP2fEBNQ4zx7uI/xKZksDdH7qZIFyCAHrGa7w78ZnK6nbFeBNOaE97RBmj9L lneLdYzH24JclPgwNfnNR6+dpyLqZzWPB7i+lgd8JjnWBikF2TBfbEDURzk13tgR1pnM UQBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=y7ztg4FO2RX9qokS5MY3bU2yllpC+y9KMjpt1S6fvtU=; b=CcNVexKhaRisEEZM6k1AzTBETtUrAYZRtCKsMZIEERRnkCQHvGYnp5pO9B/VzyIe97 nPcGN0Yw3wdDy+P8ZqiHwHD2Rah/DiM6mlhKHJN+oX6QVjzfyqNIio+k5YA6DycmHnHm o0GNO/t7u1HqiNrO+6gTRJgqGIj2wihmOxdXhVyk7m9rlvOV1tQsQgB8hZg3XkpWNsRL WBSz+0OriUAlx7zXefjBG75THu/RxqN9JNXCtYCYMhAAbU63rAhUxu+q52kCs9U7y6eP NFlSoe2Gq3WkNEaSuFg9cGyHj7KCS0coufx+dTVcHoakjCZ/IDGf2i8RptikdJ0FeCi3 ThUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H9Yf8HRx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t4-20020a05620a450400b006bc6a321891si1429697qkp.46.2022.09.29.06.43.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:43:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H9Yf8HRx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odtpQ-00078U-Ry for patch@linaro.org; Thu, 29 Sep 2022 09:43:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48714) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3Q-0000dx-Cq for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:12 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:34752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods3I-0002P2-Th for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:12 -0400 Received: by mail-wm1-x336.google.com with SMTP id n35-20020a05600c502300b003b4924c6868so3506276wmr.1 for ; Thu, 29 Sep 2022 04:50:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=y7ztg4FO2RX9qokS5MY3bU2yllpC+y9KMjpt1S6fvtU=; b=H9Yf8HRxqPdG9Oh0cJHxBOay5qGm04muY7M1nRQ2HLFCCefZmax7x4Qu1eUsKYyV6h lnRD2qAmt/UfGuYFwkIuUno4rzFaoFNB1QNBroKM/gq2paa+OaWS8mRTDNtqzhGuQnOg 6NHtaIwT0wMAIK2RtomMdvE3xILE36gmrulUXsKZLpRk5IOQIrzTq5PnKxPp3JFa9Vs0 UHfkqBKBM11Ml8p8Rv0bZ6G4MGP6Aag/o8T6BTGF7OxvrjNUxKdaTuBEM1bIJ8p1Qzo0 4ritFcQdxQYE8pIjdvSnPr4n+G6q/GPjaNQpRxMbKyxyZVXPUWGF15lya5JbxFhOKGkM Kpjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=y7ztg4FO2RX9qokS5MY3bU2yllpC+y9KMjpt1S6fvtU=; b=0uS+6RlvNkuhItk69sv2SHitcVCBhg61s3wW/+/tYliCwk3uDkXzqY7Ts9Mr/VBaIN +e6/+3D7J1InbZp1eBi2F5ZguyM0TcO4i8oB75+Upf/O2msQlnfqj3vkNG8tSP7rot75 8cZayMln/0JPS+8XkhoXDCUc4n93JVZ05xkEnFhA6dVR8yPUEb2/NK9x86fsjY+zke7W JVtqighevTy/BZ1nl6MVUjZLyq1CBv7Z5qDu2U0Vna59mUYQlI1BE8R9eNlWfoCxaUhi Sr8L0jTSUqNqPhXpa1KSygnFay2tlU2VzRZdoUPyGlBsrU5pBSsB7vzXyPpPCX8qrtZE 3hiw== X-Gm-Message-State: ACrzQf0bnEo0kjO2VIgw0A32ixpZRcRATRdmM4G5+a8g+Ax8tZrtOODc vV1sMWafaKUvN11pRAWwlsEFdw== X-Received: by 2002:a05:600c:1f05:b0:3b4:ae0a:b2e5 with SMTP id bd5-20020a05600c1f0500b003b4ae0ab2e5mr2099777wmb.104.1664452199977; Thu, 29 Sep 2022 04:49:59 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id i4-20020a05600c354400b003b47b80cec3sm4457949wmq.42.2022.09.29.04.49.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4B0D51FFB8; Thu, 29 Sep 2022 12:42:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v1 18/51] configure: store container engine in config-host.mak Date: Thu, 29 Sep 2022 12:41:58 +0100 Message-Id: <20220929114231.583801-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini In preparation for removing $(DOCKER_SCRIPT) from the tests/tcg configuration files, have Make use the same container engine that had been probed at configure time. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- configure | 11 ++++++++--- tests/docker/Makefile.include | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/configure b/configure index f3984bb193..ad70c81bfe 100755 --- a/configure +++ b/configure @@ -1810,9 +1810,11 @@ fi container="no" if test $use_containers = "yes"; then - if has "docker" || has "podman"; then - container=$($python "$source_path"/tests/docker/docker.py probe) - fi + case $($python "$source_path"/tests/docker/docker.py probe) in + *docker) container=docker ;; + podman) container=podman ;; + no) container=no ;; + esac fi # cross compilers defaults, can be overridden with --cross-cc-ARCH @@ -2444,6 +2446,9 @@ if test -n "$gdb_bin"; then fi fi +if test "$container" != no; then + echo "ENGINE=$container" >> $config_host_mak +fi echo "ROMS=$roms" >> $config_host_mak echo "MAKE=$make" >> $config_host_mak echo "PYTHON=$python" >> $config_host_mak diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 270e99786e..c87f14477a 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -14,7 +14,7 @@ DOCKER_DEFAULT_REGISTRY := registry.gitlab.com/qemu-project/qemu endif DOCKER_REGISTRY := $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTRY)) -ENGINE := auto +ENGINE ?= auto DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE) CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) From patchwork Thu Sep 29 11:41:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610588 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp880851pvb; Thu, 29 Sep 2022 06:10:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM47wFnvbZsI+dNdAO31mXqaPyP3Eqm1dmf2XD2eceno5sHCwqg2zlLNT89fcpH9zCsUItuV X-Received: by 2002:a05:6214:d43:b0:4af:931f:d5a3 with SMTP id 3-20020a0562140d4300b004af931fd5a3mr2396726qvr.62.1664457058152; Thu, 29 Sep 2022 06:10:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664457058; cv=none; d=google.com; s=arc-20160816; b=Lwt30pOy5a08sViUcow7ys92MejsN91a7+GWAbMPLrAGmxyMS5WOtn/xN3VNj5Ec1M NI3TbaO/shl3CXdfI6muO9MxxtPv54NNn7YFWxNwSt85KQ5KOvhHooVvqhkt9eQUNnN6 JN/Su1NvQIROKws51Zpzu8/ZpKAxxk2y9RI8ifZjDiSo4FrGv6e6AgTUwGH8/q68k1xF 19c/EHgBkOFkZXsYsMSepIOOBp1fITW3qszRfmcKVRlGKgbaxSVXAhTpSIWmR+0vseHY H3YqmBsm9ji7JgX9l4SEUD0E+lST9tTMWmz/S/+qhGTh7jUA9REFCWS7wlPThwVjRGds Z/vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vrIiwWvYH6Oys260k16Iv1ACdB9Bz2M9k9kQGx9jGO8=; b=DNt27Vv2cbp7xXlIS8Wb237HhS4itp2q9MJ/hXthevzgzPwsObf5gvTClZrxqnArF3 jUVtm83tmn7XFVuFw4fUI0JEIhq7h/bEmbL8l2aNLSuzsmdoLlVszElaDEXw/p8/meTq LajZ85hmKFPh03gEfaCGOvSa8PJhY7Um0YAwn4IPxXqpDXKTKO5cZwZcQJ3KVfiun5dc 7e9bnBk1Q9qdTErbm/A8TEYtc6N4biBE+c3gvrJe2MqQ1nMT6rIoX8vB4ngGyzEnMC6e Ns1AtHjK5yxJtQCfDA1kM4QC1OCLgd/zT08cNMOR6N1Lk9q5ymsgoL30tp0bjGbUXjh8 5Iow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NEz0xA7E; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w18-20020a05620a445200b006b9faf35c6asi1325042qkp.369.2022.09.29.06.10.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:10:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NEz0xA7E; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odtJZ-00056m-KJ for patch@linaro.org; Thu, 29 Sep 2022 09:10:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrwE-0004bu-JR for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:46 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:43771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrwC-0001Cr-IO for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:46 -0400 Received: by mail-wr1-x431.google.com with SMTP id h7so1731149wru.10 for ; Thu, 29 Sep 2022 04:42:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=vrIiwWvYH6Oys260k16Iv1ACdB9Bz2M9k9kQGx9jGO8=; b=NEz0xA7EmC7GvAKB+xPqUJT1o6R46etOMgRwbvtiotuAQaJcIjZFTEnW/oMWRhNYs2 pi0Wg6fGSBXxYjbyrUGrNu9wLirlTsbmtBAU/DK8HOMXv4suR17i4Xcr4Tf4pgD08Ngw /jz7mvOIY4bULsy8AUTYA/BlEMWfPQxMuSoMFcyZHWdbDH6bxcLOisN3hy8I6UdnThrJ lnFZy/qLwkxXjEKSq2ZzzN1cYKzoFcFZt2JiPqOYFVSwdFIqxpqOujLRabWCLZkb+ECH /QlMmebUr1Aur7LMCLcteAUgfUh5DhX7hAAHDQ1gLioDsBm9bBieMm0cSsEcbZoar1uD FyQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=vrIiwWvYH6Oys260k16Iv1ACdB9Bz2M9k9kQGx9jGO8=; b=K275TTR0tUpPS1nwY1/vF7k/U2VlbhrW6p+SuFA7OibkyroE3v2f6QtfB+8k8PiAcb HcTYPVZF4hJTQGWiW/IKJs/sa2Wwb594auI7p7Zi5LP/iyvkjdCGHZ0OY1IHVKxXXEny zN93SMM+3Qg8533numl86edm6ceOnRB106rPwAiumoz5oo0u0j83k0m1XvgeumB11KaY P3/D1yMXYaPDJbcmE/+ZWscND+3Ve6amnSMHq4uufNOOCcxkbmFIW6JPhMjvXRXYIasx bPHjSPocNZ5jqf7sI5/8WZmwgf863swtGPz+4i9ikidBgxafD3mu6+j3UHHxm3AEDjNJ qMoA== X-Gm-Message-State: ACrzQf05WATMKEZiuyvaKc3K6r0NR89xMdLE4Ec+892X0em9QqzA2y0T QvkLjSh9NvrdCWF9C+KMg4h/0A== X-Received: by 2002:a05:6000:1561:b0:22a:72a1:e3f1 with SMTP id 1-20020a056000156100b0022a72a1e3f1mr2023108wrz.456.1664451763790; Thu, 29 Sep 2022 04:42:43 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id u16-20020a5d5150000000b0021f131de6aesm6227767wrt.34.2022.09.29.04.42.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 66E791FFC9; Thu, 29 Sep 2022 12:42:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 19/51] tests: simplify Makefile invocation for tests/tcg Date: Thu, 29 Sep 2022 12:41:59 +0100 Message-Id: <20220929114231.583801-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Remove the DOCKER_SCRIPT and TARGET variable from the Makefile invocation for tests/tcg. For DOCKER_SCRIPT, resolve the path to docker.py in configure; for TARGET, move it to config-$(TARGET).mak and use a symbolic link to break the cycle. The symbolic link is still needed because tests/tcg includes dummy config files for targets that are not buildable. Once that is cleaned up, the symbolic link will go away too. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- configure | 23 ++++++++++++++--------- tests/Makefile.include | 9 +++------ tests/tcg/Makefile.target | 2 +- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/configure b/configure index ad70c81bfe..784b77ae90 100755 --- a/configure +++ b/configure @@ -1815,6 +1815,9 @@ if test $use_containers = "yes"; then podman) container=podman ;; no) container=no ;; esac + if test "$container" != "no"; then + docker_py="$python $source_path/tests/docker/docker.py --engine $container" + fi fi # cross compilers defaults, can be overridden with --cross-cc-ARCH @@ -2184,16 +2187,16 @@ write_target_makefile() { write_container_target_makefile() { echo "EXTRA_CFLAGS=$target_cflags" if test -n "$container_cross_cc"; then - echo "CC=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" - echo "CCAS=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" + echo "CC=$docker_py cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" + echo "CCAS=$docker_py cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" fi - echo "AR=\$(DOCKER_SCRIPT) cc --cc $container_cross_ar -i qemu/$container_image -s $source_path --" - echo "AS=\$(DOCKER_SCRIPT) cc --cc $container_cross_as -i qemu/$container_image -s $source_path --" - echo "LD=\$(DOCKER_SCRIPT) cc --cc $container_cross_ld -i qemu/$container_image -s $source_path --" - echo "NM=\$(DOCKER_SCRIPT) cc --cc $container_cross_nm -i qemu/$container_image -s $source_path --" - echo "OBJCOPY=\$(DOCKER_SCRIPT) cc --cc $container_cross_objcopy -i qemu/$container_image -s $source_path --" - echo "RANLIB=\$(DOCKER_SCRIPT) cc --cc $container_cross_ranlib -i qemu/$container_image -s $source_path --" - echo "STRIP=\$(DOCKER_SCRIPT) cc --cc $container_cross_strip -i qemu/$container_image -s $source_path --" + echo "AR=$docker_py cc --cc $container_cross_ar -i qemu/$container_image -s $source_path --" + echo "AS=$docker_py cc --cc $container_cross_as -i qemu/$container_image -s $source_path --" + echo "LD=$docker_py cc --cc $container_cross_ld -i qemu/$container_image -s $source_path --" + echo "NM=$docker_py cc --cc $container_cross_nm -i qemu/$container_image -s $source_path --" + echo "OBJCOPY=$docker_py cc --cc $container_cross_objcopy -i qemu/$container_image -s $source_path --" + echo "RANLIB=$docker_py cc --cc $container_cross_ranlib -i qemu/$container_image -s $source_path --" + echo "STRIP=$docker_py cc --cc $container_cross_strip -i qemu/$container_image -s $source_path --" } @@ -2630,6 +2633,8 @@ for target in $target_list; do fi if test $got_cross_cc = yes; then mkdir -p tests/tcg/$target + ln -sf ../config-$target.mak tests/tcg/$target/config-target.mak + echo "TARGET=$target" >> "$config_target_mak" echo "QEMU=$PWD/$qemu" >> "$config_target_mak" echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile tcg_tests_targets="$tcg_tests_targets $target" diff --git a/tests/Makefile.include b/tests/Makefile.include index 3accb83b13..826b1895f4 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -50,23 +50,20 @@ $(foreach TARGET,$(TCG_TESTS_TARGETS), \ .PHONY: $(TCG_TESTS_TARGETS:%=build-tcg-tests-%) $(TCG_TESTS_TARGETS:%=build-tcg-tests-%): build-tcg-tests-%: $(BUILD_DIR)/tests/tcg/config-%.mak $(call quiet-command, \ - $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \ - DOCKER_SCRIPT="$(DOCKER_SCRIPT)" \ - TARGET="$*" SRC_PATH="$(SRC_PATH)", \ + $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS), \ "BUILD","$* guest-tests") .PHONY: $(TCG_TESTS_TARGETS:%=run-tcg-tests-%) $(TCG_TESTS_TARGETS:%=run-tcg-tests-%): run-tcg-tests-%: build-tcg-tests-% $(call quiet-command, \ $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \ - TARGET="$*" SRC_PATH="$(SRC_PATH)" SPEED=$(SPEED) run, \ + SPEED=$(SPEED) run, \ "RUN", "$* guest-tests") .PHONY: $(TCG_TESTS_TARGETS:%=clean-tcg-tests-%) $(TCG_TESTS_TARGETS:%=clean-tcg-tests-%): clean-tcg-tests-%: $(call quiet-command, \ - $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \ - TARGET="$*" SRC_PATH="$(SRC_PATH)" clean, \ + $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) clean, \ "CLEAN", "$* guest-tests") .PHONY: build-tcg diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index c896d1033e..b9c3d247e9 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -31,7 +31,7 @@ all: -include ../config-host.mak --include ../config-$(TARGET).mak +-include config-target.mak # Get semihosting definitions for user-mode emulation ifeq ($(filter %-softmmu, $(TARGET)),) From patchwork Thu Sep 29 11:42:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610612 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp924029pvb; Thu, 29 Sep 2022 07:23:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5fApQofE2bEtLgdWFGek++vilPm5JRN24V6YNqqJI/Z2pv8NhOXDUr+nm2idxTB8b7SCeq X-Received: by 2002:ac8:5b81:0:b0:35b:bc66:ef71 with SMTP id a1-20020ac85b81000000b0035bbc66ef71mr2591785qta.20.1664461423739; Thu, 29 Sep 2022 07:23:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664461423; cv=none; d=google.com; s=arc-20160816; b=rL1HI0M3MecrnjMH6mPySCDSvo/lD1dLe0FMKQnSrvDjFktnHxlfQGXDusqJ5F1abQ d6FzntLQKvCwzDJc/Bj6AZnwdS+ZmwlyfDKJreeG73DWOSxhvU1l/IzMLR0uHwOu6Afc cBfAKLMekAh0dH/zXN/IifW33V3Yc2NH0ZgmD1jCOMdhInBZbBJeouW419aSoy7n0QmO RcwDCOTLvmQyYRHM313/QXdKvzSjJkQqk9oFXBLdwPnApAqa3UFV8vXlMbxa4+fNz7++ BiJijcfgxpcDNqYlHg+l/CTEQKvpgXAMqe+Ijn+B3kFJqwedhsTgzli1gk+jmWyX6iP0 JIHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BsedzBh6Y4TJDrXaXa5qF+9URUKHB7fH5rVkqYS1zZI=; b=kb5t9duyB4foLf56LQ8YLP7FQYb7j0nBPLi5Yf83EHbyoU99YyRuLR0MorMHtAclfG NrDVUOLPJWht9bJv3yiLlZSnFMjQDrhU1CgGkJ58/9LCY/PLJvAedrUHLRn6iI/wQTR+ k9hM56CAw4PlI1OA1GWx5zhCPDaunKHXWPKBDHF7mzbrk0E1CAwgPMWzOy/UEJV/curZ HUX/IeF8tN7SNYpLDbN67i/MAwA21xqh8wyzQjnmsfAs1dl8ArC28A+ehvPsjplct1wO 0XW9GBcN1YXIrFIg6QLZAAZCClQ84hySb8qnL67wsji3y1Awk3MwIYxZ4tpjGjeRCZRH f9eQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DfUm2SI+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j11-20020a05620a410b00b006ceb5a410b2si1405983qko.505.2022.09.29.07.23.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 07:23:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DfUm2SI+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oduRz-0006T1-7j for patch@linaro.org; Thu, 29 Sep 2022 10:23:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3Q-0000fV-Qy for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:13 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:40532) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods3J-0002Pi-TM for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:12 -0400 Received: by mail-wm1-x331.google.com with SMTP id u16-20020a05600c211000b003b5152ebf09so3057127wml.5 for ; Thu, 29 Sep 2022 04:50:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=BsedzBh6Y4TJDrXaXa5qF+9URUKHB7fH5rVkqYS1zZI=; b=DfUm2SI+LxnkGgIKagl85FSRNj9k3EtpLUl2tjSnEQs/HCpx2bqB2ZFc6LTgDFpD/B hK5cKzcu7GbB4E5Nrp+3hiwQoiDeilR2faDMLHZzusz2B2RdMrRCSO/vfO5KnM92AyOa wWBJ7Oq3SCCR79qJjLT2NXEKf3tiI2tQL8GYKGHpKc+7kjlkxCBnLbE5XDDluPR6Vt1j mnD7433I9ltpLjZmy/K+h0tiSKV3CxDs52zAeMUP9IjO0h5SHyHUW8htPouE5PDGOXpF WR3aqJoV1R+UObbADy/aiVNFvxWKja/d6c46xnRbWevnTnm56bh06JjTJfnmn2P3nrmP mmFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=BsedzBh6Y4TJDrXaXa5qF+9URUKHB7fH5rVkqYS1zZI=; b=1e9EG7lYk4qzLVFb1xDwaT+1y+miw67euc3BtSQbKz1/+D9ZwWbyRGEV9X/AXd+mah T5MQXiajN27XMHQtlufyodejCoDaIPRMs8iDOnblkGW15/3SHJ//J3gJE9BKJPthqnEs dCC8BPrkfWpKbVqcn0/rYGiYvG/alP3C3s2OZiysdx4C34CBRw4WXcnPYLUT4F0KPplw HLnTtweSiSNP6dWDUqQs/VcyXkQD0tuz57gtAO9qHjI3gCocFZ5V7zqUZADfQgN7gunI Lh0quNzITJsP5bNlG0cyINtOemb+BlonbdkIQ0i/DIm1A1E+I5ZTmpqNjiMMxoY1wmv5 i79w== X-Gm-Message-State: ACrzQf2weFf1koFHNc9nTNS9uqvXk1vkr8PsrGCFPvAEjBqwtN/TELBD RmqYyEjYma8xOyI9Jru39oNwTQ== X-Received: by 2002:a05:600c:20b:b0:3b4:86ff:cd with SMTP id 11-20020a05600c020b00b003b486ff00cdmr10453918wmi.35.1664452202013; Thu, 29 Sep 2022 04:50:02 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id r9-20020adfda49000000b002258235bda3sm6711234wrl.61.2022.09.29.04.49.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7EC851FFCA; Thu, 29 Sep 2022 12:42:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 20/51] tests/tcg: remove -f from Makefile invocation Date: Thu, 29 Sep 2022 12:42:00 +0100 Message-Id: <20220929114231.583801-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Instead of linking tests/tcg/Makefile.target into the build tree, name the symbolic link "Makefile" and create it in every target subdirectory. This makes it possible to just invoke "make" in tests/tcg subdirectories. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- configure | 7 ++++--- tests/Makefile.include | 7 +++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 784b77ae90..a48a731bf4 100755 --- a/configure +++ b/configure @@ -2282,7 +2282,6 @@ fi # tests might fail. Prefer to keep the relevant files in their own # directory and symlink the directory instead. LINKS="Makefile" -LINKS="$LINKS tests/tcg/Makefile.target" LINKS="$LINKS pc-bios/optionrom/Makefile" LINKS="$LINKS pc-bios/s390-ccw/Makefile" LINKS="$LINKS pc-bios/vof/Makefile" @@ -2529,6 +2528,7 @@ fi echo "# Automatically generated by configure - do not modify" > $makefile config_host_mak=tests/tcg/config-host.mak +mkdir -p tests/tcg echo "# Automatically generated by configure - do not modify" > $config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak echo "HOST_CC=$host_cc" >> $config_host_mak @@ -2632,8 +2632,9 @@ for target in $target_list; do got_cross_cc=yes fi if test $got_cross_cc = yes; then - mkdir -p tests/tcg/$target - ln -sf ../config-$target.mak tests/tcg/$target/config-target.mak + mkdir -p "tests/tcg/$target" + ln -sf "$source_path/tests/tcg/Makefile.target" "tests/tcg/$target/Makefile" + ln -sf "../config-$target.mak" "tests/tcg/$target/config-target.mak" echo "TARGET=$target" >> "$config_target_mak" echo "QEMU=$PWD/$qemu" >> "$config_target_mak" echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile diff --git a/tests/Makefile.include b/tests/Makefile.include index 826b1895f4..caef287957 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -50,20 +50,19 @@ $(foreach TARGET,$(TCG_TESTS_TARGETS), \ .PHONY: $(TCG_TESTS_TARGETS:%=build-tcg-tests-%) $(TCG_TESTS_TARGETS:%=build-tcg-tests-%): build-tcg-tests-%: $(BUILD_DIR)/tests/tcg/config-%.mak $(call quiet-command, \ - $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS), \ + $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS), \ "BUILD","$* guest-tests") .PHONY: $(TCG_TESTS_TARGETS:%=run-tcg-tests-%) $(TCG_TESTS_TARGETS:%=run-tcg-tests-%): run-tcg-tests-%: build-tcg-tests-% $(call quiet-command, \ - $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \ - SPEED=$(SPEED) run, \ + $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS) SPEED=$(SPEED) run, \ "RUN", "$* guest-tests") .PHONY: $(TCG_TESTS_TARGETS:%=clean-tcg-tests-%) $(TCG_TESTS_TARGETS:%=clean-tcg-tests-%): clean-tcg-tests-%: $(call quiet-command, \ - $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) clean, \ + $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS) clean, \ "CLEAN", "$* guest-tests") .PHONY: build-tcg From patchwork Thu Sep 29 11:42:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610594 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp893898pvb; Thu, 29 Sep 2022 06:32:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5/GbHAegocn4mCErm6mdooHiabqdUIsIgR1VOh1wEy91Sh7jJaSG37VzX+eoRXrnZUpUiW X-Received: by 2002:a05:622a:285:b0:35d:435e:33f5 with SMTP id z5-20020a05622a028500b0035d435e33f5mr2375238qtw.154.1664458369634; Thu, 29 Sep 2022 06:32:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664458369; cv=none; d=google.com; s=arc-20160816; b=a0+K4wDIMruKZ7+RdLauDMK1IRTV8Pz9LGAeAu1QkATojMFK6I7ObewaDrzG565VKm ZvM5jQVq1EkqCkPXe/sF03NmPfnbVHU+gnwRtjTUuKWR2gecJzZk/BB+v/dvW/Gviove tjFuW3InNkDIij2WRwFJMxHXyETr/22o8yNAS7b8erOrggPgDuQDmPb6BqbznuXWIgcH sWR3kizFnuNSjZ5ZAkE01RL7eH+TqHRxzWFp4K/nYa7dAz28lTiVPbPZGuEDl42Ddk37 ScGbOuEXRh8gy9eeVx/HtZfJ7ss7EBj1VnDOfRk1T4TwnvyxhqEyUbB0yU+Bco7mcs27 Crpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=y7HCvdUpnCrsqATmOrnvLqUAfNj99taTmx3C50C4mVM=; b=kPpIfrLzGtPhFdTgPP2am8auCC3XXEvQXDN7pRQDyNKMITZWgbDOCLuLIAIdCUA0dE XQh2nFVreN/tHn/3Bq7GR7YoEteodDYm0nMiJCa4s00wHiHLJDyZ4OZpX1wcD4wQsSC5 ZHARGqagaB+Qew22qwq1SgLzjcpQBro6AFY3wLRkaY4ce9je3kT7on9QcWSvgSu3rSVT zvXhBHWe+3/zZHEp/m+KwcijqihKBhE0NJHoX6tl7qJaL1vv3jSTQYXVzjVZ2oX7mSNr VeHTxOTMUE10GYbl5eL/cV9pYZLFXM0mj+w+sejMK3rGyMpa3Oy+zRisI+Pj9yj6Mdfj OWMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mXShESeT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b14-20020ac844ce000000b0035bb0dd6b8esi1282365qto.535.2022.09.29.06.32.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:32:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mXShESeT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odtej-0003aV-4h for patch@linaro.org; Thu, 29 Sep 2022 09:32:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3B-0000N5-BY for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:05 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:39584) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods37-0002NH-Cx for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:49:55 -0400 Received: by mail-wr1-x436.google.com with SMTP id cc5so1782122wrb.6 for ; Thu, 29 Sep 2022 04:49:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=y7HCvdUpnCrsqATmOrnvLqUAfNj99taTmx3C50C4mVM=; b=mXShESeT6IbLwHjFd8ZQ/JZYMrgThgyTWA9RMuSi8NiFOeOx7Ywojw5kpU1mvbw5W5 4HTIvYrl1XcPoolv8RUJmwp/v86Huwg3immDLuJzcUbhqbC4oFcr0/kDGi2be9q8dl+J rCezTMpnyMxh9A23pS9g3dtJhONY7c8jNg8hbCD/k/ayMgR0VpndVO4h9aCPRD7Vp2x4 xVajxiIKTJXW0UJ10Aos9St12dGEP39rIM4dTajH63RMlA06nI5oTyyCNrVTw33U8Ih9 4+ppzRy3RqVOwwAIBfc03jg00b1nlcCXEj5Gv5EuUHFDqiWevkLb+024y2U+LVePTYIe 9cSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=y7HCvdUpnCrsqATmOrnvLqUAfNj99taTmx3C50C4mVM=; b=ANeB/0QKcIWq9o6sXxpPKu9B4GHP8gWaPOLC7sq6nb2PPKDCZxUYSFrDmA3UtxclVq 9HYXI6jLCvhGABl+1OypwUHB6h/SqOTQq5PZkd2+xD6I9Xa1FPtik6Pogu4JmS6ruJdF Y1xSqFu38OjnXqNpeaKLv4Wbbyu52mw02lA8gb+1vVM+rEiLLXMnwtOuzDskNNrV/mG8 HVOJjYvMUWnEUVNBd/3AF0WbU5hcf+yuZIHFQAxdMcIKoNYwfFDGmCKoAW9pgQb/J74q JLmXqOh8j+mjMP6V/SJCCz/c2tZ9cI40gShIyl5qU5wvbBQ7n54YsZ30wy/m0t3sFWSP NTug== X-Gm-Message-State: ACrzQf2sVmrV5rgjkHVtifuD6R5I+wC+UHojJexTuv4SENCNAZpG8vsh oZDMz4PhF+mtGICHsqr9uIW7EA== X-Received: by 2002:a05:6000:794:b0:22b:311:afe9 with SMTP id bu20-20020a056000079400b0022b0311afe9mr1890015wrb.509.1664452192097; Thu, 29 Sep 2022 04:49:52 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id u14-20020a05600c19ce00b003b2878b9e0dsm4484546wmq.20.2022.09.29.04.49.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9898F1FFBA; Thu, 29 Sep 2022 12:42:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 21/51] tests/tcg: add distclean rule Date: Thu, 29 Sep 2022 12:42:01 +0100 Message-Id: <20220929114231.583801-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- tests/Makefile.include | 11 +++++++++++ tests/tcg/Makefile.target | 3 +++ 2 files changed, 14 insertions(+) diff --git a/tests/Makefile.include b/tests/Makefile.include index caef287957..9ed67721e2 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -42,6 +42,7 @@ tests/tcg/Makefile.prereqs: config-host.mak # Per guest TCG tests BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TCG_TESTS_TARGETS)) CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TCG_TESTS_TARGETS)) +DISTCLEAN_TCG_TARGET_RULES=$(patsubst %,distclean-tcg-tests-%, $(TCG_TESTS_TARGETS)) RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TCG_TESTS_TARGETS)) $(foreach TARGET,$(TCG_TESTS_TARGETS), \ @@ -65,6 +66,12 @@ $(TCG_TESTS_TARGETS:%=clean-tcg-tests-%): clean-tcg-tests-%: $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS) clean, \ "CLEAN", "$* guest-tests") +.PHONY: $(TCG_TESTS_TARGETS:%=distclean-tcg-tests-%) +$(TCG_TESTS_TARGETS:%=distclean-tcg-tests-%): distclean-tcg-tests-%: + $(call quiet-command, \ + $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS) distclean, \ + "CLEAN", "$* guest-tests") + .PHONY: build-tcg build-tcg: $(BUILD_TCG_TARGET_RULES) @@ -75,6 +82,9 @@ check-tcg: $(RUN_TCG_TARGET_RULES) .PHONY: clean-tcg clean-tcg: $(CLEAN_TCG_TARGET_RULES) +.PHONY: distclean-tcg +distclean-tcg: $(DISTCLEAN_TCG_TARGET_RULES) + # Python venv for running tests .PHONY: check-venv check-avocado check-acceptance check-acceptance-deprecated-warning @@ -159,5 +169,6 @@ check-clean: rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) clean: check-clean clean-tcg +distclean: distclean-tcg endif diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index b9c3d247e9..c14eca82c2 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -189,3 +189,6 @@ run: $(RUN_TESTS) clean: rm -f $(TESTS) *.o $(CLEANFILES) + +distclean: + rm -f config-target.mak ../config-$(TARGET).mak From patchwork Thu Sep 29 11:42:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610619 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp941966pvb; Thu, 29 Sep 2022 07:55:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5TRwzI9ro9b5sS+fo7N5U+aR6V5fgtri/8isiOqH9lv4BLrLgqv3IMOhVd4mD8nElfZBkK X-Received: by 2002:a05:6214:2a8e:b0:4af:a1b5:975d with SMTP id jr14-20020a0562142a8e00b004afa1b5975dmr2911329qvb.24.1664463306120; Thu, 29 Sep 2022 07:55:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664463306; cv=none; d=google.com; s=arc-20160816; b=VTiUcJ0g1KjG2vhrRN7ZKOvFFGx8BGw67ajAzP6kr90M8j4F5DlCrvvd49uuifIbUS tgDy61fuh+X4uGsaApaAXRqsWcPcL2093fPA+Qxb7NPYOwvCbXLEZDrGVWvsaWq3m9a7 1nPoefWdI/sKnFAo9KAb7N+W0AD5TW6WiUP14OQZjWuJUtqJZ97GyaJNFhsca/V0y2NQ rbuEEDhXTUAXaKdRffK6MijXMrqhghN3GDNute4AoFx7C8pz7J5M+MGG9p+T6V+HtGZS LDeQkwocuerHZbqv4clzOa/FMvLWLwH9LCFWDPhn/PtSHAmmNMLK8xuZG+/TVOlTY2B+ I36g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3gQSShOSw7mXVJmYGT4mj+J2+/RqeX/ZMhykdWqwlSw=; b=Tab6TyloiCKwGShfwXLy++5f83VcO+suZAzJeXkKZRH7H/5OGRLG1GTtl4LClzI64L ZLa90gcIt/5PrSaezjErtHHtBMW5B9YtDFy14ZtmD6pFObGuMo9KbTNCo4s4uA7gZwra JfhqfUN/rW5jO4nUhtzBlCU5wVFoLWOZpbJMIpfieI4grRUd21/1QZiXUcZxU2Vl7/2l +xleNkxHpidAF6nWcAw0wFF6YKy6UMW6ZQoI1l+SyT5TxLd0JgsCSXJV01r+mulB/3AE TWA4ZtNETjL7KgEJ4bXBDCmufqL8dTacu9DNnUeSDNmof+RBsL02Q1t/J59UkXWkFBln GW0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VaJBxCIC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l9-20020ac84589000000b0035d0f7cb177si1350340qtn.162.2022.09.29.07.55.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 07:55:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VaJBxCIC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oduwJ-0001hX-Pp for patch@linaro.org; Thu, 29 Sep 2022 10:55:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odsD1-0007UN-AN for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:07 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:45603) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odsCu-0004On-RF for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:06 -0400 Received: by mail-wm1-x336.google.com with SMTP id d12-20020a05600c3acc00b003b4c12e47f3so608876wms.4 for ; Thu, 29 Sep 2022 05:00:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=3gQSShOSw7mXVJmYGT4mj+J2+/RqeX/ZMhykdWqwlSw=; b=VaJBxCICdK8dO8PMD/HcQOteW2Q5XNz3e6zY/2FT8jSgFXZYCgdv8kC8hJr0OXdkMr rC8N5mdgexqCCH8X25ZcJGDTlzVWzw6OFGBFRRZ2eRRaIgI6Dh8JiJgiU3A/EjARRjeH mYF9sRUR9KEQhwnvL/qr609pIKggp1E4Lwa9OERPK2w3a5rNvY2DwM2nnRv4i932TUaM wlQktHgCBaHDNsC0wTIJiM9vasaMh/F7d0Ui6WFVYhByxPDNGR+Yrhs9H7cuQ+mLZomG BTvDVPsSAVg/UMzheqHzEMlOIEolMjh36KiWlVmP4u6sMzApSPrvtfBDRekpp8KuhgqE CEQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=3gQSShOSw7mXVJmYGT4mj+J2+/RqeX/ZMhykdWqwlSw=; b=Jin0rL8+r7sIJ0byCZyytb9fFSeddXhgGIagE3U3BtcT363KqswOF469z0aK7axxf8 A4eCaADLkc/PgRnMRhfR34nbzSjXoB26seT2pPl2baIYu9eq2FDuEwGdsanT2fWsIMpO Cx5KhYNQfpE+KXYsSZ2y8lKj8H9tm7h1NPrsEQSIIvfHKVkXj3tS8J9veR4ii1RxC+W6 MBNBk8S849JH5nBQQIxigDg2VewUs/KSvfWAEaoewZuf+wSpEmCQBZZky0aGhOwKbTv7 cZCYo0/JvDsHcjgPiftjEblbgAbs2mwzlPjBXNgBREnSzbVIxRZDc3hB2sC/HxQOeRCr OVIA== X-Gm-Message-State: ACrzQf3for9O6omnwVeFaXzQHJ+Y8QJwP9tTywIv68KtHmgphz2YNMK+ p6tOT00g4WRPfiR8R4R0UTxVf8wqmZ2hrw== X-Received: by 2002:a05:600c:282:b0:3b4:76c8:da3c with SMTP id 2-20020a05600c028200b003b476c8da3cmr2122404wmk.153.1664452799239; Thu, 29 Sep 2022 04:59:59 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j1-20020a5d4481000000b0022ae401e9e0sm6394434wrq.78.2022.09.29.04.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:59:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B29351FFCB; Thu, 29 Sep 2022 12:42:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 22/51] tests/tcg: unify ppc64 and ppc64le Makefiles Date: Thu, 29 Sep 2022 12:42:02 +0100 Message-Id: <20220929114231.583801-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Make tests/tcg/ppc64le include tests/tcg/ppc64 instead of duplicating the rules. Because the ppc64le vpath includes tests/tcg/ppc64 but not vice versa, the tests have to be moved from tests/tcg/ppc64le/ to tests/tcg/ppc64. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- tests/tcg/{ppc64le => ppc64}/bcdsub.c | 0 tests/tcg/{ppc64le => ppc64}/byte_reverse.c | 0 tests/tcg/{ppc64le => ppc64}/mffsce.c | 0 tests/tcg/{ppc64le => ppc64}/mtfsf.c | 0 .../{ppc64le => ppc64}/non_signalling_xscv.c | 0 .../signal_save_restore_xer.c | 0 tests/tcg/{ppc64le => ppc64}/xxspltw.c | 0 tests/tcg/ppc64/Makefile.target | 1 - tests/tcg/ppc64le/Makefile.target | 26 +------------------ 9 files changed, 1 insertion(+), 26 deletions(-) rename tests/tcg/{ppc64le => ppc64}/bcdsub.c (100%) rename tests/tcg/{ppc64le => ppc64}/byte_reverse.c (100%) rename tests/tcg/{ppc64le => ppc64}/mffsce.c (100%) rename tests/tcg/{ppc64le => ppc64}/mtfsf.c (100%) rename tests/tcg/{ppc64le => ppc64}/non_signalling_xscv.c (100%) rename tests/tcg/{ppc64le => ppc64}/signal_save_restore_xer.c (100%) rename tests/tcg/{ppc64le => ppc64}/xxspltw.c (100%) diff --git a/tests/tcg/ppc64le/bcdsub.c b/tests/tcg/ppc64/bcdsub.c similarity index 100% rename from tests/tcg/ppc64le/bcdsub.c rename to tests/tcg/ppc64/bcdsub.c diff --git a/tests/tcg/ppc64le/byte_reverse.c b/tests/tcg/ppc64/byte_reverse.c similarity index 100% rename from tests/tcg/ppc64le/byte_reverse.c rename to tests/tcg/ppc64/byte_reverse.c diff --git a/tests/tcg/ppc64le/mffsce.c b/tests/tcg/ppc64/mffsce.c similarity index 100% rename from tests/tcg/ppc64le/mffsce.c rename to tests/tcg/ppc64/mffsce.c diff --git a/tests/tcg/ppc64le/mtfsf.c b/tests/tcg/ppc64/mtfsf.c similarity index 100% rename from tests/tcg/ppc64le/mtfsf.c rename to tests/tcg/ppc64/mtfsf.c diff --git a/tests/tcg/ppc64le/non_signalling_xscv.c b/tests/tcg/ppc64/non_signalling_xscv.c similarity index 100% rename from tests/tcg/ppc64le/non_signalling_xscv.c rename to tests/tcg/ppc64/non_signalling_xscv.c diff --git a/tests/tcg/ppc64le/signal_save_restore_xer.c b/tests/tcg/ppc64/signal_save_restore_xer.c similarity index 100% rename from tests/tcg/ppc64le/signal_save_restore_xer.c rename to tests/tcg/ppc64/signal_save_restore_xer.c diff --git a/tests/tcg/ppc64le/xxspltw.c b/tests/tcg/ppc64/xxspltw.c similarity index 100% rename from tests/tcg/ppc64le/xxspltw.c rename to tests/tcg/ppc64/xxspltw.c diff --git a/tests/tcg/ppc64/Makefile.target b/tests/tcg/ppc64/Makefile.target index 331fae628e..7db7a3e2b3 100644 --- a/tests/tcg/ppc64/Makefile.target +++ b/tests/tcg/ppc64/Makefile.target @@ -3,7 +3,6 @@ # ppc64 specific tweaks VPATH += $(SRC_PATH)/tests/tcg/ppc64 -VPATH += $(SRC_PATH)/tests/tcg/ppc64le ifneq ($(CROSS_CC_HAS_POWER8_VECTOR),) PPC64_TESTS=bcdsub non_signalling_xscv diff --git a/tests/tcg/ppc64le/Makefile.target b/tests/tcg/ppc64le/Makefile.target index 6ca3003f02..daad5118a5 100644 --- a/tests/tcg/ppc64le/Makefile.target +++ b/tests/tcg/ppc64le/Makefile.target @@ -4,28 +4,4 @@ VPATH += $(SRC_PATH)/tests/tcg/ppc64le -ifneq ($(CROSS_CC_HAS_POWER8_VECTOR),) -PPC64LE_TESTS=bcdsub non_signalling_xscv -endif -$(PPC64LE_TESTS): CFLAGS += -mpower8-vector - -ifneq ($(CROSS_CC_HAS_POWER10),) -PPC64LE_TESTS += byte_reverse sha512-vector -endif -byte_reverse: CFLAGS += -mcpu=power10 -run-byte_reverse: QEMU_OPTS+=-cpu POWER10 -run-plugin-byte_reverse-with-%: QEMU_OPTS+=-cpu POWER10 - -sha512-vector: CFLAGS +=-mcpu=power10 -O3 -sha512-vector: sha512.c - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) - -run-sha512-vector: QEMU_OPTS+=-cpu POWER10 -run-plugin-sha512-vector-with-%: QEMU_OPTS+=-cpu POWER10 - -PPC64LE_TESTS += mtfsf -PPC64LE_TESTS += mffsce -PPC64LE_TESTS += signal_save_restore_xer -PPC64LE_TESTS += xxspltw - -TESTS += $(PPC64LE_TESTS) +include $(SRC_PATH)/tests/tcg/ppc64/Makefile.target From patchwork Thu Sep 29 11:42:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610609 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp919229pvb; Thu, 29 Sep 2022 07:16:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4daC7ipXZOek9OFPXskAJsAfxVOeTpco/GMIaCydFP+ThFvWtr6viEb92LDj8AgqtsSNUD X-Received: by 2002:a05:620a:4416:b0:6ce:9d3c:2c35 with SMTP id v22-20020a05620a441600b006ce9d3c2c35mr2401700qkp.78.1664460966128; Thu, 29 Sep 2022 07:16:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664460966; cv=none; d=google.com; s=arc-20160816; b=eHbxpSHkw80RZW6Tn3jzruBH9ZmAy0CWe2tXvBvE/U+cBrdOVwwfs29FAphukVO9eD fj/+sorTPc3FkRxIXaE48mKam/EdpEMnkEmYBUOJzbvicBOB674KI9glRIZKawo0LvXR zxCWgvajW9YfaM/keM/7N4o3fs/vtmIId+1lffEkl0+iqO8MfZxXVez0/qPo1anpj4Uo xv+2WaviqIXjvT2Rlnofc/+eqIsrt/49TYxzBL6ECXMYCE6hqu/WBX+PbX+matPkMmX4 C4gu4QZWrAJime0ZZ8/vSHDgzVZw6+m2JY43zFi0kdlIwtr4HyJIBEgR9LEYCGQZcaHa UoVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HbQrkwUyPqGJSu2Wy+YQt+3XoMfVoU2PXyL9bXdSlBs=; b=IHLccEI1t6lCfbNCkRqfpoMJFb6GQfxV0llpLl4UoKkW+nQc2/pfIM3BaYjgd+D6Ma E97SH+eQal9keLAOzngJ8TjLJwXhY2jzTK2EALv+H+kCQ1T3wKYiEzf2AQ2mLH/iz988 IRlVQFOg+C5+VKkKnZ5wLqYHZqvZiKRL5Iqfto9c7/A6+WuFDXqOr/NtBeKQIuC7vzCB jd4Owznwg0X71svC8uXgBo9y8zQEEdqa4PJIQVGO/MJ7rBipoo2qM7ohVvfTBEy46JJO 3eRM28kDUAHYKIM0FFlv7y1EFCq5MhIL06ytXxBQ55JqSYHk4YwNhxNRwvDvSRUbJbtr HSzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="j7z/CpnR"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p27-20020ac8409b000000b0035d12092a97si1420515qtl.211.2022.09.29.07.16.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 07:16:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="j7z/CpnR"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oduKb-0000EJ-L0 for patch@linaro.org; Thu, 29 Sep 2022 10:16:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3P-0000ac-Af for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:11 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:36431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods3I-0002Nh-Tp for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:10 -0400 Received: by mail-wr1-x430.google.com with SMTP id v28so1798384wrd.3 for ; Thu, 29 Sep 2022 04:50:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=HbQrkwUyPqGJSu2Wy+YQt+3XoMfVoU2PXyL9bXdSlBs=; b=j7z/CpnRiRro+njMSRtT313sdVF19Ux1HvLXxMVDpIOxh6FN3jPowIRCm0xzXADGKs ktBmrbtexsfgJV7qDc1dVh1M0ptqbU2gyWR55A5kTosFlqXQfBDsLMBBqDq4aGMSyQ4k vC/arPEQZowVKD/Ne1vUWxmc3IfY59uwTEodsQ5PAoENT3Br9gINsGQE6HR3crCMHwJp 4frvuCyzL/kHUj4J8/tBlG1VeGGRJP8fGJC3B9LvWUafQypc59Ytqw0HbphIq6EmMp+g TVL2j3JLfW50weik94h5RKOP/wXDZBVKyKp589x0u+XDhy5vR/rS/q3AfG2hJIAc/65i MbPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=HbQrkwUyPqGJSu2Wy+YQt+3XoMfVoU2PXyL9bXdSlBs=; b=QYhR9uj4OjlvNjyA4N7w6Qdd06d3/ajEn9yJtcJknI1gK69kJAKsCw3Eo+mk5lFbg6 j0oDtZg2qS/L3XWbPAty9omuXOsxVORu4/bcUXR3W/RN1v6cxs/tvxuM1U3G0ZOCQhN/ /dekx8QzEb32zvwfkogukdSW0c1ykXifDEGpfMUk/fMNMaIHfjsYTPezhnJOWG8Qwbah Y/OcMWnYGuSe4dZIKK47Umvh4qfJAmWMSU8l5x5wyx+DkLTWMk/aB9mbbceErmOq4pQ7 diOwFPtxhlkTFtCkSh5PdW94//ej+cqOtb3xAAoFLKh8ct1Pyuroxnav/Pa9SgwZMLEX M5fg== X-Gm-Message-State: ACrzQf3ms65xdx3h1MjmHizlutA2Z5/O9BBiTiKzRQ9NzDGyhI9rIOPo 1aWG4dKARn0fu5R/Y4Xw82tNAw== X-Received: by 2002:a5d:64a9:0:b0:22a:c3c3:4943 with SMTP id m9-20020a5d64a9000000b0022ac3c34943mr2049969wrp.655.1664452201553; Thu, 29 Sep 2022 04:50:01 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bi16-20020a05600c3d9000b003b4de550e34sm4003452wmb.40.2022.09.29.04.49.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E3F3B1FFCC; Thu, 29 Sep 2022 12:42:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Maydell , "Edgar E. Iglesias" , Richard Henderson , Eduardo Habkost , David Hildenbrand , qemu-arm@nongnu.org (open list:ARM TCG CPUs), qemu-s390x@nongnu.org (open list:S390 TCG CPUs) Subject: [PATCH v1 23/51] tests/tcg: clean up calls to run-test Date: Thu, 29 Sep 2022 12:42:03 +0100 Message-Id: <20220929114231.583801-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Almost all invocations of run-test have either "$* on $(TARGET_NAME)" or "$< on $(TARGET_NAME)" as the last argument. So provide a default test name, while allowing an escape hatch for custom names. As an additional simplification, remove the need to do shell quoting. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- tests/tcg/Makefile.target | 21 +++++++++---------- tests/tcg/aarch64/Makefile.softmmu-target | 6 ++---- tests/tcg/aarch64/Makefile.target | 6 +++--- tests/tcg/arm/Makefile.target | 9 ++++---- tests/tcg/cris/Makefile.target | 2 +- tests/tcg/i386/Makefile.softmmu-target | 3 +-- tests/tcg/i386/Makefile.target | 5 ++--- tests/tcg/multiarch/Makefile.target | 18 +++++++--------- .../multiarch/system/Makefile.softmmu-target | 2 +- tests/tcg/s390x/Makefile.target | 2 +- tests/tcg/x86_64/Makefile.softmmu-target | 3 +-- 11 files changed, 34 insertions(+), 43 deletions(-) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index c14eca82c2..cd0a2ad873 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -41,14 +41,16 @@ endif # for including , in command strings COMMA := , -quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) +quiet-@ = $(if $(V),,@$(if $1,printf " %-7s %s\n" "$(strip $1)" "$(strip $2)" && )) +quiet-command = $(call quiet-@,$2,$3)$1 # $1 = test name, $2 = cmd, $3 = desc ifeq ($(filter %-softmmu, $(TARGET)),) run-test = $(call quiet-command, timeout --foreground $(TIMEOUT) $2 > $1.out, \ - "TEST",$3) + TEST,$(or $3, $*, $<) on $(TARGET_NAME)) else -run-test = $(call quiet-command, timeout --foreground $(TIMEOUT) $2,"TEST",$3) +run-test = $(call quiet-command, timeout --foreground $(TIMEOUT) $2, \ + TEST,$(or $3, $*, $<) on $(TARGET_NAME)) endif # $1 = test name, $2 = reference @@ -56,7 +58,7 @@ endif # we know it failed and then force failure at the end. diff-out = $(call quiet-command, diff -q $1.out $2 || \ (diff -u $1.out $2 | head -n 10 && false), \ - "DIFF","$1.out with $2") + DIFF,$1.out with $2) # $1 = test name, $2 = reason skip-test = @printf " SKIPPED %s on $(TARGET_NAME) because %s\n" $1 $2 @@ -155,21 +157,19 @@ RUN_TESTS+=$(EXTRA_RUNS) ifeq ($(filter %-softmmu, $(TARGET)),) run-%: % - $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)") + $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<) run-plugin-%: $(call run-test, $@, $(QEMU) $(QEMU_OPTS) \ -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ -d plugin -D $*.pout \ - $(call strip-plugin,$<), \ - "$* on $(TARGET_NAME)") + $(call strip-plugin,$<)) else run-%: % $(call run-test, $<, \ $(QEMU) -monitor none -display none \ -chardev file$(COMMA)path=$<.out$(COMMA)id=output \ - $(QEMU_OPTS) $<, \ - "$< on $(TARGET_NAME)") + $(QEMU_OPTS) $<) run-plugin-%: $(call run-test, $@, \ @@ -177,8 +177,7 @@ run-plugin-%: -chardev file$(COMMA)path=$@.out$(COMMA)id=output \ -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ -d plugin -D $*.pout \ - $(QEMU_OPTS) $(call strip-plugin,$<), \ - "$* on $(TARGET_NAME)") + $(QEMU_OPTS) $(call strip-plugin,$<)) endif gdb-%: % diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/Makefile.softmmu-target index f6fcd4829e..84a9990f8d 100644 --- a/tests/tcg/aarch64/Makefile.softmmu-target +++ b/tests/tcg/aarch64/Makefile.softmmu-target @@ -50,8 +50,7 @@ run-memory-record: memory-record memory $(QEMU) -monitor none -display none \ -chardev file$(COMMA)path=$<.out$(COMMA)id=output \ -icount shift=5$(COMMA)rr=record$(COMMA)rrfile=record.bin \ - $(QEMU_OPTS) memory, \ - "$< on $(TARGET_NAME)") + $(QEMU_OPTS) memory) .PHONY: memory-replay run-memory-replay: memory-replay run-memory-record @@ -59,8 +58,7 @@ run-memory-replay: memory-replay run-memory-record $(QEMU) -monitor none -display none \ -chardev file$(COMMA)path=$<.out$(COMMA)id=output \ -icount shift=5$(COMMA)rr=replay$(COMMA)rrfile=record.bin \ - $(QEMU_OPTS) memory, \ - "$< on $(TARGET_NAME)") + $(QEMU_OPTS) memory) EXTRA_RUNS+=run-memory-replay diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index d6a74d24dc..9837a809dc 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -55,7 +55,7 @@ sha1-vector: CFLAGS=-O3 sha1-vector: sha1.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) run-sha1-vector: sha1-vector run-sha1 - $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)") + $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<) $(call diff-out, sha1-vector, sha1.out) TESTS += sha1-vector @@ -75,14 +75,14 @@ run-gdbstub-sysregs: sysregs --gdb $(HAVE_GDB_BIN) \ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ --bin $< --test $(AARCH64_SRC)/gdbstub/test-sve.py, \ - "basic gdbstub SVE support") + basic gdbstub SVE support) run-gdbstub-sve-ioctls: sve-ioctls $(call run-test, $@, $(GDB_SCRIPT) \ --gdb $(HAVE_GDB_BIN) \ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ --bin $< --test $(AARCH64_SRC)/gdbstub/test-sve-ioctl.py, \ - "basic gdbstub SVE ZLEN support") + basic gdbstub SVE ZLEN support) EXTRA_RUNS += run-gdbstub-sysregs run-gdbstub-sve-ioctls endif diff --git a/tests/tcg/arm/Makefile.target b/tests/tcg/arm/Makefile.target index 2f815120a5..b3b1504a1c 100644 --- a/tests/tcg/arm/Makefile.target +++ b/tests/tcg/arm/Makefile.target @@ -26,7 +26,7 @@ ARM_TESTS += fcvt fcvt: LDFLAGS+=-lm # fcvt: CFLAGS+=-march=armv8.2-a+fp16 -mfpu=neon-fp-armv8 run-fcvt: fcvt - $(call run-test,fcvt,$(QEMU) $<,"$< on $(TARGET_NAME)") + $(call run-test,fcvt,$(QEMU) $<) $(call diff-out,fcvt,$(ARM_SRC)/fcvt.ref) # PC alignment test @@ -44,13 +44,12 @@ semihosting-arm: semihosting.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) run-semihosting-arm: semihosting-arm - $(call run-test,$<,$(QEMU) $< 2> $<.err, "$< on $(TARGET_NAME)") + $(call run-test,$<,$(QEMU) $< 2> $<.err) run-plugin-semihosting-arm-with-%: $(call run-test, $@, $(QEMU) $(QEMU_OPTS) \ -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ - $(call strip-plugin,$<) 2> $<.err, \ - "$< on $(TARGET_NAME) with $*") + $(call strip-plugin,$<) 2> $<.err) ARM_TESTS += semiconsole-arm @@ -75,7 +74,7 @@ sha1-vector: CFLAGS=-O3 sha1-vector: sha1.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) run-sha1-vector: sha1-vector run-sha1 - $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)") + $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<) $(call diff-out, sha1-vector, sha1.out) ARM_TESTS += sha1-vector diff --git a/tests/tcg/cris/Makefile.target b/tests/tcg/cris/Makefile.target index e72d3cbdb2..372287bd03 100644 --- a/tests/tcg/cris/Makefile.target +++ b/tests/tcg/cris/Makefile.target @@ -56,4 +56,4 @@ SIMG:=cris-axis-linux-gnu-run # e.g.: make -f ../../tests/tcg/Makefile run-check_orm-on-sim run-%-on-sim: - $(call run-test, $<, $(SIMG) $<, "$< on $(TARGET_NAME) with SIM") + $(call run-test, $<, $(SIMG) $<) diff --git a/tests/tcg/i386/Makefile.softmmu-target b/tests/tcg/i386/Makefile.softmmu-target index 9b9038d0be..ed922d59c8 100644 --- a/tests/tcg/i386/Makefile.softmmu-target +++ b/tests/tcg/i386/Makefile.softmmu-target @@ -40,8 +40,7 @@ run-plugin-%-with-libinsn.so: -chardev file$(COMMA)path=$@.out$(COMMA)id=output \ -plugin ../../plugin/libinsn.so$(COMMA)inline=on \ -d plugin -D $*-with-libinsn.so.pout \ - $(QEMU_OPTS) $*, \ - "$* on $(TARGET_NAME)") + $(QEMU_OPTS) $*) # Running QEMU_OPTS+=-device isa-debugcon,chardev=output -device isa-debug-exit,iobase=0xf4,iosize=0x4 -kernel diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index 599f192529..8af066efc5 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -53,7 +53,7 @@ test-i386-fprem.ref: test-i386-fprem run-test-i386-fprem: TIMEOUT=60 run-test-i386-fprem: test-i386-fprem test-i386-fprem.ref - $(call run-test,test-i386-fprem, $(QEMU) $<,"$< on $(TARGET_NAME)") + $(call run-test,test-i386-fprem, $(QEMU) $<) $(call diff-out,test-i386-fprem, test-i386-fprem.ref) else SKIP_I386_TESTS+=test-i386-fprem @@ -63,8 +63,7 @@ endif run-plugin-%-with-libinsn.so: $(call run-test, $@, $(QEMU) $(QEMU_OPTS) \ -plugin ../../plugin/libinsn.so$(COMMA)inline=on \ - -d plugin -D $*-with-libinsn.so.pout $*, \ - "$* (inline) on $(TARGET_NAME)") + -d plugin -D $*-with-libinsn.so.pout $*) # Update TESTS I386_TESTS:=$(filter-out $(SKIP_I386_TESTS), $(ALL_X86_TESTS)) diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index 6bba523729..78104f9bbb 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -26,7 +26,7 @@ float_%: float_%.c libs/float_helpers.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< $(MULTIARCH_SRC)/libs/float_helpers.c -o $@ $(LDFLAGS) run-float_%: float_% - $(call run-test,$<, $(QEMU) $(QEMU_OPTS) $<,"$< on $(TARGET_NAME)") + $(call run-test,$<, $(QEMU) $(QEMU_OPTS) $<) $(call conditional-diff-out,$<,$(SRC_PATH)/tests/tcg/$(TARGET_NAME)/$<.ref) @@ -42,13 +42,11 @@ signals: LDFLAGS+=-lrt -lpthread # default case (host page size) run-test-mmap: test-mmap - $(call run-test, test-mmap, $(QEMU) $<, \ - "$< (default) on $(TARGET_NAME)") + $(call run-test, test-mmap, $(QEMU) $<, $< (default)) # additional page sizes (defined by each architecture adding to EXTRA_RUNS) run-test-mmap-%: test-mmap - $(call run-test, test-mmap-$*, $(QEMU) -p $* $<,\ - "$< ($* byte pages) on $(TARGET_NAME)") + $(call run-test, test-mmap-$*, $(QEMU) -p $* $<, $< ($* byte pages)) ifneq ($(HAVE_GDB_BIN),) GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py @@ -58,21 +56,21 @@ run-gdbstub-sha1: sha1 --gdb $(HAVE_GDB_BIN) \ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ --bin $< --test $(MULTIARCH_SRC)/gdbstub/sha1.py, \ - "basic gdbstub support") + basic gdbstub support) run-gdbstub-qxfer-auxv-read: sha1 $(call run-test, $@, $(GDB_SCRIPT) \ --gdb $(HAVE_GDB_BIN) \ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ --bin $< --test $(MULTIARCH_SRC)/gdbstub/test-qxfer-auxv-read.py, \ - "basic gdbstub qXfer:auxv:read support") + basic gdbstub qXfer:auxv:read support) run-gdbstub-thread-breakpoint: testthread $(call run-test, $@, $(GDB_SCRIPT) \ --gdb $(HAVE_GDB_BIN) \ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ --bin $< --test $(MULTIARCH_SRC)/gdbstub/test-thread-breakpoint.py, \ - "hitting a breakpoint on non-main thread") + hitting a breakpoint on non-main thread) else run-gdbstub-%: @@ -94,13 +92,13 @@ VPATH += $(MULTIARCH_SRC)/arm-compat-semi semihosting: CFLAGS+=-I$(SRC_PATH)/tests/tcg/$(TARGET_NAME) run-semihosting: semihosting - $(call run-test,$<,$(QEMU) $< 2> $<.err, "$< on $(TARGET_NAME)") + $(call run-test,$<,$(QEMU) $< 2> $<.err) run-plugin-semihosting-with-%: $(call run-test, $@, $(QEMU) $(QEMU_OPTS) \ -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ $(call strip-plugin,$<) 2> $<.err, \ - "$< on $(TARGET_NAME) with $*") + $< with $*) semiconsole: CFLAGS+=-I$(SRC_PATH)/tests/tcg/$(TARGET_NAME) diff --git a/tests/tcg/multiarch/system/Makefile.softmmu-target b/tests/tcg/multiarch/system/Makefile.softmmu-target index 625ed792c6..368b64d531 100644 --- a/tests/tcg/multiarch/system/Makefile.softmmu-target +++ b/tests/tcg/multiarch/system/Makefile.softmmu-target @@ -25,7 +25,7 @@ run-gdbstub-memory: memory --qargs \ "-monitor none -display none -chardev file$(COMMA)path=$<.out$(COMMA)id=output $(QEMU_OPTS)" \ --bin $< --test $(MULTIARCH_SRC)/gdbstub/memory.py, \ - "softmmu gdbstub support") + softmmu gdbstub support) else run-gdbstub-%: diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.target index 5e13a41c3f..c830313e67 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -41,7 +41,7 @@ run-gdbstub-signals-s390x: signals-s390x --gdb $(HAVE_GDB_BIN) \ --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ --bin $< --test $(S390X_SRC)/gdbstub/test-signals-s390x.py, \ - "mixing signals and debugging on s390x") + mixing signals and debugging) EXTRA_RUNS += run-gdbstub-signals-s390x endif diff --git a/tests/tcg/x86_64/Makefile.softmmu-target b/tests/tcg/x86_64/Makefile.softmmu-target index 2afa3298bf..7207fee94c 100644 --- a/tests/tcg/x86_64/Makefile.softmmu-target +++ b/tests/tcg/x86_64/Makefile.softmmu-target @@ -40,8 +40,7 @@ run-plugin-%-with-libinsn.so: -chardev file$(COMMA)path=$@.out$(COMMA)id=output \ -plugin ../../plugin/libinsn.so$(COMMA)inline=on \ -d plugin -D $*-with-libinsn.so.pout \ - $(QEMU_OPTS) $*, \ - "$* on $(TARGET_NAME)") + $(QEMU_OPTS) $*) # Running QEMU_OPTS+=-device isa-debugcon,chardev=output -device isa-debug-exit,iobase=0xf4,iosize=0x4 -kernel From patchwork Thu Sep 29 11:42:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610592 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp888721pvb; Thu, 29 Sep 2022 06:23:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM77vQVKjFgAdjPEZ7Arla7UcVT65WUZ92bVySCoKPb5XU69L8osRXXLqZy43MgUBm87Xp2P X-Received: by 2002:ac8:5992:0:b0:35c:c83a:740f with SMTP id e18-20020ac85992000000b0035cc83a740fmr2331908qte.503.1664457805013; Thu, 29 Sep 2022 06:23:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664457805; cv=none; d=google.com; s=arc-20160816; b=y7K5PgBKIN5C6hAz12aLYBpqdzkkeUUvEpboY/HbaW+DRtaQTAmNjn7V9gGPjMZUTJ 7GxU1Qwmu+8ZxWJV1jkJzs2YCdvIfKfFnHT8/C0gcgogIWu4v01uqHvuQtEnMO2tM/fB IAOBacBJYKmrR6y2Pau60uMgklGCwrOKvyVUfT1TH+Sx4VZNjesfhZxbu0ToF/a8+wwH FCTqKj5BcS2l4D1GjbGRR2XjkN8UDEKZas02aN9uxXwksFoX/1tGYCUQsxW8SuGEq6lX uRVm5PHIc7Sp9pE+Y3rEmYgRIUVkPUr8b4Uf1QT9zswn9bUyx4+s0lUJsCAtoSZ1JZGf jq7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OXzdsloRXB8WS1CH8p1FEaeaWBtMOAym3FLJbD2hm9Y=; b=v/RK9pSrErYAOKDIn1wLv4KLnI0etC87lDlWUYbY3iV1ROcfjw0VjO6Nyo10rzlvZe 2tXFNOvl0ornOgO0vKQMjF+Wu9agXrDKGC2RQdTRQOMnv6wjn9Dwz4cQuFJNgXhe2tQn Qlmn6iu9pPQg+GD15xScg50ed2w4xgCOA7wkKbSn0P7K+GzhVmUITeqfUQZkU3w9bOuO Na7jwRxT6HmnLLrMN1m4cmkQ5RAzb9QMlDelO9+XS9FQn0BVg/KBkuxZhLZMpPz0Am21 Awrv7w5w912y2YUH6+43Bz9k/I5GyhyD5SZHAilUorgb8c4S8BJP2FxnAFY3i39iDqFx LBMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gWsYgCyr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r1-20020ad45761000000b004a2e424f57bsi4846119qvx.36.2022.09.29.06.23.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:23:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gWsYgCyr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odtVc-0005iw-Dr for patch@linaro.org; Thu, 29 Sep 2022 09:23:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3H-0000NL-5S for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:06 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:33342) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods3B-0002Np-33 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:49:59 -0400 Received: by mail-wr1-x42f.google.com with SMTP id s14so1822401wro.0 for ; Thu, 29 Sep 2022 04:49:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=OXzdsloRXB8WS1CH8p1FEaeaWBtMOAym3FLJbD2hm9Y=; b=gWsYgCyrKIeyKN5hfhEn0d45X20TbQKAjMSZ7o3Zrs9j72QXpaxDElDnVpYhSseeel NWyelFgRJrOK7nZK2lAoK8Zfh8LodSwBkr49i8nwS7mwjuIGgsE9iQEEe5ysDgq5lVoS 9DIxeJztgwrSCqbOSIIVzroc5XzjJLynsPF3g6/BndmDaBrD+5ofHRLQ1ykR3Sqxk+bh pubwadUF8UTvQlVk5FjcD2KqKqvOVDYPYBnC7WrU6w+gJptyftcz0HeWxh3euEmCBlq0 JCN5JkVvWBefT90Z2O8v+TMtCNYtIu7LCi5znWIAf4eBmIvMxtrt8DcGuJsAB/KVa7tV FiDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=OXzdsloRXB8WS1CH8p1FEaeaWBtMOAym3FLJbD2hm9Y=; b=qO7jXrZ4Q67L8/v8JVJ+5+RmgFffijVUwTiheGBhOoe2BFjrX50cVBKIjnU6onmeQ0 pe1F/UE1gj/5wnTLYtvjg7mJMfMuSEcuEIXdol+1Ne6oTJq0XndL/o/N9zIknzVyRICD C8/WVYY+IIxL63BNgS/T5exUtov0HOGCuVOLcGmC7tStUbnWMB2D5r2AasuVV3tYFFpp Knllq12Tu/7ZKwfKk7xi/+F7Y2IQYUBZzmCU0WziaJtv0iQNvOMlYwU4k52hL49HcW9w 2YPY8925NueDxC68L2em7Xt0rh3BXJ6LpZ3R+iSWIm7LUwDYJlwM+yhDDHbJqe6ykTzc LkUA== X-Gm-Message-State: ACrzQf3YayAqZxX4ncy8m8zEFXZdkBOcB9jKykBpbjgm3KnbOhmaGgSa B3OEHdSacmNkZApPaAU5E95nhQ== X-Received: by 2002:a05:6000:1ac7:b0:22a:906d:3577 with SMTP id i7-20020a0560001ac700b0022a906d3577mr2026118wry.33.1664452194911; Thu, 29 Sep 2022 04:49:54 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q10-20020a1cf30a000000b003b47575d304sm4949402wmq.32.2022.09.29.04.49.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1499F1FFCD; Thu, 29 Sep 2022 12:42:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Maydell , Richard Henderson , Eduardo Habkost , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PATCH v1 24/51] tests/tcg: move compiler tests to Makefiles Date: Thu, 29 Sep 2022 12:42:04 +0100 Message-Id: <20220929114231.583801-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Further decoupling of tests/tcg from the main QEMU Makefile, and making the build more similar between the cross compiler case and the vetted container images. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- configure | 65 +---------------------- tests/tcg/Makefile.target | 10 +++- tests/tcg/aarch64/Makefile.softmmu-target | 5 ++ tests/tcg/aarch64/Makefile.target | 9 ++++ tests/tcg/i386/Makefile.target | 6 +++ tests/tcg/ppc64/Makefile.target | 7 +++ 6 files changed, 38 insertions(+), 64 deletions(-) diff --git a/configure b/configure index a48a731bf4..ceb1213292 100755 --- a/configure +++ b/configure @@ -2562,73 +2562,11 @@ for target in $target_list; do probe_target_compiler $target if test $got_cross_cc = yes; then - # Test for compiler features for optional tests. We only do this - # for cross compilers because ensuring the docker containers based - # compilers is a requirememt for adding a new test that needs a - # compiler feature. - - echo "BUILD_STATIC=$build_static" >> "$config_target_mak" write_target_makefile >> "$config_target_mak" - case $target in - aarch64-*) - if do_compiler "$target_cc" $target_cflags \ - -march=armv8.1-a+sve -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_SVE=y" >> "$config_target_mak" - fi - if do_compiler "$target_cc" $target_cflags \ - -march=armv8.1-a+sve2 -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_SVE2=y" >> "$config_target_mak" - fi - if do_compiler "$target_cc" $target_cflags \ - -march=armv8.3-a -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_ARMV8_3=y" >> "$config_target_mak" - fi - if do_compiler "$target_cc" $target_cflags \ - -mbranch-protection=standard -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_ARMV8_BTI=y" >> "$config_target_mak" - fi - if do_compiler "$target_cc" $target_cflags \ - -march=armv8.5-a+memtag -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_ARMV8_MTE=y" >> "$config_target_mak" - fi - ;; - ppc*) - if do_compiler "$target_cc" $target_cflags \ - -mpower8-vector -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_POWER8_VECTOR=y" >> "$config_target_mak" - fi - if do_compiler "$target_cc" $target_cflags \ - -mpower10 -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_POWER10=y" >> "$config_target_mak" - fi - ;; - i386-linux-user) - if do_compiler "$target_cc" $target_cflags \ - -Werror -fno-pie -o $TMPE $TMPC; then - echo "CROSS_CC_HAS_I386_NOPIE=y" >> "$config_target_mak" - fi - ;; - esac elif test -n "$container_image"; then + build_static=y echo "build-tcg-tests-$target: docker-image-$container_image" >> $makefile - echo "BUILD_STATIC=y" >> "$config_target_mak" write_container_target_makefile >> "$config_target_mak" - case $target in - aarch64-*) - echo "CROSS_CC_HAS_SVE=y" >> "$config_target_mak" - echo "CROSS_CC_HAS_SVE2=y" >> "$config_target_mak" - echo "CROSS_CC_HAS_ARMV8_3=y" >> "$config_target_mak" - echo "CROSS_CC_HAS_ARMV8_BTI=y" >> "$config_target_mak" - echo "CROSS_CC_HAS_ARMV8_MTE=y" >> "$config_target_mak" - ;; - ppc*) - echo "CROSS_CC_HAS_POWER8_VECTOR=y" >> "$config_target_mak" - echo "CROSS_CC_HAS_POWER10=y" >> "$config_target_mak" - ;; - i386-linux-user) - echo "CROSS_CC_HAS_I386_NOPIE=y" >> "$config_target_mak" - ;; - esac got_cross_cc=yes fi if test $got_cross_cc = yes; then @@ -2637,6 +2575,7 @@ for target in $target_list; do ln -sf "../config-$target.mak" "tests/tcg/$target/config-target.mak" echo "TARGET=$target" >> "$config_target_mak" echo "QEMU=$PWD/$qemu" >> "$config_target_mak" + echo "BUILD_STATIC=$build_static" >> "$config_target_mak" echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile tcg_tests_targets="$tcg_tests_targets $target" fi diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index cd0a2ad873..75257f2b29 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -40,10 +40,18 @@ endif # for including , in command strings COMMA := , +NULL := +SPACE := $(NULL) # +TARGET_PREFIX=tests/tcg/$(TARGET):$(SPACE) quiet-@ = $(if $(V),,@$(if $1,printf " %-7s %s\n" "$(strip $1)" "$(strip $2)" && )) quiet-command = $(call quiet-@,$2,$3)$1 +cc-test = $(CC) -Werror $1 -c -o /dev/null -xc /dev/null >/dev/null 2>&1 +cc-option = if $(call cc-test, $1); then \ + echo "$(TARGET_PREFIX)$1 detected" && echo "$(strip $2)=y" >&3; else \ + echo "$(TARGET_PREFIX)$1 not detected"; fi + # $1 = test name, $2 = cmd, $3 = desc ifeq ($(filter %-softmmu, $(TARGET)),) run-test = $(call quiet-command, timeout --foreground $(TIMEOUT) $2 > $1.out, \ @@ -190,4 +198,4 @@ clean: rm -f $(TESTS) *.o $(CLEANFILES) distclean: - rm -f config-target.mak ../config-$(TARGET).mak + rm -f config-cc.mak config-target.mak ../config-$(TARGET).mak diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/Makefile.softmmu-target index 84a9990f8d..a1368905f5 100644 --- a/tests/tcg/aarch64/Makefile.softmmu-target +++ b/tests/tcg/aarch64/Makefile.softmmu-target @@ -19,6 +19,11 @@ EXTRA_RUNS+=$(MULTIARCH_RUNS) CFLAGS+=-nostdlib -ggdb -O0 $(MINILIB_INC) LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc +config-cc.mak: Makefile + $(quiet-@)( \ + $(call cc-option,-march=armv8.3-a, CROSS_CC_HAS_ARMV8_3)) 3> config-cc.mak +-include config-cc.mak + # building head blobs .PRECIOUS: $(CRT_OBJS) diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index 9837a809dc..fc8d90ed69 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -17,6 +17,15 @@ run-fcvt: fcvt $(call run-test,$<,$(QEMU) $<, "$< on $(TARGET_NAME)") $(call diff-out,$<,$(AARCH64_SRC)/fcvt.ref) +config-cc.mak: Makefile + $(quiet-@)( \ + $(call cc-option,-march=armv8.1-a+sve, CROSS_CC_HAS_SVE); \ + $(call cc-option,-march=armv8.1-a+sve2, CROSS_CC_HAS_SVE2); \ + $(call cc-option,-march=armv8.3-a, CROSS_CC_HAS_ARMV8_3); \ + $(call cc-option,-mbranch-protection=standard, CROSS_CC_HAS_ARMV8_BTI); \ + $(call cc-option,-march=armv8.5-a+memtag, CROSS_CC_HAS_ARMV8_MTE)) 3> config-cc.mak +-include config-cc.mak + # Pauth Tests ifneq ($(CROSS_CC_HAS_ARMV8_3),) AARCH64_TESTS += pauth-1 pauth-2 pauth-4 pauth-5 diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index 8af066efc5..3273aa8061 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -5,6 +5,12 @@ I386_SRC=$(SRC_PATH)/tests/tcg/i386 # Set search path for all sources VPATH += $(I386_SRC) +config-cc.mak: Makefile + $(quiet-@)( \ + $(call cc-option,-fno-pie, CROSS_CC_HAS_I386_NOPIE)) 3> config-cc.mak + +-include config-cc.mak + I386_SRCS=$(notdir $(wildcard $(I386_SRC)/*.c)) ALL_X86_TESTS=$(I386_SRCS:.c=) SKIP_I386_TESTS=test-i386-ssse3 test-avx test-3dnow test-mmx diff --git a/tests/tcg/ppc64/Makefile.target b/tests/tcg/ppc64/Makefile.target index 7db7a3e2b3..f081f1c683 100644 --- a/tests/tcg/ppc64/Makefile.target +++ b/tests/tcg/ppc64/Makefile.target @@ -4,6 +4,13 @@ VPATH += $(SRC_PATH)/tests/tcg/ppc64 +config-cc.mak: Makefile + $(quiet-@)( \ + $(call cc-option,-mpower8-vector, CROSS_CC_HAS_POWER8_VECTOR); \ + $(call cc-option,-mpower10, CROSS_CC_HAS_POWER10)) 3> config-cc.mak + +-include config-cc.mak + ifneq ($(CROSS_CC_HAS_POWER8_VECTOR),) PPC64_TESTS=bcdsub non_signalling_xscv endif From patchwork Thu Sep 29 11:42:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610603 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp907911pvb; Thu, 29 Sep 2022 06:59:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5w2lWKtTdNZYBCw64OJHIk1qTJRsQS+fZwGFsZYVPX+z87/praUxvn9pHC2+iPcW8f934M X-Received: by 2002:a05:6214:b6a:b0:4ad:68bf:1b8b with SMTP id ey10-20020a0562140b6a00b004ad68bf1b8bmr2720068qvb.2.1664459980312; Thu, 29 Sep 2022 06:59:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664459980; cv=none; d=google.com; s=arc-20160816; b=reeXpYL8kqaleMAUVCrE33tQza2ojaB35jDpUSH3q0BX4ORynWLJX2TvInas/EPbTO E4bkRWY56i9crCX3YHN+QS8ofHWSSJAdScvCCjKa4W7xek5SUSwS/y0LKTQ3MazyvSub QnfY48ZS1OjAlDZwqMmnP17sMoUD9vbjS3QPIOQpswliUnH625eOMMjhZfmI8xeAygIF DhVp/6QXrvU91S3gC6K5+bhg/lhFxwM2E4EyscBTZeMP8QvuDrimm4BA/1MZbl8+DUxV UCOZkfsfpus80c1bgLsGX4NMkaD3HzsJ9stbwWjQKdWdVsyv/W8ZD5CDA2TzQgWcogEN 1ufQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bFMnPZI39K0sB6qljzVqyj/PiofPOyUCvNvoHy9FtII=; b=ttvvlg1ckQXOdSS03rzSRln9RS/bHQ6sUmpGLrw8OXH9bLdtKaFbxSX51NbkQoFvhI /p+nwqrPXcbVmDzWWnCdsd2To8AFkQGs9C8IJiXW2bVoFdvdwYzkrXBCMkglrI81wijI lVjms5Pi6bWPNM5/0xnE2v16O1oVpTH7t4gVoH6U72wkRA3nBXv34CHszOv2UGkpctkA CbKpedyJYYtemuHZZVL/8oRV3jLeZgzT5Cra1HFGJ/adOszwg6Lpy4t1jGMwZE4xlaiS GOJQi02DGTwkrggu7js+D7IoHxnh6j5PAXhDeM7x5zyxVxkoU4GYYVPN0+LpGmrZ6M+i O5rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="H2Y/5hKO"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a26-20020ac84d9a000000b0035cf72a3281si1155769qtw.498.2022.09.29.06.59.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:59:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="H2Y/5hKO"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odu4h-0006Cn-PT for patch@linaro.org; Thu, 29 Sep 2022 09:59:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3C-0000N8-7O for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:05 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:36431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods39-0002Nh-LF for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:49:57 -0400 Received: by mail-wr1-x430.google.com with SMTP id v28so1797831wrd.3 for ; Thu, 29 Sep 2022 04:49:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=bFMnPZI39K0sB6qljzVqyj/PiofPOyUCvNvoHy9FtII=; b=H2Y/5hKOM+NSy48gfZkRDqv2/blKE764JkctH3C0hh30XbmeFWnFyd/d6rtAOuONOy tYBleGGc900bBPY5BqX1n+QWQDvuNnYpI0oCiHeXHBIUnHPJVOvWC9lQQhhZ16HY675Z l25qlJ4iFKnzp9pnWobUS0Pf26pRvF8IGMRSoovq0jni72Ja2u6uXHAmWUVhkjQNjPFd QwctNTCvU6P1SxilnXdnerjdb4KKrl0EpC1Wdo3eNNiPrTh7jlYXPtUJN7j7QLjfY3SY 2uDWGPmqC+Z/0laQJxutbGHuq+MlUR38LZFkrRh9Tf32OqOwycj4GFShXCOi2te/ANlI O5kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=bFMnPZI39K0sB6qljzVqyj/PiofPOyUCvNvoHy9FtII=; b=ejV9HZIAObCs48bE2J0bDIVAgGrHm1FYmftax7V4IZCX16x+ImRPNJtnQMiYwZhY9l 3cVX5lHtI4KFyvaCIVNfWR/Cn477TRS09unOUKXsfoomQ+5KSG2S53dMbLQtgeQrFONc mxD5cTSiyKXH8OIdjLwEXcehRy7nIz1zPMUGOEIw0y9yZ4O7Yiwy4MpmGQKTEKw6TN08 kC1yHkqHl2asrr2nBHPrTBUpzdwp7tmrTagWkcOlsh6yE2b95G+d6XvyHvKfVLFG8ftA meqrXH0xncK6dpadMnpu3zj1ojtnTDjkefwvvlfz/SxQtS1zf3+s3iPlxNEDOOPG2uSQ XJsA== X-Gm-Message-State: ACrzQf0wxc2nSBFHISnva6Ym95GjL+yzGl26FB5dbJik4ReGIpycUjaj H/M2H7pNGx2qqoR9Gl3Oh871a29P6t6H2w== X-Received: by 2002:adf:ed50:0:b0:22c:c749:8b81 with SMTP id u16-20020adfed50000000b0022cc7498b81mr1925896wro.644.1664452194283; Thu, 29 Sep 2022 04:49:54 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id b4-20020a05600c150400b003a5c999cd1asm4909352wmg.14.2022.09.29.04.49.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 359E51FFBB; Thu, 29 Sep 2022 12:42:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 25/51] configure: move tests/tcg/Makefile.prereqs to root build directory Date: Thu, 29 Sep 2022 12:42:05 +0100 Message-Id: <20220929114231.583801-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini It will not be specific to tests/tcg anymore, since it will be possible to build firmware using container-based cross compilers too. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- configure | 15 +++++++-------- Makefile | 5 ++++- tests/Makefile.include | 3 --- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/configure b/configure index ceb1213292..cbeac99b2b 100755 --- a/configure +++ b/configure @@ -2185,6 +2185,7 @@ write_target_makefile() { } write_container_target_makefile() { + echo "$1: docker-image-$container_image" >> Makefile.prereqs echo "EXTRA_CFLAGS=$target_cflags" if test -n "$container_cross_cc"; then echo "CC=$docker_py cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" @@ -2297,6 +2298,8 @@ for f in $LINKS ; do fi done +echo "# Automatically generated by configure - do not modify" > Makefile.prereqs + # Mac OS X ships with a broken assembler roms= if test "$targetos" != "darwin" && test "$targetos" != "sunos" && \ @@ -2524,10 +2527,7 @@ if test "$safe_stack" = "yes"; then fi # tests/tcg configuration -(makefile=tests/tcg/Makefile.prereqs -echo "# Automatically generated by configure - do not modify" > $makefile - -config_host_mak=tests/tcg/config-host.mak +(config_host_mak=tests/tcg/config-host.mak mkdir -p tests/tcg echo "# Automatically generated by configure - do not modify" > $config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak @@ -2565,8 +2565,7 @@ for target in $target_list; do write_target_makefile >> "$config_target_mak" elif test -n "$container_image"; then build_static=y - echo "build-tcg-tests-$target: docker-image-$container_image" >> $makefile - write_container_target_makefile >> "$config_target_mak" + write_container_target_makefile build-tcg-tests-$target >> "$config_target_mak" got_cross_cc=yes fi if test $got_cross_cc = yes; then @@ -2576,11 +2575,11 @@ for target in $target_list; do echo "TARGET=$target" >> "$config_target_mak" echo "QEMU=$PWD/$qemu" >> "$config_target_mak" echo "BUILD_STATIC=$build_static" >> "$config_target_mak" - echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile + echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs tcg_tests_targets="$tcg_tests_targets $target" fi done -echo "TCG_TESTS_TARGETS=$tcg_tests_targets" >> $makefile) +echo "TCG_TESTS_TARGETS=$tcg_tests_targets" >> config-host.mak) if test "$skip_meson" = no; then cross="config-meson.cross.new" diff --git a/Makefile b/Makefile index 0fcde48bec..357592ad39 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,9 @@ configure: ; ifneq ($(wildcard config-host.mak),) include config-host.mak +include Makefile.prereqs +Makefile.prereqs: config-host.mak + git-submodule-update: .git-submodule-status: git-submodule-update config-host.mak Makefile: .git-submodule-status @@ -217,7 +220,7 @@ qemu-%.tar.bz2: distclean: clean recurse-distclean -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || : - rm -f config-host.mak qemu-bundle + rm -f config-host.mak Makefile.prereqs qemu-bundle rm -f tests/tcg/config-*.mak rm -f config.status rm -f roms/seabios/config.mak diff --git a/tests/Makefile.include b/tests/Makefile.include index 9ed67721e2..9422ddaece 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -36,9 +36,6 @@ export SRC_PATH SPEED = quick --include tests/tcg/Makefile.prereqs -tests/tcg/Makefile.prereqs: config-host.mak - # Per guest TCG tests BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TCG_TESTS_TARGETS)) CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TCG_TESTS_TARGETS)) From patchwork Thu Sep 29 11:42:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610608 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp915419pvb; Thu, 29 Sep 2022 07:10:34 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7mjTJr0IMrz/ZofV+Ztf9OfzWWbFM6YAS6/9ABFi+zDM++Z7KyKm6eSWHVSm3GZbE295Rk X-Received: by 2002:ad4:5b84:0:b0:4af:4ad5:cbd7 with SMTP id 4-20020ad45b84000000b004af4ad5cbd7mr2668439qvp.7.1664460634172; Thu, 29 Sep 2022 07:10:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664460634; cv=none; d=google.com; s=arc-20160816; b=re+uuNjD0GZhjHytcOijH5/NlS7pH3d6MXHJJJBfWOVYdafSyB0SJRdwtFap67TdLu mzP37et4AC6sW5XzGhQPr0DD5QjlcyTNstLm/vDGmPgFNfJi99sMeGqU/sgvf4abaf90 U9MWl0V2TBb93XkMJjJsHfg+yAHeRnTSiHysTbxD8xJb2bI9mQ+Rl3FXFkQuYQUlfwEW 9NHsm0Cg88SmEe3rC/F9tkFz4czN+2ewsBgf9e3vD1gC0IoLzyky8HZ9/uhdDTnj3Dfk hpm46IEw8je8zhH5F2FymaRUHuyjiFyheVw9IHB1gg0Pj+rZ92IrYkewUdGtz5DCW+Xe Hs9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Ni3h4Ensb2+EbCS1w58timGRfCJrzPXBUuLWwhQJKIE=; b=ClX5RzZuyCRRv0cyMAIBH9HvW2rtB+AAbAqfhaf+1CJirPVQYFDeg0aPp/MDYxRKjo Hh2eg6tCEtn9qEEHEXwHgOVN/hRauVakRPQnekiOT4/OZRxEmlwrZfz71dtIMAWuH35E YOqObLKgNEP9Lpg5O4NrT4GaAmpRPe/KBPVQyaz1Z182AbQ5ZpC9n1cdcj4+v6knV8qn QkzfDGAkQSHYGkDCLx1ttuPjMw9RJ0hgei88dEmGt/2a7x2UVq6y5AVNvQRDWSqrpW+i YqEvGlsMIS03A+hByy/mLz2d3VZs276ZUVTnGpqGAWarcXMdQS+B8VuE3eyBAbHe9lkP 5V4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="s9/366Aj"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ck13-20020a05622a230d00b0035bb4298516si1231701qtb.95.2022.09.29.07.10.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 07:10:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="s9/366Aj"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oduFD-0004Qv-B4 for patch@linaro.org; Thu, 29 Sep 2022 10:10:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odsCx-0007Qb-7n for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:03 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:44825) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odsCr-0004LZ-P7 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:02 -0400 Received: by mail-wr1-x429.google.com with SMTP id c11so1800017wrp.11 for ; Thu, 29 Sep 2022 04:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=Ni3h4Ensb2+EbCS1w58timGRfCJrzPXBUuLWwhQJKIE=; b=s9/366AjJ+S9BIXNEDOXYJ5QKu8bTZDN+WUCJ0wRsNxTWBWxvv939/T8zFEOMKsTIj 3y7AR0VxpEtLbF3kDyGT5aReyB1uGMJUrU1OI9L6W+pd0LrqHTgMaJ4Evq6p6Uj7hsuz upVkZmURETau+TnQi8xZbGJIx/UTedMfPQd0rBJVHsxcPu4YFtJl7EIp1AwxfjN7CkKF 0dILer0xyfrVPBGvYkRbMNzGJjhqcnE633O879FqzubR8faGj0wBy3rp/VJ83kwN9B/p xtn9uZNymFaqromV7alKol1FVNzTGzZjX16dQ7LUg3NIS00Z0pfiTPlXMfaB1ZNGprEP E1YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=Ni3h4Ensb2+EbCS1w58timGRfCJrzPXBUuLWwhQJKIE=; b=tpL4oyqaD0bi5zbT0RidYJ0SSd94tveGn3hXUb9MRgb3fFHcnVlooLxJ5GpGSi+OOx FIJbJK31q25JY5omYWWdYzmeULUIS4OMiVut1IB2dVk5becEy5jDwY8j5NU98o6dS2J9 0rcGQOJVCn5cBA7oK97RNoMHjB3n2W0r11sdZHcbqkWkNRc1cj9mrLgtXM89H92X8VeI z3rneOWlfWgHP17Z70ReHrchFml8l5yj00s6wDXjPcYazrpzPXAAzzbU0fs3gPbPiToe t4oN0QW1wS/7ZCqQedirnDRndbYOmWt7OJqAgOu6R6sAU/XpGqkuTCJH402AT5iMyYW0 LYaw== X-Gm-Message-State: ACrzQf0B99tsqUCrfwFRShZA/eaZR7chFDZX5zC8o53e5f2VcdOj4alm bf4vum4sSFxv8TRs5+OGX/qonA== X-Received: by 2002:adf:d0cd:0:b0:22b:1ade:7980 with SMTP id z13-20020adfd0cd000000b0022b1ade7980mr1905872wrh.265.1664452792167; Thu, 29 Sep 2022 04:59:52 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id r9-20020adfda49000000b002258235bda3sm6731971wrl.61.2022.09.29.04.59.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:59:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4CC721FFCE; Thu, 29 Sep 2022 12:42:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 26/51] configure: unify creation of cross-compilation Makefiles Date: Thu, 29 Sep 2022 12:42:06 +0100 Message-Id: <20220929114231.583801-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Let write_target_makefile handle both host and container cross compilers. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- configure | 94 +++++++++++++++++++++++++------------------------------ 1 file changed, 43 insertions(+), 51 deletions(-) diff --git a/configure b/configure index cbeac99b2b..8b495d4453 100755 --- a/configure +++ b/configure @@ -2157,51 +2157,49 @@ probe_target_compiler() { write_target_makefile() { echo "EXTRA_CFLAGS=$target_cflags" - if test -n "$target_cc"; then - echo "CC=$target_cc" - echo "CCAS=$target_ccas" - fi - if test -n "$target_ar"; then - echo "AR=$target_ar" - fi - if test -n "$target_as"; then - echo "AS=$target_as" - fi - if test -n "$target_ld"; then - echo "LD=$target_ld" - fi - if test -n "$target_nm"; then - echo "NM=$target_nm" - fi - if test -n "$target_objcopy"; then - echo "OBJCOPY=$target_objcopy" - fi - if test -n "$target_ranlib"; then - echo "RANLIB=$target_ranlib" - fi - if test -n "$target_strip"; then - echo "STRIP=$target_strip" - fi -} - -write_container_target_makefile() { - echo "$1: docker-image-$container_image" >> Makefile.prereqs - echo "EXTRA_CFLAGS=$target_cflags" - if test -n "$container_cross_cc"; then - echo "CC=$docker_py cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" - echo "CCAS=$docker_py cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" + if test -z "$target_cc" && test -z "$target_as"; then + test -z "$container_image" && error_exit "Internal error: could not find cross compiler for $1?" + echo "$1: docker-image-$container_image" >> Makefile.prereqs + if test -n "$container_cross_cc"; then + echo "CC=$docker_py cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" + echo "CCAS=$docker_py cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" + fi + echo "AR=$docker_py cc --cc $container_cross_ar -i qemu/$container_image -s $source_path --" + echo "AS=$docker_py cc --cc $container_cross_as -i qemu/$container_image -s $source_path --" + echo "LD=$docker_py cc --cc $container_cross_ld -i qemu/$container_image -s $source_path --" + echo "NM=$docker_py cc --cc $container_cross_nm -i qemu/$container_image -s $source_path --" + echo "OBJCOPY=$docker_py cc --cc $container_cross_objcopy -i qemu/$container_image -s $source_path --" + echo "RANLIB=$docker_py cc --cc $container_cross_ranlib -i qemu/$container_image -s $source_path --" + echo "STRIP=$docker_py cc --cc $container_cross_strip -i qemu/$container_image -s $source_path --" + else + if test -n "$target_cc"; then + echo "CC=$target_cc" + echo "CCAS=$target_ccas" + fi + if test -n "$target_ar"; then + echo "AR=$target_ar" + fi + if test -n "$target_as"; then + echo "AS=$target_as" + fi + if test -n "$target_ld"; then + echo "LD=$target_ld" + fi + if test -n "$target_nm"; then + echo "NM=$target_nm" + fi + if test -n "$target_objcopy"; then + echo "OBJCOPY=$target_objcopy" + fi + if test -n "$target_ranlib"; then + echo "RANLIB=$target_ranlib" + fi + if test -n "$target_strip"; then + echo "STRIP=$target_strip" + fi fi - echo "AR=$docker_py cc --cc $container_cross_ar -i qemu/$container_image -s $source_path --" - echo "AS=$docker_py cc --cc $container_cross_as -i qemu/$container_image -s $source_path --" - echo "LD=$docker_py cc --cc $container_cross_ld -i qemu/$container_image -s $source_path --" - echo "NM=$docker_py cc --cc $container_cross_nm -i qemu/$container_image -s $source_path --" - echo "OBJCOPY=$docker_py cc --cc $container_cross_objcopy -i qemu/$container_image -s $source_path --" - echo "RANLIB=$docker_py cc --cc $container_cross_ranlib -i qemu/$container_image -s $source_path --" - echo "STRIP=$docker_py cc --cc $container_cross_strip -i qemu/$container_image -s $source_path --" } - - ########################################## # check for vfio_user_server @@ -2560,15 +2558,9 @@ for target in $target_list; do ;; esac - probe_target_compiler $target - if test $got_cross_cc = yes; then - write_target_makefile >> "$config_target_mak" - elif test -n "$container_image"; then - build_static=y - write_container_target_makefile build-tcg-tests-$target >> "$config_target_mak" - got_cross_cc=yes - fi - if test $got_cross_cc = yes; then + if probe_target_compiler $target || test -n "$container_image"; then + test -n "$container_image" && build_static=y + write_target_makefile "build-tcg-tests-$target >> "$config_target_mak" mkdir -p "tests/tcg/$target" ln -sf "$source_path/tests/tcg/Makefile.target" "tests/tcg/$target/Makefile" ln -sf "../config-$target.mak" "tests/tcg/$target/config-target.mak" From patchwork Thu Sep 29 11:42:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610596 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp897946pvb; Thu, 29 Sep 2022 06:40:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Gwzu+Z6uz6P+5lVcC9qWHaFqYZmRzPd0q10ix0j9RJKr7Vbjk+Oy1YzRjrdRGtzkaI8hU X-Received: by 2002:a05:620a:4089:b0:6ce:29eb:9692 with SMTP id f9-20020a05620a408900b006ce29eb9692mr2193232qko.273.1664458810053; Thu, 29 Sep 2022 06:40:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664458810; cv=none; d=google.com; s=arc-20160816; b=bu9QOty8wtqkxdC6bQTpqe0u+jpkxRXlG/70Ux8Dhe3tH6w/ii+SpYbqOWhifcDQyO 0YfmRl59A1VdhW11rtDAIB31eNKnq6yX28Vr2XYP2QRP+kbDlWPVDurzIVWUcBNQXOQg UmhEvmv9tTU87TCe0/9b0uA/+l6zfek9sa1kQpZRU6I3VGBiDqa3RFcCNcrz440ND5Vz HNnGdsn0KhYUO4KdmrXzuc6Rp3a97MpRed/GPuzEeZ1T+ChsKIKFaYLPfiHw8C29vCmV TCiPBrOfMpRqzMQ7TbKhukHlW2qc/B7Iu+XVSMgzP4rFciBCyyeCz46HbN10k3bF5MKw +w8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=R5BZF8K6ZhoW9OV4ExNUqQ51TJUdrkSyv1BWAJuhkG0=; b=q7jFWzF8slLOid7eLDJxeJ83sthr9oWah1CNQtZ1dAQ2afOrhFYdTn9F6Db0U8wabf Pvbzn6ycnqNDxjiJ/a5EAN8+vAHp8P5lhV8OTY//TtDohp+9Wr6dF7SjBAi+U1OYW49j c2yuOrhwe+eUdV1N7xbuf65H3ddOiLWZvk+OwsrkYwNpxKyYSDysyGuMFr91nBN/HODa 2fEidxQzybVOyDuD/bUIjO1J+LWoDJtX2SEJWwjYecx01ajZA9veNusUkg8yirwyr9kV dSTEIrZnv/bUFIKaEThdN0SM+gGsdy1XmVFZk3Wk0/MXxv/2hYRW5GWIhnIKacFwPlzA BneA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tj6VXTWw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u12-20020a0562141c0c00b0047391cb103dsi5150444qvc.225.2022.09.29.06.40.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:40:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tj6VXTWw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odtlp-0001GJ-Gz for patch@linaro.org; Thu, 29 Sep 2022 09:40:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3C-0000NA-8x for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:05 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:43862) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods38-0002NS-Er for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:49:56 -0400 Received: by mail-wr1-x42c.google.com with SMTP id h7so1759143wru.10 for ; Thu, 29 Sep 2022 04:49:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=R5BZF8K6ZhoW9OV4ExNUqQ51TJUdrkSyv1BWAJuhkG0=; b=Tj6VXTWwdEgFtdNeLbHHJ7NyYRbpI2GXgw/U97jw7WBFCoHyvKB6XMA6F2FBtsHBYR cdzCHlAQRcelrSDbZJhLuukZTzoQ5BRxy+RBZB+O2ZVwfE5eMobE87jdFA5X41jKUWmq 2L4EBIBWMTBs6fTCJH9GfaKkJ7zCJA2u894eiStIy5aIOCntPDogms5V1vvG5DKI138c gbr6eXPUev5xUUB0kqRDp7Pmvxbd8qNSP2wcjHomv9LGEvdCWDaHdJT9SkcIoFkc7tqC a8mhSpe0HsqvlhvP5uA1q7nWwih6JeEL1nHoqJoRtlbubfNQFpEDX6uP8FcqAA5la7KF 0/gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=R5BZF8K6ZhoW9OV4ExNUqQ51TJUdrkSyv1BWAJuhkG0=; b=czybk5hg8TOI12cPO3VnsK6/03rXuTTc3dBJjzhjoQmUshxXg+hpZcVTJuFx9yvrTq ZmLiCg/hQMhocd9uwyzagtANT12I29l3Q1brbTsi59H1S3UffTC9E0V0AoVU5z0xnQyc mfHRRMRsewMBv2XpYLkly6Vqb675eTLaVpkZIjkD+nmX+ggAdqhtCstvPvvaoxK+tSiM W6v0vPEnrhUS3TEgbxzU5DVh0un3EjztVFwObj7flg/IGxOSHwvA6Kt4GlKQ7rbHPT/R 5SEH0UlnnanISoSE97dtk1IIyGw3MsfYO8rJ5byk8PTJY0lIvTvm1b9HC29VKQpJb4n/ iKIQ== X-Gm-Message-State: ACrzQf2bpwaQdNJ79LLcXL8SOBbVWqW/OWmvijGcRbriRxlJpYPZROWy jnu3dze6j1VVbt0OP1l6kt04dA== X-Received: by 2002:adf:dd8f:0:b0:22a:84ab:4be3 with SMTP id x15-20020adfdd8f000000b0022a84ab4be3mr1942252wrl.40.1664452193106; Thu, 29 Sep 2022 04:49:53 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h9-20020a1c2109000000b003b4fac020c8sm3996987wmh.16.2022.09.29.04.49.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 680C11FFCF; Thu, 29 Sep 2022 12:42:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 27/51] configure: cleanup creation of tests/tcg target config Date: Thu, 29 Sep 2022 12:42:07 +0100 Message-Id: <20220929114231.583801-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Remove the symlink to tests/tcg/config-*.mak, which is possible now that unused target config files are not created either. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- configure | 12 +++++------- Makefile | 2 +- meson.build | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 8b495d4453..c175650eb9 100755 --- a/configure +++ b/configure @@ -2540,10 +2540,6 @@ tcg_tests_targets= for target in $target_list; do arch=${target%%-*} - config_target_mak=tests/tcg/config-$target.mak - - echo "# Automatically generated by configure - do not modify" > $config_target_mak - echo "TARGET_NAME=$arch" >> "$config_target_mak" case $target in xtensa*-linux-user) # the toolchain is not complete with headers, only build softmmu tests @@ -2560,13 +2556,15 @@ for target in $target_list; do if probe_target_compiler $target || test -n "$container_image"; then test -n "$container_image" && build_static=y - write_target_makefile "build-tcg-tests-$target >> "$config_target_mak" mkdir -p "tests/tcg/$target" + config_target_mak=tests/tcg/$target/config-target.mak ln -sf "$source_path/tests/tcg/Makefile.target" "tests/tcg/$target/Makefile" - ln -sf "../config-$target.mak" "tests/tcg/$target/config-target.mak" + echo "# Automatically generated by configure - do not modify" > "$config_target_mak" + echo "TARGET_NAME=$arch" >> "$config_target_mak" echo "TARGET=$target" >> "$config_target_mak" - echo "QEMU=$PWD/$qemu" >> "$config_target_mak" + write_target_makefile "build-tcg-tests-$target" >> "$config_target_mak" echo "BUILD_STATIC=$build_static" >> "$config_target_mak" + echo "QEMU=$PWD/$qemu" >> "$config_target_mak" echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs tcg_tests_targets="$tcg_tests_targets $target" fi diff --git a/Makefile b/Makefile index 357592ad39..a48103cc8a 100644 --- a/Makefile +++ b/Makefile @@ -221,7 +221,7 @@ qemu-%.tar.bz2: distclean: clean recurse-distclean -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || : rm -f config-host.mak Makefile.prereqs qemu-bundle - rm -f tests/tcg/config-*.mak + rm -f tests/tcg/*/config-target.mak tests/tcg/config-host.mak rm -f config.status rm -f roms/seabios/config.mak rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols diff --git a/meson.build b/meson.build index 8dc661363f..ac5ef05c21 100644 --- a/meson.build +++ b/meson.build @@ -3738,7 +3738,7 @@ summary(summary_info, bool_yn: true, section: 'Compilation') summary_info = {} have_cross = false foreach target: target_dirs - tcg_mak = meson.current_build_dir() / 'tests/tcg' / 'config-' + target + '.mak' + tcg_mak = meson.current_build_dir() / 'tests/tcg' / target / 'config-target.mak' if fs.exists(tcg_mak) config_cross_tcg = keyval.load(tcg_mak) if 'CC' in config_cross_tcg From patchwork Thu Sep 29 11:42:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610587 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp880841pvb; Thu, 29 Sep 2022 06:10:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5WKbQnuAo+WawxdcUV8so0SojLiQICIT0ZW1CIi/5W3gbiwDf+lDHUHcNmDi+joHO3rl+4 X-Received: by 2002:a0c:8dc9:0:b0:473:14fe:7c4e with SMTP id u9-20020a0c8dc9000000b0047314fe7c4emr2284145qvb.44.1664457057449; Thu, 29 Sep 2022 06:10:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664457057; cv=none; d=google.com; s=arc-20160816; b=lIs28A98yYTwzjtoYK825dMIq6XPCn/W7gm8XJukyX67Mw0d2WmE7B/UEVXUZwygib H/t3u+gQMcnUSNJhnzIUsqgwgXc7KE0J1RNYUmAlh6yHLJym9xLHhGufuhSGyMiOwbpi Mc8/pANl8OlW2dU4mkfdotF5Ymq7dA6YJ9kwaMmW/lDXG3bvCcI+GGPtKaXlsGeqIbaM wqY42wSGa5Jog8+DzF7EYHtyPZTMjvQDjhVeQWK0M6vCAWbUn5lNqCSTDpRap+TDeSvF tiw5hQ4qrqaQDYSR9U9tZ+3BilRCQ6Ix2cm9+k8RhkWkh0WQoAuwAjaylcBDqSyXkJbi KsMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KtKYefRpdBrq386zGzvYj2i6PNAoiGDyuMR12lnFx6w=; b=CQJsvrwiwWFj0zdPJBye/F6+Eeia4cYF6Qx6sIP/+/PT4ZQWTfrdURI9XVxD48zMx3 oouYaHpYVlsXx9sHYN2tMpNYPNgEFOGL13DyuaOamCCcVJXcQNkvheEmMtZZrz26jFD7 46wid8RzkzLDDBIZJnb/vjOYli6spUxNWJgMyTZB6q6Cgsxx7m7xV2SftAB6CZAZLIu7 phgdprPE2iU4qCUClQl08UniBBk1laKKIvwOHrTDHy2MBw1ktEjoEEoHpzapMRP9AaUz xZWaFFjwl7U6Fk9CcRUelOEESuNUqE+/IMgHqlGqdmJUWakZChU5ZcTzuQctx0nmwvtP cfcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rqrAGRWw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id fz25-20020a05622a5a9900b0035d44310ba1si1276699qtb.569.2022.09.29.06.10.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:10:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rqrAGRWw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odtJY-0005A6-KI for patch@linaro.org; Thu, 29 Sep 2022 09:10:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrwF-0004ch-QV for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:51 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:34769) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrwE-0001GL-2A for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:47 -0400 Received: by mail-wr1-x42b.google.com with SMTP id x15so1259278wrv.1 for ; Thu, 29 Sep 2022 04:42:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=KtKYefRpdBrq386zGzvYj2i6PNAoiGDyuMR12lnFx6w=; b=rqrAGRWwh798cQ4UG9G57MXEytMZg00x2Lmlz2ITSanRZ8BSCzlhmFrjdPTHwVqO87 nJO1lOwcDFv0kzZ0x3RhXKEeotpkNmBZQsifaNZF1YVg4TwsJNioiqNDDyDvaD7pKHss 2IiFJFSbO5slV0aAgsZsqfyLQ3rCkdZT9TdDrRlTMa8BtPnNouxDUGjYspLuZ3ea5A16 MreKPo/EKnHlj1/58HLdpdtR/ZWNjMDwbdM9r2iywgrmgDET58Vw9ZqQuMgSqjfjiysN u10iWM5IEZv9bJDtg07uYrGTaoj+n4Uh+2JxilJIYyrO79ypl59rf7ptetfUM+BeTJhK d7Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=KtKYefRpdBrq386zGzvYj2i6PNAoiGDyuMR12lnFx6w=; b=eqHI5U+8zkt9eNFmRv8uEymUFU8cGfml3nuIo0rJsOGxA2OAAyplalURDoq8Gp7KKg f0MJWlfMG+nQZYxLx/FOyBQynGTD8oBwl+jYVOQEv/8TDOPsSY2N9QqATK3YtK2RWvP6 h2KEW7RboK5oIu6XdVo445XL5TxBPaiZcsSYpB4ZG3Inl/sNmNnGS1chuIRSKWT//Vxw ZW8JOfOZt8nkwkcLEx8mDWaNE2v8DRgc/YO6xM7U0sUOgZPlty3xYi8la4WpoFt1nzrE wnzH6ZXVMtuXNLno4mTed369ovt6gfh4DxoSa6gfIC20avc6hiFwOaoBD9NuU70PP3B4 lFHg== X-Gm-Message-State: ACrzQf0AGRmJsqJKrhDvsHNW1BXuw3b2Nz/yXRqHeAHfaHQNytJ64mCJ vFDb70UadWRiYgag5jLj7I85ww== X-Received: by 2002:adf:d84e:0:b0:22c:ce81:7c26 with SMTP id k14-20020adfd84e000000b0022cce817c26mr1840729wrl.463.1664451764786; Thu, 29 Sep 2022 04:42:44 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id w10-20020a05600c474a00b003b4ac05a8a4sm5509180wmo.27.2022.09.29.04.42.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7F61F1FFD0; Thu, 29 Sep 2022 12:42:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 28/51] configure: build ROMs with container-based cross compilers Date: Thu, 29 Sep 2022 12:42:08 +0100 Message-Id: <20220929114231.583801-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini s390-ccw remains a bit more complex, because the -march=z900 test is done only for the native cross compiler. Otherwise, all that is needed is to pass the (now mandatory) target argument to write_target_makefile. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- configure | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/configure b/configure index c175650eb9..a54e17aca9 100755 --- a/configure +++ b/configure @@ -2152,7 +2152,7 @@ probe_target_compiler() { target_ranlib= target_strip= fi - test -n "$target_cc" + test -n "$target_cc" || test -n "$container_image" } write_target_makefile() { @@ -2307,7 +2307,7 @@ if test "$targetos" != "darwin" && test "$targetos" != "sunos" && \ config_mak=pc-bios/optionrom/config.mak echo "# Automatically generated by configure - do not modify" > $config_mak echo "TOPSRC_DIR=$source_path" >> $config_mak - write_target_makefile >> $config_mak + write_target_makefile pc-bios/optionrom/all >> $config_mak fi if test "$softmmu" = yes && probe_target_compiler ppc-softmmu; then @@ -2315,25 +2315,31 @@ if test "$softmmu" = yes && probe_target_compiler ppc-softmmu; then config_mak=pc-bios/vof/config.mak echo "# Automatically generated by configure - do not modify" > $config_mak echo "SRC_DIR=$source_path/pc-bios/vof" >> $config_mak - write_target_makefile >> $config_mak + write_target_makefile pc-bios/vof/all >> $config_mak fi # Only build s390-ccw bios if the compiler has -march=z900 or -march=z10 # (which is the lowest architecture level that Clang supports) if test "$softmmu" = yes && probe_target_compiler s390x-softmmu; then - write_c_skeleton - do_compiler "$target_cc" $target_cc_cflags -march=z900 -o $TMPO -c $TMPC - has_z900=$? - if [ $has_z900 = 0 ] || do_compiler "$target_cc" $target_cc_cflags -march=z10 -msoft-float -Werror -o $TMPO -c $TMPC; then - if [ $has_z900 != 0 ]; then - echo "WARNING: Your compiler does not support the z900!" - echo " The s390-ccw bios will only work with guest CPUs >= z10." + got_cross_cc=no + if test -n "$target_cc"; then + write_c_skeleton + do_compiler "$target_cc" $target_cc_cflags -march=z900 -o $TMPO -c $TMPC + has_z900=$? + if [ $has_z900 = 0 ] || do_compiler "$target_cc" $target_cc_cflags -march=z10 -msoft-float -Werror -o $TMPO -c $TMPC; then + if [ $has_z900 != 0 ]; then + echo "WARNING: Your compiler does not support the z900!" + echo " The s390-ccw bios will only work with guest CPUs >= z10." + fi + got_cross_cc=yes fi + fi + if test "$got_cross_cc" = yes || test -n "$container_image"; then roms="$roms pc-bios/s390-ccw" config_mak=pc-bios/s390-ccw/config-host.mak echo "# Automatically generated by configure - do not modify" > $config_mak echo "SRC_PATH=$source_path/pc-bios/s390-ccw" >> $config_mak - write_target_makefile >> $config_mak + write_target_makefile pc-bios/s390-ccw/all >> $config_mak # SLOF is required for building the s390-ccw firmware on s390x, # since it is using the libnet code from SLOF for network booting. git_submodules="${git_submodules} roms/SLOF" @@ -2554,7 +2560,7 @@ for target in $target_list; do ;; esac - if probe_target_compiler $target || test -n "$container_image"; then + if probe_target_compiler $target; then test -n "$container_image" && build_static=y mkdir -p "tests/tcg/$target" config_target_mak=tests/tcg/$target/config-target.mak From patchwork Thu Sep 29 11:42:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610607 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp914832pvb; Thu, 29 Sep 2022 07:09:35 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5VzFXfBzd0yDRBTsCinFOHTElJzG1U8mKgC4Boyej1jqYjN74sMEW0Q22B3nQxoVwcQFIV X-Received: by 2002:ad4:5ec5:0:b0:49c:cf39:d4d2 with SMTP id jm5-20020ad45ec5000000b0049ccf39d4d2mr2664498qvb.6.1664460575714; Thu, 29 Sep 2022 07:09:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664460575; cv=none; d=google.com; s=arc-20160816; b=taTrkgrZ/IBdUZVWG9Gf/hYqViqJY2d+Vfalw+DGIKSYg97vgnyN77LH6gDMF6q8l4 BPyi7Ai+5gvud4p/VtWARWJ108LHqzHeQUZOJgMDmO9gb2CMzdsX3j/T3rn7aUD3E5gq NQSZnzVrCwO44zDnfAOZanzSbRceyvzA50Iqvjv1SphA70m5CPx4nfmTtdZMnDvC+3GF vd4TGKzN0juVeSu2iKnuhjvAlmnif9efCMGrS5Gly6wqni6+bUCcftEC09vx3GZk0EtB GBbr4Pd5o2w6fWZVbmxIaqugNj7etPf/dvMZy8++mV8t7QI6zDGVmAlxmzoJ2yUIkNCA E0Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iRY+rdLsNzUlIPl9aP+Ctca98eiNinjQ4tNo5/5rKPg=; b=AtuvaooHUzwwFvPvTBFqiOE1TtXMvhLn2uv1d+zlY7E5nzkj8N5EHNh8MN3QjB9Ota mlwNNIzugVPp9/zQYrgd0FGUR0kaGHV0EOFa0/cwLGw75M4xoJOgVxinM2cZtXtWrFND HbXItH9sBIfte/yz2CNcOuwc75GRxHb4nswNM8CGUp/k2vPiFig2an8f/oPsZQBC8Pks YH6bKkWoQfuQJVzXBJGCxMw7OmLlrl3kBmaxL90T6Jq1ju9sGwR8QzDXeqWxumqli/// ESCKgx8EQK02aRXr79C1C7TMo/WVyrvlY8YSlOYLQKuHcxInJXnzCVJJeBw13f4d3zBf mzWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Ec/1wt1E"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q7-20020a05621419e700b004a8ee66c84asi5111121qvc.169.2022.09.29.07.09.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 07:09:35 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Ec/1wt1E"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oduEH-0003uA-7S for patch@linaro.org; Thu, 29 Sep 2022 10:09:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3C-0000N9-7P for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:05 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:42519) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods38-0002NK-3w for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:49:56 -0400 Received: by mail-wr1-x42d.google.com with SMTP id l18so1768036wrw.9 for ; Thu, 29 Sep 2022 04:49:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=iRY+rdLsNzUlIPl9aP+Ctca98eiNinjQ4tNo5/5rKPg=; b=Ec/1wt1EKGzFt4Zq8wq+TJ/jeVyX7t4uxYd5N9CVf5ruf9MgAcutNPPdSqr01RrVq2 0ZUFVfSxCrsgBD/PD8LwEag/hMPZMp20CZ7VNHpomxszzyitJofkJLx7LzbijIz2dC7C EbkL+SP3JjIF6MO/Ky51BqDjVRuHwt9ecifCu0prIBDqrdz295kHXQCveI/Vg7j+EXIY hp7i9wUzMgvg8J0Qnc9N8uJfgfLNrhrBmYEtJvShzD2Zd0KQaZO7OVsrc5Btutal4JTv eXfXX4T5gKzN9/BcKKkqRC2p0gP/ZwRUw4iqc+LJgpgFlQqCWOdkETmo81rxaGDI0hmV A6OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=iRY+rdLsNzUlIPl9aP+Ctca98eiNinjQ4tNo5/5rKPg=; b=ZNSI+oJnliFWQEhdngjtk1PCapFT/9OosMoSxbfoqTjZfIaE+FKz75tPKIRB7n2qcg 0SkrIH2Sc/lR01Cl9zKmsWvm5oO+oLI9Vl42aTBqUtsYL9SMJQ+uEDvYcqrhCAzWeUB/ 90i+oJ3vGx1cS6WIqoFOBAyGL00piisId5ChuVk3nGpGN2rcGZKgRUms4/vjIo8au2Kb 3j8+tQwloXhr1nTdUyAveborQ+EKT5TGje3DcE3EUB3bJQo4UtAzNDX2AZxOzDefKkSy 5IzA7vmXBosMr9ZGpTJ/0+6jTTzATDXfFtUwiUAq2CaENIw2mv7gGErIDerKVjcRwve2 ofCQ== X-Gm-Message-State: ACrzQf1ZrOW7KRWNIan4TJehkCIkZoZ/9W7XY/X5hhe9XiuA9t+qdMC8 IjBG1feIzam5LfrIV3LKkheWQQ== X-Received: by 2002:adf:d1ef:0:b0:228:a9ee:8f13 with SMTP id g15-20020adfd1ef000000b00228a9ee8f13mr1900280wrd.686.1664452192529; Thu, 29 Sep 2022 04:49:52 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m13-20020a5d4a0d000000b0021e43b4edf0sm6419674wrq.20.2022.09.29.04.49.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 96C951FFD1; Thu, 29 Sep 2022 12:42:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 29/51] pc-bios/optionrom: Adopt meson style Make output Date: Thu, 29 Sep 2022 12:42:09 +0100 Message-Id: <20220929114231.583801-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- pc-bios/optionrom/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index f514e4f84b..b1fff0ba6c 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -12,8 +12,8 @@ NULL := SPACE := $(NULL) # TARGET_PREFIX := $(patsubst %/,%:$(SPACE),$(TARGET_DIR)) -quiet-@ = $(if $(V),,@) -quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) +quiet-@ = $(if $(V),,@$(if $1,printf "%s\n" "$(TARGET_PREFIX)$1" && )) +quiet-command = $(call quiet-@,$2 $@)$1 # Flags for dependency generation override CPPFLAGS += -MMD -MP -MT $@ -MF $(@D)/$(*F).d @@ -41,19 +41,19 @@ override LDFLAGS = -nostdlib -Wl,-T,$(SRC_DIR)/flat.lds pvh.img: pvh.o pvh_main.o %.o: %.S - $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<,"AS","$@") + $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<,Assembling) %.o: %.c - $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,"CC","$@") + $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,Compiling) %.img: %.o - $(call quiet-command,$(CC) $(CFLAGS) $(LDFLAGS) -s -o $@ $^,"BUILD","$@") + $(call quiet-command,$(CC) $(CFLAGS) $(LDFLAGS) -s -o $@ $^,Linking) %.raw: %.img - $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"BUILD","$@") + $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,Extracting raw object) %.bin: %.raw - $(call quiet-command,$(PYTHON) $(TOPSRC_DIR)/scripts/signrom.py $< $@,"SIGN","$@") + $(call quiet-command,$(PYTHON) $(TOPSRC_DIR)/scripts/signrom.py $< $@,Computing checksum into) include $(wildcard *.d) From patchwork Thu Sep 29 11:42:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610618 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp938242pvb; Thu, 29 Sep 2022 07:47:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5NQ70AZ0Y2Je35PvvH0q8Uw4ye2Gg32byupAYLVrEQSD729gGl8a6ODlDDBRKXKjTgoqLS X-Received: by 2002:ac8:578f:0:b0:35c:ddb2:c6da with SMTP id v15-20020ac8578f000000b0035cddb2c6damr2746311qta.597.1664462827565; Thu, 29 Sep 2022 07:47:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664462827; cv=none; d=google.com; s=arc-20160816; b=hyFcgAdS5nFn6TGJAy6OajMtccP7QRWGMXOEYgKGOzKhZtUQMYC6y2LDv5XI/cQgqM gaxugopKM+AHOHGVnijMRj5SjkXT1xjg8QzPe3Wh1PEZ69RBKA9pCk9GgUcVf/HT8c0m uCbJakdwIVNgGGb7ER5if5tDAwKD2IGGdEjS+Uk8kleWkV4G2lzviQqi86CNA5WIjsqa bgJIcCDGWD4nrTQYLSAiGxUiltMdC+IkpTJ0fKuVipWVa5ADnzu3rBxZxAPuFb0fTZAH WVNBm2PNMQm17/laL8UsTqJjqKlM0Y+37mUoVEZ///5X4Pcev5whbbGYUNiDtPPiQoO2 DX5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PobWf7yOB0RYiCJawLepi7wEAh6rZnGVT96VCMWAonk=; b=jEWCex3Th6jQxLQ4BYyueKJSI0CnRcq6V5LAXcy5UZf2ZEpSKQgXAe9FqgD935sx3x kVdIv+rJ+/+RskdS5sNw8f1KYPzJ6tCZAAVpNDASkdk8kkaRyoMD6RpJvlOh9gus5cXL ZMu0J1FKlftns8aXAhPBTnN4sXTeGEJfJK1p1aCiRYxPjdkCqeN03clZRzm2crPN54CZ mOq8jQC0CyPZgVZuDQl0XKyHPq9oLMUW/dOJsnKrdo4oa29WpeqjOGL1+EBIVIUuqKsd OUj2MpSWexd/c4eEXX3lAfItSNPVJes50fJIMw+ICmGhXuOHAFS1pdj5Js2k7TGEOplY ZV5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Z0dzGm/3"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s16-20020a05620a29d000b006bbfe296571si1617985qkp.155.2022.09.29.07.47.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 07:47:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Z0dzGm/3"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oduoc-0003nK-VZ for patch@linaro.org; Thu, 29 Sep 2022 10:47:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odsD0-0007TG-6f for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:06 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:35490) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odsCs-0004N5-Q4 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:05 -0400 Received: by mail-wr1-x429.google.com with SMTP id u10so1708344wrq.2 for ; Thu, 29 Sep 2022 04:59:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=PobWf7yOB0RYiCJawLepi7wEAh6rZnGVT96VCMWAonk=; b=Z0dzGm/3p1BCHcuVFOYOr23R/jEJgWXbDM49ANT9i0kWzPJ9TQVBPNcwS0Nm+fIP5Y XCQE3LYqOuIhb0k/dEqMfnfBAfaBU2eWIsbCDPOwaxhIXJHLZuSTaAV6kiy5H/C3j3vF JL/L18AZRCVJXmea/iOdiZyXJjGP4LrtE4DpovM9NhamckfvQa4kZXIxZykDJ1me2yJi p9q/yyaXQ9jwCQ1k9Y5+lwNLspOaA7/kXZhFWtUVtuRiBDEwkwp7BFXfKhAXGn+iFbF5 YARJCYwzMB4s1ZPUuu8u4Fn5odbmOgP6zYYNZWXsogYh+uVX9WFkzCadTPZIap5JCMYI d5YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=PobWf7yOB0RYiCJawLepi7wEAh6rZnGVT96VCMWAonk=; b=tfoJybAWc3u7SiL6PEMIDhv9WOTS8hp07MAA9yPUzMvKnDt01ywHedOvkTZ8IyJPUP pHNy0Jk06dXMYJ/EAhjGg4yYWKrDCHuitv3MSAC07/SOHjTgenuqGmkKzk3D4hKx07Wy XWk2DyvEPSsU6V3OTDHx8727h+L9EUQpJJAgJlLZSOaQwbt6f0QJWgzzgzrr76bGWBoU rDFtWxrEIa6kLr8XC99DnwCaIg+5OTGXG1GSIfeAwtucZ/CDlvi0sKBiJzCIyW/R7bD0 pH9KH8tiM6TS4u3lYq1oxEbDVO8SGmBPa4zRTnUs2XxVNH1iXOTLucGwNiEdNiZEPF3u sQeA== X-Gm-Message-State: ACrzQf3C7ocLjrqAzKWnJrFRsrYAmnmeK48zBJJd52FMWLct6VZCuiaF eDlaEaap1+a6ZFa5lIsPf0URiQ== X-Received: by 2002:a05:6000:144d:b0:22a:f4ef:c900 with SMTP id v13-20020a056000144d00b0022af4efc900mr2037632wrx.678.1664452797382; Thu, 29 Sep 2022 04:59:57 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id a3-20020a5d4d43000000b0022762b0e2a2sm6536441wru.6.2022.09.29.04.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B255C1FFBC; Thu, 29 Sep 2022 12:42:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Cornelia Huck , Thomas Huth , Christian Borntraeger , qemu-s390x@nongnu.org (open list:S390 general arch...) Subject: [PATCH v1 30/51] pc-bios/s390-ccw: Adopt meson style Make output Date: Thu, 29 Sep 2022 12:42:10 +0100 Message-Id: <20220929114231.583801-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- pc-bios/s390-ccw/netboot.mak | 20 ++++++++++---------- pc-bios/s390-ccw/Makefile | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak index ee59a5f4de..046aa35587 100644 --- a/pc-bios/s390-ccw/netboot.mak +++ b/pc-bios/s390-ccw/netboot.mak @@ -11,10 +11,10 @@ NETLDFLAGS := $(LDFLAGS) -Wl,-Ttext=0x7800000 $(NETOBJS): EXTRA_CFLAGS += $(LIBC_INC) $(LIBNET_INC) s390-netboot.elf: $(NETOBJS) libnet.a libc.a - $(call quiet-command,$(CC) $(NETLDFLAGS) -o $@ $^,"BUILD","$(TARGET_DIR)$@") + $(call quiet-command,$(CC) $(NETLDFLAGS) -o $@ $^,Linking) s390-netboot.img: s390-netboot.elf - $(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@") + $(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,Stripping $< into) # libc files: @@ -23,30 +23,30 @@ LIBC_CFLAGS = $(EXTRA_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \ CTYPE_OBJS = isdigit.o isxdigit.o toupper.o %.o : $(SLOF_DIR)/lib/libc/ctype/%.c - $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@") + $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling) STRING_OBJS = strcat.o strchr.o strrchr.o strcpy.o strlen.o strncpy.o \ strcmp.o strncmp.o strcasecmp.o strncasecmp.o strstr.o \ memset.o memcpy.o memmove.o memcmp.o %.o : $(SLOF_DIR)/lib/libc/string/%.c - $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@") + $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling) STDLIB_OBJS = atoi.o atol.o strtoul.o strtol.o rand.o malloc.o free.o %.o : $(SLOF_DIR)/lib/libc/stdlib/%.c - $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@") + $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling) STDIO_OBJS = sprintf.o snprintf.o vfprintf.o vsnprintf.o vsprintf.o fprintf.o \ printf.o putc.o puts.o putchar.o stdchnls.o fileno.o %.o : $(SLOF_DIR)/lib/libc/stdio/%.c - $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@") + $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling) sbrk.o: $(SLOF_DIR)/slof/sbrk.c - $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@") + $(call quiet-command,$(CC) $(LIBC_CFLAGS) -c -o $@ $<,Compiling) LIBCOBJS := $(STRING_OBJS) $(CTYPE_OBJS) $(STDLIB_OBJS) $(STDIO_OBJS) sbrk.o libc.a: $(LIBCOBJS) - $(call quiet-command,$(AR) -rc $@ $^,"AR","$(TARGET_DIR)$@") + $(call quiet-command,$(AR) -rc $@ $^,Creating static library) # libnet files: @@ -56,7 +56,7 @@ LIBNETCFLAGS = $(EXTRA_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \ -DDHCPARCH=0x1F -MMD -MP -MT $@ -MF $(@:%.o=%.d) %.o : $(SLOF_DIR)/lib/libnet/%.c - $(call quiet-command,$(CC) $(LIBNETCFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@") + $(call quiet-command,$(CC) $(LIBNETCFLAGS) -c -o $@ $<,Compiling) libnet.a: $(LIBNETOBJS) - $(call quiet-command,$(AR) -rc $@ $^,"AR","$(TARGET_DIR)$@") + $(call quiet-command,$(AR) -rc $@ $^,Creating static library) diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile index 965e633f43..10e8f5cb63 100644 --- a/pc-bios/s390-ccw/Makefile +++ b/pc-bios/s390-ccw/Makefile @@ -10,8 +10,8 @@ NULL := SPACE := $(NULL) # TARGET_PREFIX := $(patsubst %/,%:$(SPACE),$(TARGET_DIR)) -quiet-@ = $(if $(V),,@) -quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) +quiet-@ = $(if $(V),,@$(if $1,printf "%s\n" "$(TARGET_PREFIX)$1" && )) +quiet-command = $(call quiet-@,$2 $@)$1 VPATH_SUFFIXES = %.c %.h %.S %.m %.mak %.sh %.rc Kconfig% %.json.in set-vpath = $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath $(PATTERN) $1))) @@ -22,11 +22,11 @@ QEMU_DGFLAGS = -MMD -MP -MT $@ -MF $(@D)/$(*F).d %.o: %.c $(call quiet-command,$(CC) $(EXTRA_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) \ - -c -o $@ $<,"CC","$(TARGET_DIR)$@") + -c -o $@ $<,Compiling) %.o: %.S $(call quiet-command,$(CCAS) $(EXTRA_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) \ - -c -o $@ $<,"CCAS","$(TARGET_DIR)$@") + -c -o $@ $<,Assembling) .PHONY : all clean build-all distclean @@ -58,10 +58,10 @@ LDFLAGS += -Wl,-pie -nostdlib build-all: s390-ccw.img s390-netboot.img s390-ccw.elf: $(OBJECTS) - $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(OBJECTS),"BUILD","$(TARGET_DIR)$@") + $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(OBJECTS),Linking) s390-ccw.img: s390-ccw.elf - $(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@") + $(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,Stripping $< into) $(OBJECTS): Makefile From patchwork Thu Sep 29 11:42:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610621 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp946277pvb; Thu, 29 Sep 2022 08:02:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5W3EKjSEgXU0QQ7ciQSL+Hrc1R/AVBem9VA2E89kZTa962AKodDQIi6+SRlYycC1E05Ltp X-Received: by 2002:ac8:5f82:0:b0:35b:b35e:74ff with SMTP id j2-20020ac85f82000000b0035bb35e74ffmr2704572qta.574.1664463752320; Thu, 29 Sep 2022 08:02:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664463752; cv=none; d=google.com; s=arc-20160816; b=V4JiUTOF3GSB+rFMBeczIhz62ac8mCaOR0RqFAEYCpZuS2JAwv8qXexpGl9McVkEsI tqxeUiwc8ltsh6kxadwbeoJ0NACuMDLuGMKtrD3hWE5D0PZb/mAyB7skVsKg26NRKSue ybCAah76moCyJPAKjDS5cVhTU1ig2oeEykfn7GYkKW7CypLidJZ2MaJpthRgxpQv8AFa YAO2/4b8pLJCiFREctfUu/XEmhIdJtGw2YHr2pY5P19bhOAwMFRhdn36R6L8Qrb/DyZR RYKwKC4I8+tfhPK9rPGaFrDXbkwlnpnZN58OlGW/+jIzcANINDAtFyVID2aDOPTh0Bla Rlpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RFF0THqd2wz95c8usRFaGFV7I61JuRsTga9UE9tzX2A=; b=WL/wNBx3PeYm5e+C1MxQRD8YYbhdQLGRqUP/7winK1OOxyRL9zKjhE8zPQ6Kq2dFWp DHAP0EqfygSmM1bUwI1LdDMy7Ux78SZtN5wQBDjv02B2JU50Pa1Z4AWAkdaJEqCkXh/a oUDWjZzVk0q8fm6Wvz95CvmOT+Yapts9yCQdVvbguSI/4czvzKsebJxvZYz9Is32w4rH K35VaiDFsvkysblQLoLDKjZQn9XiANbcg4+FCN7QUFGBNReNlNdtR5lyjp7KzcXHINM3 7iAa11aWbPcs77b0ZSzgF3E9DSwCyPLnXOgIJWq70jvx6ACn6TvJKFkFLnYeBaeEy2N8 VJTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dXJsL6Hf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w18-20020a05620a425200b006cf36699ebbsi1492601qko.364.2022.09.29.08.02.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 08:02:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dXJsL6Hf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odv3X-0008EA-RN for patch@linaro.org; Thu, 29 Sep 2022 11:02:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odsD2-0007Wy-I0 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:08 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:55114) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odsCx-0004QR-Bn for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:08 -0400 Received: by mail-wm1-x32a.google.com with SMTP id iv17so795644wmb.4 for ; Thu, 29 Sep 2022 05:00:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=RFF0THqd2wz95c8usRFaGFV7I61JuRsTga9UE9tzX2A=; b=dXJsL6HfJbW49mKarQkn/W9Y/P3SzbY/BgOgVeYrTul8f9d1bYlBu+xX9ETMD1n3/u PJ8LjgSl+5hGDqxgfkdosLAg3KNrKcYiPPeLakpyx4GEHq/jRkXfnhlQ/SkP5sMiyOzO rWQwVUz5W/6lHQc6OmVdJdWHu9eBJVuGEmcpfWZhg78phn+3vpDVfmJ3HStZ259xItT6 KF9NDLdyIm143DukN+ZsNkI3U4IS1ZzbQ0tvvy4P1TZav1uIs2yiVkPxEZUXWeTv8cXc nwdXc14eoM5Bbvy33aSBhYXMIEZf/aBx5brf2R0O0QY9+TedHWSoqyggiEvOqyJ+EA2r MBzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=RFF0THqd2wz95c8usRFaGFV7I61JuRsTga9UE9tzX2A=; b=LefF3+DfeHRkT4uUuWyN15aKpdTfUETdJny1kvKMs+SFNlJWdqlu7EHiOsc+yczFtx u+SG4rab+tYaJIr84KWciEiQhxVns+DTzZ2ivRESoRvZkAO7V4eRkxGhjp6vDA7CUsxS e7T2nplfaem6r205wa43eJvzQtHLG8EIIo0cmMjcpLWgENyacOmCiWohR5iBBeQygo2X 7F5fVJIzVFT7iYjdWBADbVk4fK0+dIlQr1VCehjV+8qn8BymMqLHHBmdifKfWtX/JLX4 aGiyxBVluu5xZJG5TuyVnXKczfZT3256vWrxEthqj/mdQgV9IObXtDPKI5DEwtkIJQi+ SU3Q== X-Gm-Message-State: ACrzQf3aX+Nr9DsmPCXgHkQ3Xxdh6wQksfx1NYT0p55F0GYbHZN9bl/r XdAt3ooGPzq1qdpSYXVqJuy7hw== X-Received: by 2002:a05:600c:524a:b0:3b5:290:1a7c with SMTP id fc10-20020a05600c524a00b003b502901a7cmr10605682wmb.75.1664452800774; Thu, 29 Sep 2022 05:00:00 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m67-20020a1c2646000000b003a342933727sm4189175wmm.3.2022.09.29.04.59.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:59:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C9C251FFD2; Thu, 29 Sep 2022 12:42:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Alexey Kardashevskiy , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Daniel Henrique Barboza , David Gibson , Greg Kurz , qemu-ppc@nongnu.org (open list:Virtual Open Firm...) Subject: [PATCH v1 31/51] pc-bios/vof: Adopt meson style Make output Date: Thu, 29 Sep 2022 12:42:11 +0100 Message-Id: <20220929114231.583801-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- pc-bios/vof/Makefile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pc-bios/vof/Makefile b/pc-bios/vof/Makefile index 990f26af31..be8bd96294 100644 --- a/pc-bios/vof/Makefile +++ b/pc-bios/vof/Makefile @@ -2,19 +2,26 @@ include config.mak VPATH=$(SRC_DIR) all: vof.bin +NULL := +SPACE := $(NULL) # +TARGET_PREFIX := $(patsubst %/,%:$(SPACE),$(TARGET_DIR)) + +quiet-@ = $(if $(V),,@$(if $1,,printf "%s\n" "$(TARGET_PREFIX)$1" && )) +quiet-command = $(call quiet-@,$2 $@)$1 + EXTRA_CFLAGS += -mcpu=power4 %.o: %.S - $(CC) $(EXTRA_CFLAGS) -c -o $@ $< + $(call quiet-command, $(CC) $(EXTRA_CFLAGS) -c -o $@ $<,Assembling) %.o: %.c - $(CC) $(EXTRA_CFLAGS) -c -fno-stack-protector -o $@ $< + $(call quiet-command, $(CC) $(EXTRA_CFLAGS) -c -fno-stack-protector -o $@ $<,Compiling) vof.elf: entry.o main.o ci.o bootmem.o libc.o - $(LD) -nostdlib -e_start -T$(SRC_DIR)/vof.lds -EB -o $@ $^ + $(call quiet-command, $(LD) -nostdlib -e_start -T$(SRC_DIR)/vof.lds -EB -o $@ $^,Linking) %.bin: %.elf - $(OBJCOPY) -O binary -j .text -j .data -j .toc -j .got2 $^ $@ + $(call quiet-command, $(OBJCOPY) -O binary -j .text -j .data -j .toc -j .got2 $^ $@,Extracting raw object) clean: rm -f *.o vof.bin vof.elf *~ From patchwork Thu Sep 29 11:42:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610601 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp903027pvb; Thu, 29 Sep 2022 06:49:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5fzOaG8HFG6NrOjJd/13SMqiODrRIGGFe5EWLRMsjonZ4sL1L2Q0yvzXhOZk20aYqzvaB2 X-Received: by 2002:a05:622a:5cd:b0:35d:5de5:b1f1 with SMTP id d13-20020a05622a05cd00b0035d5de5b1f1mr2485286qtb.650.1664459385080; Thu, 29 Sep 2022 06:49:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664459385; cv=none; d=google.com; s=arc-20160816; b=X18vs4flMY34t/XnTvXpFAlgPpCOZp33wj1HYbXYmnNInm4ej0UBauYcYJJne0GHhU uSQAXbqURSDFmG7ZpAV8CI4UqGKbeSz4GLbEISFxL+F29rnfli+f0aa8P9tiKeemWIgv dOSAsO7VGwvkNQFrOoK8lDQJ0M+G8B4t57S9/EPKewuZ8KHeSBZCBpFioBb6TDMy9zM1 m5SPA11oSytc0JPjeUMQsjInrz90JjPszMVOobp22AbqmPuM0exRrbezlRnjtgCe/Wt6 yboJ+yFmUCicjzVtc7V3f4OuJFBPFJqBbx/WLbWyyVrJA4R+KKaglon+Oz5JFp35DCH6 4rhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7WPSIzCpU739utGIxIW8d/QKBIKYSf+S3FUKe5DP39M=; b=CM8b4fKD7yqEuV/lUUMyNq/wi1l/t0o08n8BAsMF7O+CZ/aW0Pa2TDWAX9ABBbePvY 0uWhzHTuD5tBkvJBPYRPOMCfu6XqsPQsM0JRZOWra123DgngFZZE2jyLxCqDBFRWRX5R kKA0k0Cyi3oLO1zOm5yl050p6e0pRiQWF3vGMsgZeJU7veyzgxwO5iLzMKNBrvrvwjnI 2nWO6xOc0d9B2HYcPCRW8K9rWgN213y050E7sYIpe6lcdzSYAcRs4E162M4CzmaLAlfY nt/kFlWEWYSPTF1fQ/B76+nAM2s5t5eUNMKkuKBri+MuoMlqxBFsEMz1YEMgTZd6KBKP 31JA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ICUUs6O0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f7-20020a05620a408700b006b4811cfa51si1523113qko.763.2022.09.29.06.49.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:49:45 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ICUUs6O0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odtv6-0005DP-I3 for patch@linaro.org; Thu, 29 Sep 2022 09:49:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odsCx-0007Qx-RD for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:05 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:39451) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odsCs-0004MK-NB for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:03 -0400 Received: by mail-wm1-x32d.google.com with SMTP id e10-20020a05600c4e4a00b003b4eff4ab2cso3077856wmq.4 for ; Thu, 29 Sep 2022 04:59:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=7WPSIzCpU739utGIxIW8d/QKBIKYSf+S3FUKe5DP39M=; b=ICUUs6O0F4723C0e56t7Ti87SDrbHedabOP/kSuzG4i0ZkWT+PFqLnk6oReYZAI8+S bkcaeB06nEmP5RhU5Pf8htBKns4q0xEdZXjGW8KOvdJMUANQ+mlAiWe7pSCYLVCYT9UK oqIUx37iBlvPPrMjQX2eBYiDcQKh7o4k0WpKULQXaG3qoJhFleBpHjjejlMUqojCclIz jKyqDhOjJlT8d+b6yOhu/COHihQWGkbF9V7JMkefMFuk4+tghkyfYyriyXagiznc7So8 8omD5BxDWJJ/iPqD1bXthDARPEKZlflXSw+KbDypsaA0Sqxkd0xkwwcDKvyi67pPBnKw jazA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=7WPSIzCpU739utGIxIW8d/QKBIKYSf+S3FUKe5DP39M=; b=ZcbkxTfpJln0IgapHQQYDVgq39kAga9NpDdZQlg+zWyj91OmcYdCP3uZdIG9JQZRbH boofyB7eK32MFqI/r8c+5kyd+z83RMWprLl7MYNaoqpn9R149s/+PU/KXqHC8w3wZwXz xq5rsEWeh+ibivfs0LuVKOHMcQFQTnYJOkj9fV4+Yjrm/hgoZOGLstGNtru0rcQsbmp8 Q1zyTtrEmsLT4ukyAsWdyDZZPzpXz7K7EpiQH2nJZMun1O01/9NXMTmN8c4kcS4iH3iW VyCBeLzUW12KnfO10Wr11HdheG/nm1lUFw0Ug6nCP4zHz5Ne7PPnXOehYuY/H4+Zy8Wf SnHw== X-Gm-Message-State: ACrzQf0SlRo+/vIy7r0kJg3iI1q01Cofzd+P5Erfdl9jjAHv6EnmrznK GvbZfh8HbfxltMdFDeg6HLrhNA== X-Received: by 2002:a05:600c:2d05:b0:3b4:7788:9944 with SMTP id x5-20020a05600c2d0500b003b477889944mr10580826wmf.57.1664452793992; Thu, 29 Sep 2022 04:59:53 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id w11-20020adfd4cb000000b0022cd27bc8c1sm1918290wrk.9.2022.09.29.04.59.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:59:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 001C61FFD3; Thu, 29 Sep 2022 12:42:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Kevin Wolf , Markus Armbruster , Hanna Reitz , Mark Cave-Ayland , "Dr. David Alan Gilbert" , qemu-block@nongnu.org (open list:Block layer core), qemu-ppc@nongnu.org (open list:New World (mac99)) Subject: [PATCH v1 32/51] monitor: expose monitor_puts to rest of code Date: Thu, 29 Sep 2022 12:42:12 +0100 Message-Id: <20220929114231.583801-33-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This helps us construct strings elsewhere before echoing to the monitor. It avoids having to jump through hoops like: monitor_printf(mon, "%s", s->str); It will be useful in following patches but for now convert all existing plain "%s" printfs to use the _puts api. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Kevin Wolf Reviewed-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220921160801.1490125-2-alex.bennee@linaro.org> --- docs/devel/writing-monitor-commands.rst | 2 +- include/monitor/monitor.h | 1 + monitor/monitor-internal.h | 1 - block/monitor/block-hmp-cmds.c | 10 +++++----- hw/misc/mos6522.c | 2 +- monitor/hmp-cmds.c | 8 ++++---- monitor/hmp.c | 2 +- target/i386/helper.c | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/devel/writing-monitor-commands.rst b/docs/devel/writing-monitor-commands.rst index 4aa2bb904d..2fefedcd98 100644 --- a/docs/devel/writing-monitor-commands.rst +++ b/docs/devel/writing-monitor-commands.rst @@ -716,7 +716,7 @@ message. Here's the implementation of the "info roms" HMP command:: if (hmp_handle_error(mon, err)) { return; } - monitor_printf(mon, "%s", info->human_readable_text); + monitor_puts(mon, info->human_readable_text); } Also, you have to add the function's prototype to the hmp.h file. diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index a4b40e8391..737e750670 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -31,6 +31,7 @@ void monitor_resume(Monitor *mon); int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp); int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp); +int monitor_puts(Monitor *mon, const char *str); int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) G_GNUC_PRINTF(2, 0); int monitor_printf(Monitor *mon, const char *fmt, ...) G_GNUC_PRINTF(2, 3); diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index caa2e90ef2..a2cdbbf646 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -174,7 +174,6 @@ extern int mon_refcount; extern HMPCommand hmp_cmds[]; -int monitor_puts(Monitor *mon, const char *str); void monitor_data_init(Monitor *mon, bool is_qmp, bool skip_flush, bool use_io_thread); void monitor_data_destroy(Monitor *mon); diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c index bfb3c043a0..939a520d17 100644 --- a/block/monitor/block-hmp-cmds.c +++ b/block/monitor/block-hmp-cmds.c @@ -638,16 +638,16 @@ static void print_block_info(Monitor *mon, BlockInfo *info, assert(!info || !info->has_inserted || info->inserted == inserted); if (info && *info->device) { - monitor_printf(mon, "%s", info->device); + monitor_puts(mon, info->device); if (inserted && inserted->has_node_name) { monitor_printf(mon, " (%s)", inserted->node_name); } } else { assert(info || inserted); - monitor_printf(mon, "%s", - inserted && inserted->has_node_name ? inserted->node_name - : info && info->has_qdev ? info->qdev - : ""); + monitor_puts(mon, + inserted && inserted->has_node_name ? inserted->node_name + : info && info->has_qdev ? info->qdev + : ""); } if (inserted) { diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index f9e646350e..fe38c44426 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -595,7 +595,7 @@ void hmp_info_via(Monitor *mon, const QDict *qdict) if (hmp_handle_error(mon, err)) { return; } - monitor_printf(mon, "%s", info->human_readable_text); + monitor_puts(mon, info->human_readable_text); } static const MemoryRegionOps mos6522_ops = { diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index c6cd6f91dd..f90eea8d01 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -730,7 +730,7 @@ static void hmp_info_pci_device(Monitor *mon, const PciDeviceInfo *dev) monitor_printf(mon, " "); if (dev->class_info->has_desc) { - monitor_printf(mon, "%s", dev->class_info->desc); + monitor_puts(mon, dev->class_info->desc); } else { monitor_printf(mon, "Class %04" PRId64, dev->class_info->q_class); } @@ -2258,12 +2258,12 @@ static void print_stats_schema_value(Monitor *mon, StatsSchemaValue *value) if (unit && value->base == 10 && value->exponent >= -18 && value->exponent <= 18 && value->exponent % 3 == 0) { - monitor_printf(mon, "%s", si_prefix(value->exponent)); + monitor_puts(mon, si_prefix(value->exponent)); } else if (unit && value->base == 2 && value->exponent >= 0 && value->exponent <= 60 && value->exponent % 10 == 0) { - monitor_printf(mon, "%s", iec_binary_prefix(value->exponent)); + monitor_puts(mon, iec_binary_prefix(value->exponent)); } else if (value->exponent) { /* Use exponential notation and write the unit's English name */ monitor_printf(mon, "* %d^%d%s", @@ -2273,7 +2273,7 @@ static void print_stats_schema_value(Monitor *mon, StatsSchemaValue *value) } if (value->has_unit) { - monitor_printf(mon, "%s", unit ? unit : StatsUnit_str(value->unit)); + monitor_puts(mon, unit ? unit : StatsUnit_str(value->unit)); } /* Print bucket size for linear histograms */ diff --git a/monitor/hmp.c b/monitor/hmp.c index a3375d0341..43fd69f984 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1094,7 +1094,7 @@ static void hmp_info_human_readable_text(Monitor *mon, return; } - monitor_printf(mon, "%s", info->human_readable_text); + monitor_puts(mon, info->human_readable_text); } static void handle_hmp_command_exec(Monitor *mon, diff --git a/target/i386/helper.c b/target/i386/helper.c index fa409e9c44..b954ccda50 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -415,7 +415,7 @@ static void do_inject_x86_mce(CPUState *cs, run_on_cpu_data data) if (need_reset) { emit_guest_memory_failure(MEMORY_FAILURE_ACTION_RESET, ar, recursive); - monitor_printf(params->mon, "%s", msg); + monitor_puts(params->mon, msg); qemu_log_mask(CPU_LOG_RESET, "%s\n", msg); qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); return; From patchwork Thu Sep 29 11:42:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610602 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp906864pvb; Thu, 29 Sep 2022 06:57:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7DsXG+Jk56pKve3Yt944efOEvvPi8wOOzdWVKkJE+hi9VtBHhNoMg1+kwBt5mxl0BPCYPP X-Received: by 2002:a05:6214:2342:b0:473:e142:f758 with SMTP id hu2-20020a056214234200b00473e142f758mr2605688qvb.83.1664459836881; Thu, 29 Sep 2022 06:57:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664459836; cv=none; d=google.com; s=arc-20160816; b=mt6vscHJmRag3aYrkMfk6k9uiMqUk8mrZsvBUJMFGLZF3IrOrPvQC/U5TJD0pMtxi6 nvNl8FxzAXD6dhzMnMaKCtqIESXK0InwG8BH6klezpdpv1bna19i3kk2k1+vm91qoHHt MDL5bk76QMJILg2p/hu6DaahG6+D1Olk11ISpgPOJahnxqwVviWMKm2YNAgmSYsCsr7R gJQwx+6Iv92TLZtfr7wmkGxoyyq1Q77Ajq1fQrJfBos7Abxan3+qPQlksjLXORzUObJS l2ssSuY2Lfu6EzBgh7rwv+bZTIgPvnr+9pT7y8TVSZGFKvG5yLFcGW+Q/Wkv1tm1khHu IyUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=H5kZ4c1YNKUDywETs44GyEUgqI/uwgZp+WVffoscGxk=; b=KwNJh3OtIFMbe5Vx12n5GZnb17/lhXrl5R1x58p2X0zGeuH6a0mXRqZyXpn4gZd7YR +R7kMmtzYkx6YsMfxq2Gb8M4Sd+LpScQkpw2twofNAAhzakYApm48Pr+g7eOGUc6QF8t TB6OIZ0Pv1Kwt2ZkuLD/EbAzlbAtG3QE2PJ+hQYDP9QC+cQjIrwzCGvPs+k0nd904n9f mZDmLrWgJSfLKNngVrsBJ6malcoCDx7xTeFXEDJIGNLhtEufe1zrNsNnBmlTppXY6/IN cU/D8Z42SnpolGfzT6Nr7RvpnaIWbfM45EOwrGAR1S1tM2BX+L44sz+YBsRM6ToRdj3A kpXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SNLbo+tn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c3-20020ac80083000000b0035baeff5046si1272504qtg.502.2022.09.29.06.57.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:57:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SNLbo+tn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odu2O-0004DU-8a for patch@linaro.org; Thu, 29 Sep 2022 09:57:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3O-0000XF-57 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:10 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:42525) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods3I-0002OP-Ta for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:09 -0400 Received: by mail-wr1-x432.google.com with SMTP id l18so1768347wrw.9 for ; Thu, 29 Sep 2022 04:49:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=H5kZ4c1YNKUDywETs44GyEUgqI/uwgZp+WVffoscGxk=; b=SNLbo+tn/S7aI+KGepavX0Y4TIsKkEasGL+Y0p1dDOkSyqYaKwk1rQHD1e4HbIsn3c IPpiFCIfhHkELi+N+k/c5BkLHfO/tbR8evos1c9EwlTHEPEFNTR+WbJCsWfpDbUStkQQ 5uoCPr96O/TU0b4ONNt8TKGdo3I3S/Rplpdp5F7JJWchELg2gJvbY7KnOKz/w5WwPNin Ltd3tRuMIDlrEi+qKZsaDk8SAwM6cl690sP/t9enrMXC5Bohs6m9u6XE0kic0RiUH9El h/52GvFBTS6v+O69LPJZjp8+Qz1ejXgRXJvbHKy7zKmdNjI6Ppzzr2Zkn8pN0C3PnzS9 IMSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=H5kZ4c1YNKUDywETs44GyEUgqI/uwgZp+WVffoscGxk=; b=WeSG8LfzKPVrUaIWwr65kMTkK0GoZELZJfIrgv/A//cV7lkGrXx4MwmHF2pjABkXZ+ a6D7154wcgl4Qg9FTpkxsiEpUbenIk0N1g4BJX6aar0vGZcuykl/JALp5/duLXa957u2 Zb+tZBMQxwh/oLQ0su2PUPCRm2rGlNa4ofWk5MkaFUu2jCktxiSrgDi/lnR2nvlpOJzn f/ciZPu9BW2nIybifxa+ayO0Hco6e24pdjZ4JLDk7L/bb9gdb0UtZ1YhEqUjgcjx2I0n 0kCCRmJr4nmcPMB4Wxv2U0s+Ffe4fx/LVaDm4Cql/GUzqbI/gx5Uspuu0BuCum3B0JVK iqxA== X-Gm-Message-State: ACrzQf1kZ79mJiE9AdOrWieMtmmVZ51vYV+mRaGrVP4A3MLG9/Dokkm2 itbkbrNl4yYu+5/KFDMhIDrbmQ== X-Received: by 2002:adf:ef4c:0:b0:22c:c043:174e with SMTP id c12-20020adfef4c000000b0022cc043174emr2099537wrp.50.1664452197189; Thu, 29 Sep 2022 04:49:57 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id x4-20020adfdcc4000000b0022b11a27e39sm6568013wrm.1.2022.09.29.04.49.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 178541FFD4; Thu, 29 Sep 2022 12:42:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Subject: [PATCH v1 33/51] disas: generalise plugin_printf and use for monitor_disas Date: Thu, 29 Sep 2022 12:42:13 +0100 Message-Id: <20220929114231.583801-34-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_PDS_OTHER_BAD_TLD=0.01 autolearn=ham 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Rather than assembling our output piecemeal lets use the same approach as the plugin disas interface to build the disassembly string before printing it. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20220921160801.1490125-3-alex.bennee@linaro.org> --- disas.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/disas.c b/disas.c index e31438f349..f07b6e760b 100644 --- a/disas.c +++ b/disas.c @@ -239,7 +239,7 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code, } } -static int plugin_printf(FILE *stream, const char *fmt, ...) +static int gstring_printf(FILE *stream, const char *fmt, ...) { /* We abuse the FILE parameter to pass a GString. */ GString *s = (GString *)stream; @@ -270,7 +270,7 @@ char *plugin_disas(CPUState *cpu, uint64_t addr, size_t size) GString *ds = g_string_new(NULL); initialize_debug_target(&s, cpu); - s.info.fprintf_func = plugin_printf; + s.info.fprintf_func = gstring_printf; s.info.stream = (FILE *)ds; /* abuse this slot */ s.info.buffer_vma = addr; s.info.buffer_length = size; @@ -358,15 +358,19 @@ void monitor_disas(Monitor *mon, CPUState *cpu, { int count, i; CPUDebug s; + g_autoptr(GString) ds = g_string_new(""); initialize_debug_target(&s, cpu); - s.info.fprintf_func = qemu_fprintf; + s.info.fprintf_func = gstring_printf; + s.info.stream = (FILE *)ds; /* abuse this slot */ + if (is_physical) { s.info.read_memory_func = physical_read_memory; } s.info.buffer_vma = pc; if (s.info.cap_arch >= 0 && cap_disas_monitor(&s.info, pc, nb_insn)) { + monitor_puts(mon, ds->str); return; } @@ -376,13 +380,16 @@ void monitor_disas(Monitor *mon, CPUState *cpu, return; } - for(i = 0; i < nb_insn; i++) { - monitor_printf(mon, "0x" TARGET_FMT_lx ": ", pc); + for (i = 0; i < nb_insn; i++) { + g_string_append_printf(ds, "0x" TARGET_FMT_lx ": ", pc); count = s.info.print_insn(pc, &s.info); - monitor_printf(mon, "\n"); - if (count < 0) - break; + g_string_append_c(ds, '\n'); + if (count < 0) { + break; + } pc += count; } + + monitor_puts(mon, ds->str); } #endif From patchwork Thu Sep 29 11:42:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610599 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp899891pvb; Thu, 29 Sep 2022 06:44:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7T2XWP0pRVxT5dlzTfZD8HeXswbULNrWEmm4Gm0hbOJBBAQEU6sEhiRl6ZcfNOWnkwWcLn X-Received: by 2002:ad4:5bac:0:b0:4af:496c:60ed with SMTP id 12-20020ad45bac000000b004af496c60edmr2507266qvq.103.1664459041839; Thu, 29 Sep 2022 06:44:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664459041; cv=none; d=google.com; s=arc-20160816; b=VcZI67puG9HG2SzzPB6hKJZWO+fqIlc9o8xSLm7lnP/tnXZJu87V8ASWtXhasr1L3g tSUQe3OYOtbjL3sWMj+0CdE1nLLIb1VGn9ylHUV87WxWzPYT0Rp9bUUpk3eXiLhq7THo Bzz17TaVg4liXC9FAIVEVvxjDquTDyCf51rMZOY72bnyd3BynirOlRaGXrBBMMT/PZrJ 3pkvRMI6bvUC9bdYIAxIBjH7qDRrEZtVwU1BoVoCqnj23VaVcdVgxiFe2gaun5pKRuZT 61tqBa15LmM4epn5fc8iy2oIkZq2v1iSh87927brEGgM9j2lJxQbo1fgIuMHd/+TTgnj Hk/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kmq6bJycX8X3refmhkYjcu1V6tl8AxE9OoX3AJziXLM=; b=j+U9j9Thg/ZaWJ4SyarfkeWnhlIy7+Q3K+nRPmcCCncM7cxyc9welEmOymrbtopHLb nJe4jcj4F82+TfZSOUh6Yy/CA49kr/wyLle8JYuDjqW0K7XfYLlylZdRMnvpXRAjPfSU 8bc9crGKkzU6UbMD577OQX1lpeDfaw2gwiuh2RSiPER6iNdGMv8Nssu2dbo6GlG5OAmw S7TMCySetREEGRyc8jERIyDJWtMgKtvNsFiC50Wsb77T233D/bLyvBo4ofbPiXjoUy9A 5NC3tvcAecvSxX957gtgB+khmuw35DEFahAI3s75UrpkFfujK2DfKf7f3GWHU5+AEtqo zpTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N0X24gGe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t187-20020a375fc4000000b006cebd4ea9d0si1269947qkb.708.2022.09.29.06.44.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:44:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N0X24gGe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odtpZ-0007SC-9d for patch@linaro.org; Thu, 29 Sep 2022 09:44:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3J-0000NW-4G for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:06 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:55063) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods3B-0002O7-W9 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:03 -0400 Received: by mail-wm1-x32e.google.com with SMTP id iv17so779731wmb.4 for ; Thu, 29 Sep 2022 04:49:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=kmq6bJycX8X3refmhkYjcu1V6tl8AxE9OoX3AJziXLM=; b=N0X24gGeaebVWL3VD/2w7B4QrxqePdOtMw4nhHQ65dbMkAJF+T3W1DnPP9+hICzvim hR0qIV2+68rMbQKlJPR/0PD1+Pr8BYrZJWVgWHliXoKJkhcSpRLxJTzHldcmA+2MK5Wd 1MhbJNXtDa8od0rVpKnnoV0f245FliZF4hedBGvcL9yTZcykbKqY0lWd1HE3lpZYM0Rc cGW4m2xwn2tu4SVDamSIBrzDzCqqD84gutQPP1tl1Dao2l4KhBhOhAgNwKxJ6o1eDXwj cdNxxpb8MMgNrSyenwFxKvCXYH6pOVt0nBjlmVW9N262do0mZcOycfeFtThNxy7DUaN9 3jMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=kmq6bJycX8X3refmhkYjcu1V6tl8AxE9OoX3AJziXLM=; b=Ci8ViUWYoK5+uGbOhBQXvLdhHG7ZySuqpZoOZnQIYMy/CJFwYOuTMeZINAp54NFRYF cs8KCmJHaE9SRlQsNDmrSK5Sw0L62213gCGLhHnsJ3vmvkY+ycm3BnEYDME1clBSukiw sX+anYs1Nd2VOsY2dlhgFYg7PXAug7NHJw+pDaD9V3h6reW/iHRZTpqSBOf3TOzN899V 7/iMasevUeIZD3q4VT1gQ0D1BnAG9yTnqYHeV9+KaC3cCXEOLOSnYEoLmNT/R13fZi9J KxT6e55jSpRQ8TyTTaJwxD1moc0l0/PxbjthekdIPecaakqi+aTNzvmNNHd8wRaMF7jS Y2Ag== X-Gm-Message-State: ACrzQf3DI1k7gzMKS2+VN5QurNcy+amy3yH1QGOXetUsTX4l8zul8VOc vNR6TafJ7Pwxcl9H9uttbx4F0w== X-Received: by 2002:a7b:c84c:0:b0:3b3:3faa:10c3 with SMTP id c12-20020a7bc84c000000b003b33faa10c3mr10357289wml.94.1664452196292; Thu, 29 Sep 2022 04:49:56 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l3-20020a05600c1d0300b003a62400724bsm4486938wms.0.2022.09.29.04.49.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 315271FFD5; Thu, 29 Sep 2022 12:42:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Subject: [PATCH v1 34/51] disas: use result of ->read_memory_func Date: Thu, 29 Sep 2022 12:42:14 +0100 Message-Id: <20220929114231.583801-35-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This gets especially confusing if you start plugging in host addresses from a trace and you wonder why the output keeps changing. Report when read_memory_func fails instead of blindly disassembling the buffer contents. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220921160801.1490125-4-alex.bennee@linaro.org> --- disas.c | 20 ++++++------- disas/capstone.c | 73 ++++++++++++++++++++++++++++-------------------- 2 files changed, 53 insertions(+), 40 deletions(-) diff --git a/disas.c b/disas.c index f07b6e760b..94d3b45042 100644 --- a/disas.c +++ b/disas.c @@ -83,18 +83,18 @@ static int print_insn_objdump(bfd_vma pc, disassemble_info *info, const char *prefix) { int i, n = info->buffer_length; - uint8_t *buf = g_malloc(n); - - info->read_memory_func(pc, buf, n, info); - - for (i = 0; i < n; ++i) { - if (i % 32 == 0) { - info->fprintf_func(info->stream, "\n%s: ", prefix); + g_autofree uint8_t *buf = g_malloc(n); + + if (info->read_memory_func(pc, buf, n, info) == 0) { + for (i = 0; i < n; ++i) { + if (i % 32 == 0) { + info->fprintf_func(info->stream, "\n%s: ", prefix); + } + info->fprintf_func(info->stream, "%02x", buf[i]); } - info->fprintf_func(info->stream, "%02x", buf[i]); + } else { + info->fprintf_func(info->stream, "unable to read memory"); } - - g_free(buf); return n; } diff --git a/disas/capstone.c b/disas/capstone.c index 20bc8f9669..fe3efb0d3c 100644 --- a/disas/capstone.c +++ b/disas/capstone.c @@ -191,37 +191,43 @@ bool cap_disas_target(disassemble_info *info, uint64_t pc, size_t size) size_t tsize = MIN(sizeof(cap_buf) - csize, size); const uint8_t *cbuf = cap_buf; - info->read_memory_func(pc + csize, cap_buf + csize, tsize, info); - csize += tsize; - size -= tsize; + if (info->read_memory_func(pc + csize, cap_buf + csize, tsize, info) == 0) { + csize += tsize; + size -= tsize; - while (cs_disasm_iter(handle, &cbuf, &csize, &pc, insn)) { - cap_dump_insn(info, insn); - } + while (cs_disasm_iter(handle, &cbuf, &csize, &pc, insn)) { + cap_dump_insn(info, insn); + } + + /* If the target memory is not consumed, go back for more... */ + if (size != 0) { + /* + * ... taking care to move any remaining fractional insn + * to the beginning of the buffer. + */ + if (csize != 0) { + memmove(cap_buf, cbuf, csize); + } + continue; + } - /* If the target memory is not consumed, go back for more... */ - if (size != 0) { /* - * ... taking care to move any remaining fractional insn - * to the beginning of the buffer. + * Since the target memory is consumed, we should not have + * a remaining fractional insn. */ if (csize != 0) { - memmove(cap_buf, cbuf, csize); + info->fprintf_func(info->stream, + "Disassembler disagrees with translator " + "over instruction decoding\n" + "Please report this to qemu-devel@nongnu.org\n"); } - continue; - } + break; - /* - * Since the target memory is consumed, we should not have - * a remaining fractional insn. - */ - if (csize != 0) { + } else { info->fprintf_func(info->stream, - "Disassembler disagrees with translator " - "over instruction decoding\n" - "Please report this to qemu-devel@nongnu.org\n"); + "0x%08" PRIx64 ": unable to read memory\n", pc); + break; } - break; } cs_close(&handle); @@ -286,16 +292,23 @@ bool cap_disas_monitor(disassemble_info *info, uint64_t pc, int count) /* Make certain that we can make progress. */ assert(tsize != 0); - info->read_memory_func(pc + csize, cap_buf + csize, tsize, info); - csize += tsize; - - if (cs_disasm_iter(handle, &cbuf, &csize, &pc, insn)) { - cap_dump_insn(info, insn); - if (--count <= 0) { - break; + if (info->read_memory_func(pc + csize, cap_buf + csize, + tsize, info) == 0) + { + csize += tsize; + + if (cs_disasm_iter(handle, &cbuf, &csize, &pc, insn)) { + cap_dump_insn(info, insn); + if (--count <= 0) { + break; + } } + memmove(cap_buf, cbuf, csize); + } else { + info->fprintf_func(info->stream, + "0x%08" PRIx64 ": unable to read memory\n", pc); + break; } - memmove(cap_buf, cbuf, csize); } cs_close(&handle); From patchwork Thu Sep 29 11:42:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610604 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp908044pvb; Thu, 29 Sep 2022 06:59:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6yd4k22gLGNhznzdOddngDuy36sJyHRzays2Qa/e+JsjdOx68Wpr0SN+nH62INgfYtSGB5 X-Received: by 2002:a05:620a:12f1:b0:6ce:3f13:ab31 with SMTP id f17-20020a05620a12f100b006ce3f13ab31mr2215834qkl.299.1664459994232; Thu, 29 Sep 2022 06:59:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664459994; cv=none; d=google.com; s=arc-20160816; b=pNDnbhK3ZwMBi0yfh/umE9PCYO+eSUqD/2icnEfr3kYGNzm8pbG8kkivSFtE4/B9u5 DGtn9nVjyMhIhUu9BqSAsjaLWOMCzNyLeGw2I73ZOxFhqBHVqBp3gU0l5O0v4TwmTGUX +YaayGTcplW898zn91jkkzSUDlxIGbklelgMKyhtAsU6TANGhSvNQcw/YhApEYXK7/LG WGK1qfpTAK6hNrqzEbTnP4Z5DOZL8sdHPSI+IEtMeGmzphfCsub0RssRUZMxje2sLs0P 9WoG8ITbSPqR0yKAqaPHIX51BPHXw5FFTWNmcF7/xCD2i+PuK0SS646ZyhhU2dBn6fMk Ur0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1+VtfqcLpKUqnb05E4FT2XUGggpDKsrFB5OgM4JscTE=; b=Hnm9K4e8JuNza3tzfk8jyQk66o/z/4z8GWk5uYXSEJ37f2wDN+pwO7nVKm+FJQ6Dyu 69EtrOV9B0azPI+3BUciIw+jvq4lEOL5MDNC1lFnYysDWx3dCnCQAtKjJglADfbwlphO ngCg5FrFx4/8fqpebMvEe3DPXbvQNXcgzEUfzHNYGnBs3AyGRbSyUN59R3uzgbuZsXI9 B0DbVu9LEt0/O9WzvQZSxYaGe480xAw6VC0O0nG7OcCuZgGaOCZwM7rppLE2/3V2pskt DqrXvQq7h5dbgbMWIsqrsL6tJw0qiYxQ4RWZ9TYBQJVfHkrIEHGYrSUXvIkejVKpTkVR ajKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UPZyDEBE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u1-20020a05620a0c4100b006ce93ebb0e4si1537587qki.601.2022.09.29.06.59.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:59:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UPZyDEBE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odu4v-0006br-Lr for patch@linaro.org; Thu, 29 Sep 2022 09:59:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odsCx-0007Qf-BJ for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:03 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:44831) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odsCs-0004MP-N2 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:02 -0400 Received: by mail-wr1-x42f.google.com with SMTP id c11so1800168wrp.11 for ; Thu, 29 Sep 2022 04:59:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=1+VtfqcLpKUqnb05E4FT2XUGggpDKsrFB5OgM4JscTE=; b=UPZyDEBECm24nkvrQFKeMmlmFyz+OGts4iEgFPjQJhoMvkWLBLU/WQeqf9uSFijBuA eLdlzTF9pEys3Nb50cKYNEMzeMXGOe3kla4Tf3dmfQ3hU4ihBvFLVvHmr7qO55hMyEoW FRgOrFWpU4jC3ip14V7KXUjQSloFqY5JdnpMkMgaFM9Las1MTVVt6G8TD7mngmCo8nT5 tJhx00pGW25nCE3yd/b4uXpFQ8i6j/bM5IM4tI4lITXne5+J9UFXMBCMG9ptqrrI+x9u opzyDQ5LwKUWwRM2MRZSnGjW1bkLdUWq9UFyt2j84cz5w2joCZoVuT+XzJz+SoaTeImP +Fdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=1+VtfqcLpKUqnb05E4FT2XUGggpDKsrFB5OgM4JscTE=; b=aLclujo5tOP3OsOJxnIezXh6fy8Q9fjTLXQj4Ia0tPqFNk0KKmmR8bzAX5Wctn5C4k EH2xJPm04T83XdVtqIijN1qJthVmLxZe/0IbsPPwG+1i8tW1f9cCUPzMKhaa7i076Bih lXkrFg8jHG60MqoiT7fWKAmYzpZDqxLoZVHdXQJ2Iri21Zwe/PJV304GBV4QSjfvKGIs bh+rM26NtrMD8xYehOenANbqzOYb0g9g6txxiJr7Lfnk0xzrAYvRKs9cqX7tpZYh0gpy RTuxfCJwW7YEK2wGWvd+dF01EN52vuFbdIWyQfn5FpxnXOAZTOaCHKQdQg5vGGp2M34C RnaA== X-Gm-Message-State: ACrzQf3ZW55Oep4K0kzARprOH8MZvEXwQxmo6rOO1TryeIjBipEVFnd9 uTCkW5LEUhsI0ILYQKjLDtngjA== X-Received: by 2002:a5d:4e84:0:b0:22c:db44:31ca with SMTP id e4-20020a5d4e84000000b0022cdb4431camr946878wru.665.1664452794379; Thu, 29 Sep 2022 04:59:54 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h5-20020a05600c350500b003b491f99a25sm4500507wmq.22.2022.09.29.04.59.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:59:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4D7071FFBE; Thu, 29 Sep 2022 12:42:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Alexandre Iooss Subject: [PATCH v1 35/51] plugins: extend execlog to filter matches Date: Thu, 29 Sep 2022 12:42:15 +0100 Message-Id: <20220929114231.583801-36-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Sometimes the whole execlog is just two much so add the ability to filter by instruction opcode or address. [AJB: this shows for example .qemu-system-aarch64 -display none -serial mon:stdio \ -M virt -cpu max \ -semihosting-config enable=on \ -kernel ./tests/tcg/aarch64-softmmu/memory-sve \ -plugin ./contrib/plugins/libexeclog.so,ifilter=st1w,afilter=0x40001808 -d plugin -D plugin.out the st1w SVE instruction is not instrumenting its stores.] Signed-off-by: Alex Bennée Reviewed-by: Alexandre Iooss Cc: Robert Henry Cc: Aaron Lindsay Message-Id: <20220921160801.1490125-6-alex.bennee@linaro.org> --- docs/devel/tcg-plugins.rst | 9 +++- contrib/plugins/execlog.c | 96 ++++++++++++++++++++++++++++++++------ 2 files changed, 90 insertions(+), 15 deletions(-) diff --git a/docs/devel/tcg-plugins.rst b/docs/devel/tcg-plugins.rst index a7cc44aa20..a503d44cee 100644 --- a/docs/devel/tcg-plugins.rst +++ b/docs/devel/tcg-plugins.rst @@ -346,7 +346,7 @@ The execlog tool traces executed instructions with memory access. It can be used for debugging and security analysis purposes. Please be aware that this will generate a lot of output. -The plugin takes no argument:: +The plugin needs default argument:: qemu-system-arm $(QEMU_ARGS) \ -plugin ./contrib/plugins/libexeclog.so -d plugin @@ -364,6 +364,13 @@ which will output an execution trace following this structure:: 0, 0xd34, 0xf9c8f000, "bl #0x10c8" 0, 0x10c8, 0xfff96c43, "ldr r3, [r0, #0x44]", load, 0x200000e4, RAM +the output can be filtered to only track certain instructions or +addresses using the `ifilter` or `afilter` options. You can stack the +arguments if required:: + + qemu-system-arm $(QEMU_ARGS) \ + -plugin ./contrib/plugins/libexeclog.so,ifilter=st1w,afilter=0x40001808 -d plugin + - contrib/plugins/cache.c Cache modelling plugin that measures the performance of a given L1 cache diff --git a/contrib/plugins/execlog.c b/contrib/plugins/execlog.c index a5275dcc15..e659ac9cbb 100644 --- a/contrib/plugins/execlog.c +++ b/contrib/plugins/execlog.c @@ -20,6 +20,9 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION; /* Store last executed instruction on each vCPU as a GString */ GArray *last_exec; +static GPtrArray *imatches; +static GArray *amatches; + /** * Add memory read or write information to current instruction log */ @@ -85,12 +88,13 @@ static void vcpu_insn_exec(unsigned int cpu_index, void *udata) static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) { struct qemu_plugin_insn *insn; - uint64_t insn_vaddr; - uint32_t insn_opcode; - char *insn_disas; + bool skip = (imatches || amatches) ? true : false; size_t n = qemu_plugin_tb_n_insns(tb); for (size_t i = 0; i < n; i++) { + char *insn_disas; + uint64_t insn_vaddr; + /* * `insn` is shared between translations in QEMU, copy needed data here. * `output` is never freed as it might be used multiple times during @@ -99,20 +103,52 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) * a limitation for CISC architectures. */ insn = qemu_plugin_tb_get_insn(tb, i); - insn_vaddr = qemu_plugin_insn_vaddr(insn); - insn_opcode = *((uint32_t *)qemu_plugin_insn_data(insn)); insn_disas = qemu_plugin_insn_disas(insn); - char *output = g_strdup_printf("0x%"PRIx64", 0x%"PRIx32", \"%s\"", - insn_vaddr, insn_opcode, insn_disas); + insn_vaddr = qemu_plugin_insn_vaddr(insn); + + /* + * If we are filtering we better check out if we have any + * hits. The skip "latches" so we can track memory accesses + * after the instruction we care about. + */ + if (skip && imatches) { + int j; + for (j = 0; j < imatches->len && skip; j++) { + char *m = g_ptr_array_index(imatches, j); + if (g_str_has_prefix(insn_disas, m)) { + skip = false; + } + } + } + + if (skip && amatches) { + int j; + for (j = 0; j < amatches->len && skip; j++) { + uint64_t v = g_array_index(amatches, uint64_t, j); + if (v == insn_vaddr) { + skip = false; + } + } + } - /* Register callback on memory read or write */ - qemu_plugin_register_vcpu_mem_cb(insn, vcpu_mem, - QEMU_PLUGIN_CB_NO_REGS, - QEMU_PLUGIN_MEM_RW, NULL); + if (skip) { + g_free(insn_disas); + } else { + uint32_t insn_opcode; + insn_opcode = *((uint32_t *)qemu_plugin_insn_data(insn)); + char *output = g_strdup_printf("0x%"PRIx64", 0x%"PRIx32", \"%s\"", + insn_vaddr, insn_opcode, insn_disas); + + /* Register callback on memory read or write */ + qemu_plugin_register_vcpu_mem_cb(insn, vcpu_mem, + QEMU_PLUGIN_CB_NO_REGS, + QEMU_PLUGIN_MEM_RW, NULL); + + /* Register callback on instruction */ + qemu_plugin_register_vcpu_insn_exec_cb(insn, vcpu_insn_exec, + QEMU_PLUGIN_CB_NO_REGS, output); + } - /* Register callback on instruction */ - qemu_plugin_register_vcpu_insn_exec_cb(insn, vcpu_insn_exec, - QEMU_PLUGIN_CB_NO_REGS, output); } } @@ -132,6 +168,25 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) } } +/* Add a match to the array of matches */ +static void parse_insn_match(char *match) +{ + if (!imatches) { + imatches = g_ptr_array_new(); + } + g_ptr_array_add(imatches, match); +} + +static void parse_vaddr_match(char *match) +{ + uint64_t v = g_ascii_strtoull(match, NULL, 16); + + if (!amatches) { + amatches = g_array_new(false, true, sizeof(uint64_t)); + } + g_array_append_val(amatches, v); +} + /** * Install the plugin */ @@ -145,6 +200,19 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, */ last_exec = g_array_new(FALSE, FALSE, sizeof(GString *)); + for (int i = 0; i < argc; i++) { + char *opt = argv[i]; + g_autofree char **tokens = g_strsplit(opt, "=", 2); + if (g_strcmp0(tokens[0], "ifilter") == 0) { + parse_insn_match(tokens[1]); + } else if (g_strcmp0(tokens[0], "afilter") == 0) { + parse_vaddr_match(tokens[1]); + } else { + fprintf(stderr, "option parsing failed: %s\n", opt); + return -1; + } + } + /* Register translation block and exit callbacks */ qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans); qemu_plugin_register_atexit_cb(id, plugin_exit, NULL); From patchwork Thu Sep 29 11:42:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610593 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp892824pvb; Thu, 29 Sep 2022 06:31:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6l7RUerWrz9Wg7CobQMNTkpZm6Auc+YclAlkdpFeeM3Gi1qcTAoTgLdasruZdOO7NagipP X-Received: by 2002:a05:622a:c7:b0:35d:4841:9d33 with SMTP id p7-20020a05622a00c700b0035d48419d33mr2337593qtw.263.1664458271078; Thu, 29 Sep 2022 06:31:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664458271; cv=none; d=google.com; s=arc-20160816; b=WoX9sfTQ1Q4zcz5mwv1Eiz4vlhu9FiRYetiw3odNKoZO7l9jfqLBiyFP/kRNV8xuiA zSwgDjJF1tldLHSUNlxk7+rwv6C0N1jWkrLAJhIqWA7J8R7hz+oef+qTg3msCI1b8i40 n+w7B1A6OKA0KS+CgG8LvNZAU6dyXbdevWWaHqnQLToqxB4kM/SmhT6IOjER9SLkjUVo IIrO1wdBFXItReJlz7YdDYsvjSq9MJknpMM/K0E8kbDKnqpvfUm7VzIDakIKzG5IW//X 3aX+Uld5wN5U2ma5btglbbkLFTpo9j/8Nu7UnNogKpM5eeV02AGxfQraD6E/2Y3EcQa/ jKvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=TheWSguGhRqniI62gc+1hhanmtlCzZ/ZQDcCAwGaUoc=; b=NZy8/tx5rN0dVWdFnnoQ2J01SByG5S1sVSOo8ht82KFuH88zaNr3AoBFxxZuGZbLXW 27f3N3uLFWIbeJw76BqV4gIOiIhVFb4XKd/OvQcoj1jgc0ZhyR8Vek0UEBbl97eYgWtO IGawNmbPJ6M2yv8oefzlK0nH303XboPSzsiG9XkYB+edpNF7w4IkKkuXiFJYRtKgqnax j4/PoC8LmCiFPbxbkC4BUbSIURsNqTzeVAd5Cc4zMb79lFLSyk7eouWY1ZDKgKs2PF3m 63nXgWekTnW67wPeNPEiQeGj/WvcFpHOGqLn0p1JWz2cILgCXNhylMEFD9jxSQcNTfUw fGGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jk6Zb+DC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r1-20020ad45761000000b004a2e424f57bsi4858919qvx.36.2022.09.29.06.31.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:31:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jk6Zb+DC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odtcx-0002vI-5l for patch@linaro.org; Thu, 29 Sep 2022 09:31:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odrwE-0004cB-NH for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:46 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:33752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odrwD-0001Bw-3i for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:42:46 -0400 Received: by mail-wr1-x429.google.com with SMTP id s14so1793428wro.0 for ; Thu, 29 Sep 2022 04:42:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=TheWSguGhRqniI62gc+1hhanmtlCzZ/ZQDcCAwGaUoc=; b=jk6Zb+DC42VJhy/nEo+xrYZ7n5u+jHhrWua+fIxEdF721Mu9IsHsIwUJBICbQ9iQZs btE3tyAsCK5EFrDi0Bzc//DGS/5FAW6KUTsLQeKLt3TFhlbgXRQdff1V9hsHDm4OvMz/ t8Ix7zzzI9Ri6DbmawzfF+KeoxkRO2TR6cPMzkRcu9E8OERX995nnv5lgXGuQblyGTKX 8W8N/YTYMoJIYjcnSD8fWW7zvpvb63D/a2nkPthOC48flakCafTXKM9dAHDvk9u6hv+6 IIh9Xbc5kk1GlGwjPFobBjp4VfFQZkkjpdN4CZ7PamAfnNXOxp2/9SxBarRTV1cTwo5x hIfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=TheWSguGhRqniI62gc+1hhanmtlCzZ/ZQDcCAwGaUoc=; b=JG4p/YwGvDgHKj0K3zWfGYDt2Ha2aUUIeFLojiGLe/KDrzhODSgBX7E13PDHxGha2y IJBebyop3QyKeplHHso8+TTNL3RFx6XqPGkaShrZcjc86KbMo3Cuiu8YBN2nO4r2/3Nb fyBqx3IG1aZ24PpJblNewLMvy3gKghGCHdHeJ5iB14Pmz0u5YtUN+XsZ3PVoZsdVxPAP qzwJzdQPvoA9h7E1jS7FihZlnS4bJVorvJAkeSnFAvpBqZqgJaGqFHmYzFwyscgRHn/H AM0W0DxkhJlVs579VR7tVULVyxhcSoGtPepccc1uuR7JwLosqn+VP0/q4MNeBC4LwzxP Fg9w== X-Gm-Message-State: ACrzQf1wKdmNddlKo7HspsTSSpksA0+ylpRhirishDy6zhYq7JIDFz50 fhcu29bnuNaNP7bf3ABGNCaJ0A== X-Received: by 2002:a05:6000:1f16:b0:22c:cb05:5097 with SMTP id bv22-20020a0560001f1600b0022ccb055097mr2042628wrb.591.1664451764319; Thu, 29 Sep 2022 04:42:44 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bk8-20020a0560001d8800b0022af865810esm6201145wrb.75.2022.09.29.04.42.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:42:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 668FE1FFD6; Thu, 29 Sep 2022 12:42:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, Richard Henderson , Damien Hedde , =?utf-8?q?Alex_Benn=C3=A9e?= , Alexandre Iooss Subject: [PATCH v1 36/51] plugins: Assert mmu_idx in range before use in qemu_plugin_get_hwaddr Date: Thu, 29 Sep 2022 12:42:16 +0100 Message-Id: <20220929114231.583801-37-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Coverity reports out-of-bound accesses here. This should be a false positive due to how the index is decoded from MemOpIdx. Fixes: Coverity CID 1487201 Signed-off-by: Richard Henderson Reviewed-by: Damien Hedde Message-Id: <20220401190233.329360-1-richard.henderson@linaro.org> Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220921160801.1490125-7-alex.bennee@linaro.org> --- plugins/api.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/api.c b/plugins/api.c index 7bf71b189d..2078b16edb 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -289,6 +289,8 @@ struct qemu_plugin_hwaddr *qemu_plugin_get_hwaddr(qemu_plugin_meminfo_t info, enum qemu_plugin_mem_rw rw = get_plugin_meminfo_rw(info); hwaddr_info.is_store = (rw & QEMU_PLUGIN_MEM_W) != 0; + assert(mmu_idx < NB_MMU_MODES); + if (!tlb_plugin_lookup(cpu, vaddr, mmu_idx, hwaddr_info.is_store, &hwaddr_info)) { error_report("invalid use of qemu_plugin_get_hwaddr"); From patchwork Thu Sep 29 11:42:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610605 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp908065pvb; Thu, 29 Sep 2022 06:59:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM54f0J3ZeXud7dZryZ9caSar9ZGlfNGRkGhn76PTvCdcMWpB6arQjGYF6LOC0+JBdX0EgcA X-Received: by 2002:a05:620a:4089:b0:6ce:29eb:9692 with SMTP id f9-20020a05620a408900b006ce29eb9692mr2262331qko.273.1664459995323; Thu, 29 Sep 2022 06:59:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664459995; cv=none; d=google.com; s=arc-20160816; b=0bzQpZ9j9bZ4sp7CCNSWU240kfW4cOaQvksmYwjaPnab6YifthfkuDRWWxOmZDmu8t YlDSqmRaUIVzzHEmD9WR0ugCY5uigHT3gaBv67o66/woknV1K0Htrd8JnJjr/T+64OKG WQhIQYJ8zn8DF9kcsAoAzRbfgqbJmFD9qZ4cwtHqzz6Jfcm1gCkRP3+JYMnvDC1Vx35R 7bfhx+srx9uoddzL19YXA4xzVGNbtedzNjrf55Z9n/GzuyS7s2ehEJ/h57IHfdbW7BeX i0sucky/sJ+Pgsv3Jhy7STO5fv7EW1Xe8Ey1qOI3OwpJ5atJv/GgHT/Nl82R8AG4DIuj Enew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8JenHXqV6xiyGmjePqVC5qPckxIDo6KWDriFhBc6wYc=; b=HCZO25IIgdGf5eFA9QYJlYbR2JD0Zqo3tek9Dvu8kQ5wByuekdrwyCWq1ajBt1Qih+ oTA2YsZOAEWwlYA0bIq30imViPLhqiMLIzCV0R42wHt7tsXT10ipxLL0I7NwjZffi38r 62gyyKcpiMS1SdXxYxZGoz6xouK3sDZMIPO8BnN6jipKYxayBCo7bN5AX1G5pEoSqkL6 B7eHLDs68+vclEsKR7yxhnfkPxT7iC+NJT2cmhArzXXFJqxk2y0FfhCX8qfiXiszLhWt 63K1zitCyagBFm/FW7cw5burx3oNb2ktVrhqkM10uEodwRh65cfi0KEgoMar2+ZL0SRu J7sQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FdEsBE8q; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gm9-20020a056214268900b004991ad4f133si5247612qvb.328.2022.09.29.06.59.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:59:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FdEsBE8q; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odu4w-0006dZ-RP for patch@linaro.org; Thu, 29 Sep 2022 09:59:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odsD3-0007Y9-9i for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:09 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:42669) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odsCy-0004RF-DF for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:08 -0400 Received: by mail-wm1-x335.google.com with SMTP id o20-20020a05600c4fd400b003b4a516c479so618854wmq.1 for ; Thu, 29 Sep 2022 05:00:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=8JenHXqV6xiyGmjePqVC5qPckxIDo6KWDriFhBc6wYc=; b=FdEsBE8qaqEQraGgp7uDKv8lKyADrYLs1p464dSdzyIlPL2djTCGh3MnQYKTz4F0rc BBWvsqps6kjWqYNlXhLbCx/RQCWyK0+KOpholXmt1e2rCAEE1JOiOTYq9cz4kYY0t+Xv e7EQlQOFASFUT6kTLLyU3ibvDqz39/VDrYtYjvNW7niDlZQLziZtFG7bW6ztiHND64G8 xeMFGoIuAlzt/vZCpsGcf3Sk63D1OsXKjttakxQgEUrMTAlNSXdfNrMtHygVj5ia2wTb bhWjKz+MoO0r9/i9qyQstUicCsGaZGHLYlztTfpWiaclMZR9pB+s5FudhJZDEa1HqNXR dipA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=8JenHXqV6xiyGmjePqVC5qPckxIDo6KWDriFhBc6wYc=; b=MzVgbDlBTDh2GWIDWanjA6Oa71XvJE7xVJKp+Z4bXfJRdQ2rPZtUuniL0Q1HnXGznI sLZO+8ad6aGB6B4E5e2vObIKn2xb/A/lZgaFlAJ6eAEr0kGqyu8wPdKj10a6iv5tV8ur nTGDDUbq8rDMFEXl2oVunkwi0KKSqNXKz3gXsuuPA3/ctN8ocI/Ss7yNSzvr6YWXPvSf OKwVPhl/2nqd2Pc56vi4SxUhyq8XsuimE7FHDX14PziUYK8W02d54EyA59CO1l1PavCd HA7ygWn2ccrL24KqiBr06fK14oTjishdNH6DZW343aeGmDRc6Weyy56c3bycqB3JvfdX Ez6Q== X-Gm-Message-State: ACrzQf0/h1xa3+Oc+gnhpGnbwO6iqd/+7I8/UJOMSedQFoQsyzsw83Uk BDM2g9X3nj8BrZIckINKwbQM3Q== X-Received: by 2002:a05:600c:21c3:b0:3b4:7e47:e3a with SMTP id x3-20020a05600c21c300b003b47e470e3amr2003955wmj.167.1664452802316; Thu, 29 Sep 2022 05:00:02 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id d9-20020adf9c89000000b0022878c0cc5esm1144807wre.69.2022.09.29.04.59.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:59:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7DB451FFD7; Thu, 29 Sep 2022 12:42:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Alexandre Iooss Subject: [PATCH v1 37/51] docs/devel: clean-up qemu invocations in tcg-plugins Date: Thu, 29 Sep 2022 12:42:17 +0100 Message-Id: <20220929114231.583801-38-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We currently have the final binaries in the root of the build dir so the build prefix is superfluous. Additionally add a shell prompt to be more in line with the rest of the code. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220921160801.1490125-8-alex.bennee@linaro.org> --- docs/devel/tcg-plugins.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/devel/tcg-plugins.rst b/docs/devel/tcg-plugins.rst index a503d44cee..a6fdde01f8 100644 --- a/docs/devel/tcg-plugins.rst +++ b/docs/devel/tcg-plugins.rst @@ -172,7 +172,7 @@ slightly faster (but not thread safe) counters. Example:: - ./aarch64-linux-user/qemu-aarch64 \ + $ qemu-aarch64 \ -plugin contrib/plugins/libhotblocks.so -d plugin \ ./tests/tcg/aarch64-linux-user/sha1 SHA1=15dd99a1991e0b3826fede3deffc1feba42278e6 @@ -186,7 +186,7 @@ Example:: Similar to hotblocks but this time tracks memory accesses:: - ./aarch64-linux-user/qemu-aarch64 \ + $ qemu-aarch64 \ -plugin contrib/plugins/libhotpages.so -d plugin \ ./tests/tcg/aarch64-linux-user/sha1 SHA1=15dd99a1991e0b3826fede3deffc1feba42278e6 @@ -220,7 +220,7 @@ counted. You can give a value to the ``count`` argument for a class of instructions to break it down fully, so for example to see all the system registers accesses:: - ./aarch64-softmmu/qemu-system-aarch64 $(QEMU_ARGS) \ + $ qemu-system-aarch64 $(QEMU_ARGS) \ -append "root=/dev/sda2 systemd.unit=benchmark.service" \ -smp 4 -plugin ./contrib/plugins/libhowvec.so,count=sreg -d plugin @@ -288,10 +288,10 @@ for the plugin is a path for the socket the two instances will communicate over:: - ./sparc-softmmu/qemu-system-sparc -monitor none -parallel none \ + $ qemu-system-sparc -monitor none -parallel none \ -net none -M SS-20 -m 256 -kernel day11/zImage.elf \ -plugin ./contrib/plugins/liblockstep.so,sockpath=lockstep-sparc.sock \ - -d plugin,nochain + -d plugin,nochain which will eventually report:: @@ -348,7 +348,7 @@ Please be aware that this will generate a lot of output. The plugin needs default argument:: - qemu-system-arm $(QEMU_ARGS) \ + $ qemu-system-arm $(QEMU_ARGS) \ -plugin ./contrib/plugins/libexeclog.so -d plugin which will output an execution trace following this structure:: @@ -365,10 +365,10 @@ which will output an execution trace following this structure:: 0, 0x10c8, 0xfff96c43, "ldr r3, [r0, #0x44]", load, 0x200000e4, RAM the output can be filtered to only track certain instructions or -addresses using the `ifilter` or `afilter` options. You can stack the +addresses using the ``ifilter`` or ``afilter`` options. You can stack the arguments if required:: - qemu-system-arm $(QEMU_ARGS) \ + $ qemu-system-arm $(QEMU_ARGS) \ -plugin ./contrib/plugins/libexeclog.so,ifilter=st1w,afilter=0x40001808 -d plugin - contrib/plugins/cache.c @@ -377,7 +377,7 @@ Cache modelling plugin that measures the performance of a given L1 cache configuration, and optionally a unified L2 per-core cache when a given working set is run:: - qemu-x86_64 -plugin ./contrib/plugins/libcache.so \ + $ qemu-x86_64 -plugin ./contrib/plugins/libcache.so \ -d plugin -D cache.log ./tests/tcg/x86_64-linux-user/float_convs will report the following:: From patchwork Thu Sep 29 11:42:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610590 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp882744pvb; Thu, 29 Sep 2022 06:13:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7IFELbwdlgl7B6o4Jjhp1voP42nxLdTy9wrzNEUGitMNOEyFK7guhZ/EUiK+x6aCkPKfI0 X-Received: by 2002:a0c:810f:0:b0:47b:299a:56d7 with SMTP id 15-20020a0c810f000000b0047b299a56d7mr2314095qvc.12.1664457237387; Thu, 29 Sep 2022 06:13:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664457237; cv=none; d=google.com; s=arc-20160816; b=l/ZFXbshCDZT7kd1OJpU7jMoHId1kSYp92FGkmIT7lMpt0xY4Mm1EOELUtG0HzqlYP I+F7FIeVDlOfW5z9mLyoRpJhexW01spMabTwn0HzxUNVIXQS9tHDRd6bLrHzZX7aYiEe 4oJApy+kPsTCtUXE1ReYBJNY6OTXZivofXD502IhTLEef+dxVf173nGPDoNeBUAWLFbC 9DTNsM+0foOVI5jYT8PJifqCcIhJIz5XYqBDZSgzKVlmw9WJuHoE9i2QU3X7LULp6ogr CAVjo2Dtt9X0ytk9xAoaKIjwyFy1KwyUqfwrsG2dOzDxyi+DSs9syPgk5ja2W6KgUq5s e1ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=LSxM948fp1p1t8Uf4MobowtOCXUoE+CecuNJGsP6k84=; b=NMdqGpbweW3h8hBa39T0S2gtnOQgAvg4tlaxm7X0ZnZIrbb2n2GL6NIo/BWku1XC1k 5FuQPZxD7QB9zbdbL1fTN+AVU3BPgJO1q76BHxN2Y+lve1zTIMHHqrh7vcsoNnK18Xz5 XOO8gIoI6rDbTkc6r9AoHi+6ae6LjZkyG+BrjedyFxwTexVWzFOGdjSsrxlN+FnCYwNs P0764N/QjMBfd2PMrOPlOwPbUDsIgbt0uvQgM6UzZkfJql7XPmR5EDstl1D1itkVy+KK vb4gr7D2KjPLSrmbuoy1vxt0MihtJW0HzCiWeDxXM81HFAmlFcg3e9KqZLrCzN8lKqcw kQvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="dx/Fy5uD"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s19-20020ae9f713000000b006ce8a748a63si1064978qkg.728.2022.09.29.06.13.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:13:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="dx/Fy5uD"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odtMS-000818-Uv for patch@linaro.org; Thu, 29 Sep 2022 09:13:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3B-0000N6-CJ for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:05 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:45856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods37-0002NF-Cv for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:49:55 -0400 Received: by mail-wr1-x429.google.com with SMTP id n10so1756696wrw.12 for ; Thu, 29 Sep 2022 04:49:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=LSxM948fp1p1t8Uf4MobowtOCXUoE+CecuNJGsP6k84=; b=dx/Fy5uDXxj7Gn4RYOVjz605cvWjoksGIp+6vOy35s1ROkPj2nLAcO2VQ7KQLULXWs f3xZs2q46I7BlvnyxVvLozZrEnpjCVwZ9U/PrxbzUFLUnueoeA03mIMQaJdR2jxDlEKD PjZ87svJTcfO5bWlvXrVWPv/rooj2Gnf1pYEx1xvFLmTUxDW2KV2k0q7INrNf3RWIBe7 GmMV1shpYtLHD2ZLpKcgE+bE1I5UfUGaVPcFspwGPcO86jVqWxX8HBfH7ulCMCzFEeIA cmMegoCGnQw7W9N1k5tx3+IOuxk5iF+0/P58YwxLuS+qMPPCXiRXIb8xPu8mPgqMw1Ic zNMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=LSxM948fp1p1t8Uf4MobowtOCXUoE+CecuNJGsP6k84=; b=fQMglB3yNAlzpxhFRwGQiSGjKjEjejWgIT9Y+2fiiEk7nBUI6ozfAgjdxhBiLz68U5 irvgjwI/GHq+QJ8lWtiQe0gaJ6GAJif6OwRc7ja5yfhwLVJgigH9jiMVEWex1fdPGw+A 2tXYuYqAQ6txyajNy+yXNId1NiM248TD9z1pWMrOLD+3Ly8sov4u5FYILRExf0qd6VSJ shd2pu0LHiSEFdy0IBeqd/0byfBbnxIlgGFmGfraV3amiI//lx17K6OPslUF8eRMbMvq UAT3DwApOXjk0t3gl9p+5z4SvGbAplkLUZKQsjVwL5bbiH4sxlT0wYrtBlirYQlkCxTT 6Ckg== X-Gm-Message-State: ACrzQf1aQWgMZVvyt27c3uRp5O1fezHccF3iZsjcDGcOsdpMdgsJnNJx SThOGrmm5RrpxAVrAhup0ewS9g== X-Received: by 2002:a5d:4f81:0:b0:21e:2cd7:25df with SMTP id d1-20020a5d4f81000000b0021e2cd725dfmr2034736wru.439.1664452191691; Thu, 29 Sep 2022 04:49:51 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id g14-20020adfe40e000000b0022ae8b862a7sm6424485wrm.35.2022.09.29.04.49.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 94FF51FFBD; Thu, 29 Sep 2022 12:42:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Alexandre Iooss Subject: [PATCH v1 38/51] docs/devel: move API to end of tcg-plugins.rst Date: Thu, 29 Sep 2022 12:42:18 +0100 Message-Id: <20220929114231.583801-39-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The API documentation is quite dry and doesn't flow nicely with the rest of the document. Move it to its own section at the bottom along with a little leader text to remind people to update it. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220921160801.1490125-9-alex.bennee@linaro.org> --- docs/devel/tcg-plugins.rst | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/docs/devel/tcg-plugins.rst b/docs/devel/tcg-plugins.rst index a6fdde01f8..8b40b2a606 100644 --- a/docs/devel/tcg-plugins.rst +++ b/docs/devel/tcg-plugins.rst @@ -110,11 +110,6 @@ details are opaque to plugins. The plugin is able to query select details of instructions and system configuration only through the exported *qemu_plugin* functions. -API -~~~ - -.. kernel-doc:: include/qemu/qemu-plugin.h - Internals --------- @@ -448,3 +443,13 @@ The plugin has a number of arguments, all of them are optional: associativity of the L2 cache, respectively. Setting any of the L2 configuration arguments implies ``l2=on``. (default: N = 2097152 (2MB), B = 64, A = 16) + +API +--- + +The following API is generated from the inline documentation in +``include/qemu/qemu-plugin.h``. Please ensure any updates to the API +include the full kernel-doc annotations. + +.. kernel-doc:: include/qemu/qemu-plugin.h + From patchwork Thu Sep 29 11:42:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610613 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp924989pvb; Thu, 29 Sep 2022 07:25:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5wqottFhqTUrWZqIa92cvqIOnyClqiow2f8srjYy18mTdx989muN9o9OhBut8tjtVe0h1e X-Received: by 2002:ac8:5755:0:b0:35b:ef17:fe08 with SMTP id 21-20020ac85755000000b0035bef17fe08mr2539364qtx.126.1664461505053; Thu, 29 Sep 2022 07:25:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664461505; cv=none; d=google.com; s=arc-20160816; b=n7+pI/sQMfRbWj9VZ84WSr0fHt3jQhXmR2UgcoAsdc6VYf00OP9SQGB9g7sxSOk/JX zdXTD7TbDJlHUcCTr5FCOCNA7D6/fLFHuSigX/nrfElfl3++RgPXSvVdIEjZ4NneHilY NjhZSYWpKCw0erl+sg47R3GRlNQfmH09YckE8bEiLvco9FGPm0QKLmXP3opg8wwz8bl5 mloK0dhzzBwlCXII0fkB6B4bywFggZCo071QFKNISjTawlaVgGvDFUGleeQt7eIKEIm3 F0Qr4gkho2ZJwgxmHtu+lzMb1o+/tuz0mURQHCF3VIi+Kyf2BHUMwmUPiCVNTNx8Q94y wtTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XomK1kpXDqBk+Ebyq0kQyqmYRo/vpKvPg6SHFpAPqMU=; b=LA3VIsHgBuD2wZpWxhVW6Ovtv7ksdfnNJrPNh4bXbYV8D3YPcO/+tzWNHLN1jK+otZ +p6C1hkZZePV8F9mmuBeOk56uaV9JMKfW7vBIzwvJSqULhBx/AwK5MVCpGSjI9DqnAv4 zqF8QwKcVy5svbDGnZS2zOAnbRhCAz2y8rhzB33gMl2Efbs5xueY47wAmIGz7L+jfE/f QIY4P3aTfgfRdIlUjhLIHWrzXEZkQobHC8KoI2LITb4FYeRC8M3mn+cCp6Z9IRjLMGJE 2l+dd570RWpNhPfcrjt2T8+BtV5DhFgwLveXc82adWCQh6EFEllxeEdzJCYzq3FEr+wB Fg7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tIgI4mtO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f2-20020a0562141d2200b004aa9e041c9esi4939563qvd.186.2022.09.29.07.25.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 07:25:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tIgI4mtO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oduTI-0008Qv-I8 for patch@linaro.org; Thu, 29 Sep 2022 10:25:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odsD0-0007TH-89 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:06 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:41516) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odsCu-0004NU-Mq for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:05 -0400 Received: by mail-wr1-x42e.google.com with SMTP id r6so1814629wru.8 for ; Thu, 29 Sep 2022 04:59:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=XomK1kpXDqBk+Ebyq0kQyqmYRo/vpKvPg6SHFpAPqMU=; b=tIgI4mtOBVpLyM5P7GpZ8WrF7OVzbQbi1d4wBSIQs036078Y+fh68AvJm9shzXsemj /lKYWBWU0l1YNcUWWkXQUXztMjru1GXzQf/PYXGtQSxVlT9OZE8gII5m7eyjTbhmXDjY qHf5rcQ0JSgjBclL3nPgKsFj/v6rKUjNddTh9OlVPjGz+HdFdmLw8YACwkY/iNvHr7Ti ADghZWKhFnCg8WfveggGQrp2ZAV2NwZjJsacPXnoR4WZ5aLQM1g2sqqVPPHP5ESiabeU XQxc4aSEcJWufi+jxgQNGoR6p12pDDAyapcv0vliiJ53MWD9Mwyo+5a4B2GuiNLaqVsS XWnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=XomK1kpXDqBk+Ebyq0kQyqmYRo/vpKvPg6SHFpAPqMU=; b=76dWCqfvj7VaEEpmQutsia50F29YnLz5j3qS8cXqndJvdbD2QFfPihs0dITZovKGih 5pO99RCRV6iQOuDq5XkEk1uuevprUyS89cAPvFVf2OhVeIdEo/88yahLjKVMeSl00RcK YkCmfmw7n1bcYdj4qMBqVx7g7bP9rlscwwkX1MTBoby4a+es7MTHQEcKGyXygsjf3JTi rLm9G1/zAzGb7q1t2BNqWk+PbyBFWiIAz8TVLGkPghKg/m3wRDPN2RfpBpZ52Ts2NONb kLT30kzrdbD27w5C+gMSBgFwL3QkLGr1/RBJdKOdf2jh20HW8OiaxnfGsXZkAQMBEWxp AwNQ== X-Gm-Message-State: ACrzQf1l/vpK/ZjIjabgdw+ZsZgvytrtXxRfmE/r11G6bx7nMr7q3lIQ vmz8gkw/NYXD69+QfA2Tcy2KcA== X-Received: by 2002:a05:6000:1f09:b0:22c:c6d9:5f42 with SMTP id bv9-20020a0560001f0900b0022cc6d95f42mr2065581wrb.84.1664452798085; Thu, 29 Sep 2022 04:59:58 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id p14-20020adfce0e000000b0022af6c93340sm6579624wrn.17.2022.09.29.04.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AD2371FFD8; Thu, 29 Sep 2022 12:42:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Alexandre Iooss , Richard Henderson Subject: [PATCH v1 39/51] contrib/plugins: reset skip when matching in execlog Date: Thu, 29 Sep 2022 12:42:19 +0100 Message-Id: <20220929114231.583801-40-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The purpose of the matches was to only track the execution of instructions we care about. Without resetting skip to the value at the start of the block we end up dumping all instructions after the match with the consequent load on the instrumentation. Signed-off-by: Alex Bennée Cc: Alexandre Iooss Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220921160801.1490125-10-alex.bennee@linaro.org> --- v2 - drop the ? bool ternary for skip --- contrib/plugins/execlog.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contrib/plugins/execlog.c b/contrib/plugins/execlog.c index e659ac9cbb..1b3bb7ebba 100644 --- a/contrib/plugins/execlog.c +++ b/contrib/plugins/execlog.c @@ -88,7 +88,7 @@ static void vcpu_insn_exec(unsigned int cpu_index, void *udata) static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) { struct qemu_plugin_insn *insn; - bool skip = (imatches || amatches) ? true : false; + bool skip = (imatches || amatches); size_t n = qemu_plugin_tb_n_insns(tb); for (size_t i = 0; i < n; i++) { @@ -147,6 +147,9 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) /* Register callback on instruction */ qemu_plugin_register_vcpu_insn_exec_cb(insn, vcpu_insn_exec, QEMU_PLUGIN_CB_NO_REGS, output); + + /* reset skip */ + skip = (imatches || amatches); } } From patchwork Thu Sep 29 11:42:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610623 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp955107pvb; Thu, 29 Sep 2022 08:14:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5dT6WNA6VShal0bXDGDnhuPZw02Sat5oHvyUqX6GuxvymkuNt3Zgtem5zrCb/0CzthHhWb X-Received: by 2002:a05:6214:202d:b0:4af:9a49:452c with SMTP id 13-20020a056214202d00b004af9a49452cmr2929726qvf.119.1664464493086; Thu, 29 Sep 2022 08:14:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664464493; cv=none; d=google.com; s=arc-20160816; b=m/CIRnQ+2UXkM8AF4e/HJcIDTtUHeJVOTs6bgRqwC1xi/7Zb+oRN1TYqkvkGqjt7FJ qegX3lVaXSgiiMvP6bYXMTTI6CZCyvil4F9UMSj5GM+KjEesEtKAJzkyi9f7kK52DtBp /v8BFEQHz9FY+fMPx3UkwjLzTGS8qz/V3qBJc3r2eCjLNyNh145OCh1BLH18xMfJOSDH g0R0memcGGIQ1X1B7DzWARD/Hv+MlGmg6kNqjA7LUSYxWiDet3by0gDTwqX37w95NsVc Zlyy+1gpPqODUPDGfx5pImfVya+3OkhaGf/ppZXmm01n/Wnr5Ryq/1zmyc+BvSBCbG0z 1Lxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NkejQo14YoKW4YZpsBZJ/pz1ZNt0+OQHO1iaD1STJCE=; b=d72xWpuuCZZWBmOty4X8AUypEu6huV58c+WbUvlmW2BzQHRU0bQiYiIqAO0ytaSY3/ nOiiwqbdtXfaqmw0zM+LlptZNM6+b766pZLZuazTk6QTiXO1mrUqtdmxyG1GR+JhA7/G EZ3HCBmYz6G1VDJqCBdiVKoxEl3dFjB3WBxCI9T5KVbYfThT+ntG1d3+UCRgMBBXYNrV lH99B1Itf/nyvQ0KBwmiMD2SW4SU6djmVzhELQkXgpB6agqNKOBvMNjOTcvqBNOOe6bc nH06D6L+QOYp8SKgLK7UvdZdb/mAPRu/yye71LxCDK6iEWTB7KQK+4ue1VhE3KE8xrR4 OB9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gNsukcQZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m28-20020aed27dc000000b0035ba9b286b4si1356664qtg.567.2022.09.29.08.14.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 08:14:53 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gNsukcQZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odvFU-00042k-KH for patch@linaro.org; Thu, 29 Sep 2022 11:14:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odsD1-0007Uq-H7 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:07 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:43998) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odsCv-0004PK-2I for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:07 -0400 Received: by mail-wr1-x42d.google.com with SMTP id h7so1798671wru.10 for ; Thu, 29 Sep 2022 05:00:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=NkejQo14YoKW4YZpsBZJ/pz1ZNt0+OQHO1iaD1STJCE=; b=gNsukcQZMgmQY0jP1nvYUYcGc5XSXQ6KQFeabr3+4PRVphyerKXGpKtxtMKqOP8LjT uYtTKKNJgpFAByw8cO61saFNI70hDSqi1BPEU9BkykPJ8a/Ly9UUlF32WtlgEaEWxCdA xpeximmhwFaw2Ngs0SW0og3zEAQ/Jb/GEdYipUhMKoPUERKpstu+7VJU0bn+w51buNxU 4+SAA7yrK+JJaDckLVSNp3NlwPO8nYNcj+zhcYHpHQbHEp8yvHOTdSFDyTve6Bzm3MYc P47JOdPokoI48hmZmN/OzD2D3qWwovcKBcXSUZLJ4A16VI6ct1VPOTddT6MhsWzJm2cK 2W0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=NkejQo14YoKW4YZpsBZJ/pz1ZNt0+OQHO1iaD1STJCE=; b=kzJF1rMwsY3AXHPpv8bVq08np7QQU5UpoGLPUcuA5xyfGcj3TH8bseRAYeESiEwxp+ fa/ZbZS8F+xMAtqcLUsP5EfnbrvqSFv7c45fNcZUqYwVS6ob5r75D0S5So+POV81zvoq yzx/vi0cujnWzc4mXkKlt0SXmxBU5CsnG82cTYYPdjuKDpk8eRDxl6nxREn1ae8u0iWN nU0Uc0VT6/ad8Ro8lTnfJxOapKEHVJ7HYS1kfsVLSLLMTyDJV+8BRxjcg7p26cRYSdKC w0x0yD4xeJ7W6l3snCajTEGWDwBXF+nhlDVW8pTWYrcbzDDUajH1dpWrRK0Pzm0/z1mx dDFA== X-Gm-Message-State: ACrzQf2pRNvrOTEj+86lRbi8HnlAVDCmQUVrZdBF/vTQBe62AcLAx7Y1 /lMceSvfxPXLqQUUhnfR49RqJQ== X-Received: by 2002:a05:6000:1447:b0:22a:ea42:29f7 with SMTP id v7-20020a056000144700b0022aea4229f7mr2118331wrx.38.1664452799590; Thu, 29 Sep 2022 04:59:59 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h14-20020a05600016ce00b0022aeba020casm6651414wrf.83.2022.09.29.04.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:59:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C43621FFD9; Thu, 29 Sep 2022 12:42:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Alexandre Iooss Subject: [PATCH v1 40/51] docs/devel: document the test plugins Date: Thu, 29 Sep 2022 12:42:20 +0100 Message-Id: <20220929114231.583801-41-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Although the test plugins are fairly basic they are still useful for some things so we should document their existence. Signed-off-by: Alex Bennée Message-Id: <20220921160801.1490125-11-alex.bennee@linaro.org> --- docs/devel/tcg-plugins.rst | 137 +++++++++++++++++++++++++++++++++++-- 1 file changed, 133 insertions(+), 4 deletions(-) diff --git a/docs/devel/tcg-plugins.rst b/docs/devel/tcg-plugins.rst index 8b40b2a606..9740a70406 100644 --- a/docs/devel/tcg-plugins.rst +++ b/docs/devel/tcg-plugins.rst @@ -145,12 +145,141 @@ Example Plugins There are a number of plugins included with QEMU and you are encouraged to contribute your own plugins plugins upstream. There is a -``contrib/plugins`` directory where they can go. +``contrib/plugins`` directory where they can go. There are also some +basic plugins that are used to test and exercise the API during the +``make check-tcg`` target in ``tests\plugins``. -- tests/plugins +- tests/plugins/empty.c -These are some basic plugins that are used to test and exercise the -API during the ``make check-tcg`` target. +Purely a test plugin for measuring the overhead of the plugins system +itself. Does no instrumentation. + +- tests/plugins/bb.c + +A very basic plugin which will measure execution in course terms as +each basic block is executed. By default the results are shown once +execution finishes:: + + $ qemu-aarch64 -plugin tests/plugin/libbb.so \ + -d plugin ./tests/tcg/aarch64-linux-user/sha1 + SHA1=15dd99a1991e0b3826fede3deffc1feba42278e6 + bb's: 2277338, insns: 158483046 + +Behaviour can be tweaked with the following arguments: + + * inline=true|false + + Use faster inline addition of a single counter. Not per-cpu and not + thread safe. + + * idle=true|false + + Dump the current execution stats whenever the guest vCPU idles + +- tests/plugins/insn.c + +This is a basic instruction level instrumentation which can count the +number of instructions executed on each core/thread:: + + $ qemu-aarch64 -plugin tests/plugin/libinsn.so \ + -d plugin ./tests/tcg/aarch64-linux-user/threadcount + Created 10 threads + Done + cpu 0 insns: 46765 + cpu 1 insns: 3694 + cpu 2 insns: 3694 + cpu 3 insns: 2994 + cpu 4 insns: 1497 + cpu 5 insns: 1497 + cpu 6 insns: 1497 + cpu 7 insns: 1497 + total insns: 63135 + +Behaviour can be tweaked with the following arguments: + + * inline=true|false + + Use faster inline addition of a single counter. Not per-cpu and not + thread safe. + + * sizes=true|false + + Give a summary of the instruction sizes for the execution + + * match= + + Only instrument instructions matching the string prefix. Will show + some basic stats including how many instructions have executed since + the last execution. For example:: + + $ qemu-aarch64 -plugin tests/plugin/libinsn.so,match=bl \ + -d plugin ./tests/tcg/aarch64-linux-user/sha512-vector + ... + 0x40069c, 'bl #0x4002b0', 10 hits, 1093 match hits, Δ+1257 since last match, 98 avg insns/match + 0x4006ac, 'bl #0x403690', 10 hits, 1094 match hits, Δ+47 since last match, 98 avg insns/match + 0x4037fc, 'bl #0x4002b0', 18 hits, 1095 match hits, Δ+22 since last match, 98 avg insns/match + 0x400720, 'bl #0x403690', 10 hits, 1096 match hits, Δ+58 since last match, 98 avg insns/match + 0x4037fc, 'bl #0x4002b0', 19 hits, 1097 match hits, Δ+22 since last match, 98 avg insns/match + 0x400730, 'bl #0x403690', 10 hits, 1098 match hits, Δ+33 since last match, 98 avg insns/match + 0x4037ac, 'bl #0x4002b0', 12 hits, 1099 match hits, Δ+20 since last match, 98 avg insns/match + ... + +For more detailed execution tracing see the ``execlog`` plugin for +other options. + +- tests/plugins/mem.c + +Basic instruction level memory instrumentation:: + + $ qemu-aarch64 -plugin tests/plugin/libmem.so,inline=true \ + -d plugin ./tests/tcg/aarch64-linux-user/sha1 + SHA1=15dd99a1991e0b3826fede3deffc1feba42278e6 + inline mem accesses: 79525013 + +Behaviour can be tweaked with the following arguments: + + * inline=true|false + + Use faster inline addition of a single counter. Not per-cpu and not + thread safe. + + * callback=true|false + + Use callbacks on each memory instrumentation. + + * hwaddr=true|false + + Count IO accesses (only for system emulation) + +- tests/plugins/syscall.c + +A basic syscall tracing plugin. This only works for user-mode. By +default it will give a summary of syscall stats at the end of the +run:: + + $ qemu-aarch64 -plugin tests/plugin/libsyscall \ + -d plugin ./tests/tcg/aarch64-linux-user/threadcount + Created 10 threads + Done + syscall no. calls errors + 226 12 0 + 99 11 11 + 115 11 0 + 222 11 0 + 93 10 0 + 220 10 0 + 233 10 0 + 215 8 0 + 214 4 0 + 134 2 0 + 64 2 0 + 96 1 0 + 94 1 0 + 80 1 0 + 261 1 0 + 78 1 0 + 160 1 0 + 135 1 0 - contrib/plugins/hotblocks.c From patchwork Thu Sep 29 11:42:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610610 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp921048pvb; Thu, 29 Sep 2022 07:18:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5e6aaHY6ZMA+99QsyaVTd9D1YAWN6ZqIXlQqVIj3h70Br0LCOb6AXSLCO79uLyDs7t/8qw X-Received: by 2002:ac8:5f8f:0:b0:35c:bc8a:478 with SMTP id j15-20020ac85f8f000000b0035cbc8a0478mr2603797qta.530.1664461118517; Thu, 29 Sep 2022 07:18:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664461118; cv=none; d=google.com; s=arc-20160816; b=fWl4xdZq8Zqcchq5UPtBFGW7+P4Ijf6GWSoUZVOx7UcNJ5cfDhfXVTssoY/kpFiTVl i2oOxfoMfZnuaHs4aNfFjFj6KcLIMb+wcxQPFtiRy3LQWp9IGODd3YdSNzEWTT/GviTK MGJMVEGwQ4T3bLO4sKJgPjk8D5dM0Rks/Ms5W8t4PdRRbhifk3iLAWpkUNhG0OPsWjZm 9STs00v/0+ywlj1clwu+5SBbMxTusDNePFcoAUQ+PvYzGvIywkiyvseN4So3BNQ334Ob pJmmsXekUXSHxhbYy7Rx6334EJhuapH+M9F8zVZvY+/HaUf0LNFziKjopWyIn3Nre6qA XrEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gUVK+1Ut5x8fWFhpOA8OcQxpZuOHPAnAMa2bUX9DjvY=; b=hhlkIECcPnEgrsm1lqQeehNmWJUkWZcFFjyGo8l5IYJ9acyW1mwpdmvpsuZxFgoa6V 3hf9x/cQZI633C+Oh/dIlTrM5n3ZHOw9UeGAN5EozP3kz9E8ywxqPKgG0GTZ9orFPVNE wxv5VtQUYN7zfRjp4bB6P0JzF2MYyyG4ZI5TcPwRI8wIKO50QvnbAm1F7arOG4Yi8kiv /rz8XsNBuDgM5/cGmdPSUjkUn0WJm5YRlCjW6IVt6OGqQoHh6O70R0JRWxkat7lqNiXx cCxHhDKARsvPSoZLa0fZcKbfxGEm28+dIhI8C/urK+Le5kXc+FMZd9DMUR6JUbPsIlXp xFBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R6emOtKN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e23-20020ac84157000000b0035d5a132232si1368357qtm.426.2022.09.29.07.18.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 07:18:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R6emOtKN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oduN3-0002Js-St for patch@linaro.org; Thu, 29 Sep 2022 10:18:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odsCy-0007R2-56 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:05 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:40931) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odsCs-0004LN-Nr for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:03 -0400 Received: by mail-wr1-x42c.google.com with SMTP id x18so1825861wrm.7 for ; Thu, 29 Sep 2022 04:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=gUVK+1Ut5x8fWFhpOA8OcQxpZuOHPAnAMa2bUX9DjvY=; b=R6emOtKN6dZY7woSV0K/VLvzvo2In0AOybDedU+g6+yG5M/W7DsHNn4ysKuvkEGo5J GuIIbml/io6iASidYJtA5Jfd8ZpR7+7HhbhNJOMt/Q3MJbAfigeDMAF3WROQJgOBa77o FicXLsVi1aQqJld1CQySG30NJt4dOTAbO1jsldN6pULnaN4vbzLBxCCPNDUUp9QXs3eN ctCF9FgA4VX11GuphkYrZWEYNOg7wP4K3mX4OmdGCrgkqq6C7s4zMx+nxJ8KVr3uMjT/ ciKrvjI3OE7UYhti7ghPA4frPwQo8ChqgGx5XU/vNqcSyd0NqGBysI5rqYNyOt0Mq9fF 7qvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=gUVK+1Ut5x8fWFhpOA8OcQxpZuOHPAnAMa2bUX9DjvY=; b=3fCk+7/oTvIzhYWRJQkGxctyBgnIeopBYFcK3OQpDFtzjxs9g+6dmZVhoNqj87VRgq uVwmJEyrQA1fkA5QXjNxF0uxCT5NTz+oJrjlTcWrX5mL5Dm0PcS4h5VkipHrAJA+PwVz 2/0t3uJEFBYMxBSIytOuI1onAEHUcKIDutuDjJL4e6HkkxEpfdWstLuoN5lkFztdyubP BA76b7BJFKFBnnDSCewQLzOrSYX237MIaLquLPBvi5LgYRL6eFnj2oij2hV0UftV9i4p 70sxRmeJodYdqlpV3eGAHBdhB1sRLAUj7P+tKU6tJUcqzzHK2/6vU+JLeDbacrCt31M2 bTxw== X-Gm-Message-State: ACrzQf1xus2dLKngkqFp+YzFuDvH9++03IunR1K+fJ9YxKsV2Fgc3r1B jmWxwVq5dLaiFyEfCsh4M8pevw== X-Received: by 2002:a05:6000:887:b0:21e:24a0:f302 with SMTP id ca7-20020a056000088700b0021e24a0f302mr1913567wrb.466.1664452791719; Thu, 29 Sep 2022 04:59:51 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id y8-20020a5d4ac8000000b0022a403954c3sm6422805wrs.42.2022.09.29.04.59.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:59:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DA5F61FFDA; Thu, 29 Sep 2022 12:42:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Subject: [PATCH v1 41/51] semihosting: update link to spec Date: Thu, 29 Sep 2022 12:42:21 +0100 Message-Id: <20220929114231.583801-42-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The old link has moved but it seems the document is now hosted on Arm's github along with a license update to CC-BY-SA-4.0. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20220928190444.204118-1-alex.bennee@linaro.org> --- semihosting/arm-compat-semi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c index e741674238..bfea9e9337 100644 --- a/semihosting/arm-compat-semi.c +++ b/semihosting/arm-compat-semi.c @@ -24,7 +24,7 @@ * * ARM Semihosting is documented in: * Semihosting for AArch32 and AArch64 Release 2.0 - * https://static.docs.arm.com/100863/0200/semihosting.pdf + * https://github.com/ARM-software/abi-aa/blob/main/semihosting/semihosting.rst * * RISC-V Semihosting is documented in: * RISC-V Semihosting From patchwork Thu Sep 29 11:42:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610620 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp946227pvb; Thu, 29 Sep 2022 08:02:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4oymRZUFnaj6ccuq+TOF08k+dh+2H3lWsDuJttDE52Q2Hxug1RRjlBx9OKgWjqmZoEpH28 X-Received: by 2002:a05:6214:d85:b0:4aa:acc6:750 with SMTP id e5-20020a0562140d8500b004aaacc60750mr2895120qve.58.1664463748879; Thu, 29 Sep 2022 08:02:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664463748; cv=none; d=google.com; s=arc-20160816; b=BmvKNGXoZyDRj0IkVNJRcXsnWOU3FRbwFh/ffDcAUQdetxZuTJi56A7w3idM0M2jmz E/dZSqpbSI+EpK/u6mASS60Xdk544vRlwGCWM18nkX4hBnno4ZCXkhRCUVLsDLM2iP/o NojdCk+31CXFnNyR21W9bEBnkKld4HHwWyMuNcTHX5eQ/EgloNbYDfW3y6zB6IGKw3Ry 5aSLaNWtNHv7T4TTdKfCPcbbsh1kj+r4ROsE1CWFKO7TeYSxzB0wdsAFLIUyXb09anNg zOrLe8mjZ1u1ePOvRiFaCwR92xwzvuth9QbzL+MEIdZIfRSBA5q+mRepEVxr4R/2O63t NMzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=G08OEqnNdRDb3E4Rhzf01vHz7RaXGyc7OvATSXoN3oA=; b=LRbAHj5jSHhQVTgntdp/Y7aldS7gdjb05kAn9jqXrI4I+NFNcmvhce/ENHwQlXPf2L gJ4R/em4C8uiocLXY7RMf8EWHAnhS1boCUJ9aVftl5S9RjMN4FG+BlCOo6du5gpjbdru Op+DQiHGoKGUJ7XdHS5KIykUFRIv3V5tIjP3VkHYqJ7Q5gbErOJT5Xjt9DKZjunLGKcL 9N3Gt/zPYcrFw+swsx2F88aZi4oi1gY5zm7w+3nCknC/OSEl2i4OamvFaIvl05tq5hIe I5xoVAHmLf1bjlbaUvSSYu20c2J1iCP+nDMTPhGAU/W8hNQ2HsKj2vJ0ioYCsZjseRZ8 0zmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BRalhmlR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d25-20020ac800d9000000b0035cc83ba21csi1296671qtg.258.2022.09.29.08.02.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 08:02:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BRalhmlR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odv3U-0008FP-Bn for patch@linaro.org; Thu, 29 Sep 2022 11:02:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odsCx-0007Qc-As for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:03 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:34478) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odsCr-0004Ln-PM for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:01 -0400 Received: by mail-wr1-x42d.google.com with SMTP id x15so1327097wrv.1 for ; Thu, 29 Sep 2022 04:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=G08OEqnNdRDb3E4Rhzf01vHz7RaXGyc7OvATSXoN3oA=; b=BRalhmlRYTYBac17H3GGEILO7jy92rnNYKicJpjtXxYmXC3r7aYxHVpHf3Z+NlbxBa IwHgPO4t5HBqXle4yKIZqb2MzZZPoZd4+CXXb+TD0L20GK5phv8gNHzutVzFOONC0gvW xuq3v7BA3gZfDnYsLzA0X7qJ6SXr+7mNT9uphUXWowz/K+NN7FancxeXAgIyC1OXwzR9 EksygtIJY2Oumel17HFzIM63U8eRDuFLlkVa95Lf3m/DKpS9luckm+jDlwLjKAzAXhiG smV3wQ6HnIbntGhuJbiiahEfBfTIiNRr60b4pf522LoXR5RqaXb9NHd9RJ2FdCeiP4E2 bngw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=G08OEqnNdRDb3E4Rhzf01vHz7RaXGyc7OvATSXoN3oA=; b=CrnfFB+kWPhF3hYdMEuBL/qJiuKlYy9TFo2LEfErrzCj7L/UVisNDVQddO+lTO899H 6JRBNx/BcLtF0FaCb5E1gZFL3elo9eQX8ny5zfitV61GOHB6NhCMZqqwVHgyoc/y3ESD d+epf/VHAyo5+9C3j0oYenug7gJL3gjk7V/Q/MLgnkMK2uncKJd3DKQ7r9ZHDOsGToLI q9bCAxOzFQ0Ho0Jcso3D226u3FRrMAtMWeV6xubQPkOhohBUKUQAZagT4YATTef5Jbeo DEWRTXFLZxN5k9S8kRQLiIOs4du/nYZg8sAaaL+elgtSRHX7Ap/VlhjQ0BklstNpT9Yf itiA== X-Gm-Message-State: ACrzQf0i5tJvzH1U5do/zGRz98gryu76FVrq4w6rSr57NuWW31KjT1so PzX4W8BEiVKXuB/A7KLOrp5s4A== X-Received: by 2002:a5d:5d89:0:b0:226:e5ca:4bc2 with SMTP id ci9-20020a5d5d89000000b00226e5ca4bc2mr1992231wrb.310.1664452792711; Thu, 29 Sep 2022 04:59:52 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id i7-20020a5d5227000000b0022abcc1e3cesm6937085wra.116.2022.09.29.04.59.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:59:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0FAD71FFDB; Thu, 29 Sep 2022 12:42:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Subject: [PATCH v1 42/51] gdbstub: move into its own sub directory Date: Thu, 29 Sep 2022 12:42:22 +0100 Message-Id: <20220929114231.583801-43-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is in preparation of future refactoring as well as cleaning up the source tree. Aside from the minor tweaks to meson and trace.h this is pure code motion. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20220927141504.3886314-12-alex.bennee@linaro.org> --- meson.build | 4 +++- gdbstub/trace.h | 1 + gdbstub.c => gdbstub/gdbstub.c | 2 +- MAINTAINERS | 2 +- gdbstub/meson.build | 1 + gdbstub/trace-events | 29 +++++++++++++++++++++++++++++ trace-events | 28 ---------------------------- 7 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 gdbstub/trace.h rename gdbstub.c => gdbstub/gdbstub.c (99%) create mode 100644 gdbstub/meson.build create mode 100644 gdbstub/trace-events diff --git a/meson.build b/meson.build index ac5ef05c21..73646558db 100644 --- a/meson.build +++ b/meson.build @@ -2837,6 +2837,7 @@ trace_events_subdirs = [ 'qom', 'monitor', 'util', + 'gdbstub', ] if have_linux_user trace_events_subdirs += [ 'linux-user' ] @@ -2960,6 +2961,7 @@ subdir('authz') subdir('crypto') subdir('ui') subdir('hw') +subdir('gdbstub') if enable_modules @@ -3037,7 +3039,7 @@ common_ss.add(files('cpus-common.c')) subdir('softmmu') common_ss.add(capstone) -specific_ss.add(files('cpu.c', 'disas.c', 'gdbstub.c'), capstone) +specific_ss.add(files('cpu.c', 'disas.c'), capstone) # Work around a gcc bug/misfeature wherein constant propagation looks # through an alias: diff --git a/gdbstub/trace.h b/gdbstub/trace.h new file mode 100644 index 0000000000..dee87b1238 --- /dev/null +++ b/gdbstub/trace.h @@ -0,0 +1 @@ +#include "trace/trace-gdbstub.h" diff --git a/gdbstub.c b/gdbstub/gdbstub.c similarity index 99% rename from gdbstub.c rename to gdbstub/gdbstub.c index cf869b10e3..7d8fe475b3 100644 --- a/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -29,7 +29,7 @@ #include "qemu/ctype.h" #include "qemu/cutils.h" #include "qemu/module.h" -#include "trace/trace-root.h" +#include "trace.h" #include "exec/gdbstub.h" #ifdef CONFIG_USER_ONLY #include "qemu.h" diff --git a/MAINTAINERS b/MAINTAINERS index 789172b2a8..e1530b51a2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2677,7 +2677,7 @@ GDB stub M: Alex Bennée R: Philippe Mathieu-Daudé S: Maintained -F: gdbstub* +F: gdbstub/* F: include/exec/gdbstub.h F: gdb-xml/ F: tests/tcg/multiarch/gdbstub/ diff --git a/gdbstub/meson.build b/gdbstub/meson.build new file mode 100644 index 0000000000..6d4ae2d03c --- /dev/null +++ b/gdbstub/meson.build @@ -0,0 +1 @@ +specific_ss.add(files('gdbstub.c')) diff --git a/gdbstub/trace-events b/gdbstub/trace-events new file mode 100644 index 0000000000..03f0c303bf --- /dev/null +++ b/gdbstub/trace-events @@ -0,0 +1,29 @@ +# See docs/devel/tracing.rst for syntax documentation. + +# gdbstub.c +gdbstub_op_start(const char *device) "Starting gdbstub using device %s" +gdbstub_op_exiting(uint8_t code) "notifying exit with code=0x%02x" +gdbstub_op_continue(void) "Continuing all CPUs" +gdbstub_op_continue_cpu(int cpu_index) "Continuing CPU %d" +gdbstub_op_stepping(int cpu_index) "Stepping CPU %d" +gdbstub_op_extra_info(const char *info) "Thread extra info: %s" +gdbstub_hit_watchpoint(const char *type, int cpu_gdb_index, uint64_t vaddr) "Watchpoint hit, type=\"%s\" cpu=%d, vaddr=0x%" PRIx64 "" +gdbstub_hit_internal_error(void) "RUN_STATE_INTERNAL_ERROR" +gdbstub_hit_break(void) "RUN_STATE_DEBUG" +gdbstub_hit_paused(void) "RUN_STATE_PAUSED" +gdbstub_hit_shutdown(void) "RUN_STATE_SHUTDOWN" +gdbstub_hit_io_error(void) "RUN_STATE_IO_ERROR" +gdbstub_hit_watchdog(void) "RUN_STATE_WATCHDOG" +gdbstub_hit_unknown(int state) "Unknown run state=0x%x" +gdbstub_io_reply(const char *message) "Sent: %s" +gdbstub_io_binaryreply(size_t ofs, const char *line) "0x%04zx: %s" +gdbstub_io_command(const char *command) "Received: %s" +gdbstub_io_got_ack(void) "Got ACK" +gdbstub_io_got_unexpected(uint8_t ch) "Got 0x%02x when expecting ACK/NACK" +gdbstub_err_got_nack(void) "Got NACK, retransmitting" +gdbstub_err_garbage(uint8_t ch) "received garbage between packets: 0x%02x" +gdbstub_err_overrun(void) "command buffer overrun, dropping command" +gdbstub_err_invalid_repeat(uint8_t ch) "got invalid RLE count: 0x%02x" +gdbstub_err_invalid_rle(void) "got invalid RLE sequence" +gdbstub_err_checksum_invalid(uint8_t ch) "got invalid command checksum digit: 0x%02x" +gdbstub_err_checksum_incorrect(uint8_t expected, uint8_t got) "got command packet with incorrect checksum, expected=0x%02x, received=0x%02x" diff --git a/trace-events b/trace-events index bc71006675..035f3d570d 100644 --- a/trace-events +++ b/trace-events @@ -46,34 +46,6 @@ ram_block_discard_range(const char *rbname, void *hva, size_t length, bool need_ memory_notdirty_write_access(uint64_t vaddr, uint64_t ram_addr, unsigned size) "0x%" PRIx64 " ram_addr 0x%" PRIx64 " size %u" memory_notdirty_set_dirty(uint64_t vaddr) "0x%" PRIx64 -# gdbstub.c -gdbstub_op_start(const char *device) "Starting gdbstub using device %s" -gdbstub_op_exiting(uint8_t code) "notifying exit with code=0x%02x" -gdbstub_op_continue(void) "Continuing all CPUs" -gdbstub_op_continue_cpu(int cpu_index) "Continuing CPU %d" -gdbstub_op_stepping(int cpu_index) "Stepping CPU %d" -gdbstub_op_extra_info(const char *info) "Thread extra info: %s" -gdbstub_hit_watchpoint(const char *type, int cpu_gdb_index, uint64_t vaddr) "Watchpoint hit, type=\"%s\" cpu=%d, vaddr=0x%" PRIx64 "" -gdbstub_hit_internal_error(void) "RUN_STATE_INTERNAL_ERROR" -gdbstub_hit_break(void) "RUN_STATE_DEBUG" -gdbstub_hit_paused(void) "RUN_STATE_PAUSED" -gdbstub_hit_shutdown(void) "RUN_STATE_SHUTDOWN" -gdbstub_hit_io_error(void) "RUN_STATE_IO_ERROR" -gdbstub_hit_watchdog(void) "RUN_STATE_WATCHDOG" -gdbstub_hit_unknown(int state) "Unknown run state=0x%x" -gdbstub_io_reply(const char *message) "Sent: %s" -gdbstub_io_binaryreply(size_t ofs, const char *line) "0x%04zx: %s" -gdbstub_io_command(const char *command) "Received: %s" -gdbstub_io_got_ack(void) "Got ACK" -gdbstub_io_got_unexpected(uint8_t ch) "Got 0x%02x when expecting ACK/NACK" -gdbstub_err_got_nack(void) "Got NACK, retransmitting" -gdbstub_err_garbage(uint8_t ch) "received garbage between packets: 0x%02x" -gdbstub_err_overrun(void) "command buffer overrun, dropping command" -gdbstub_err_invalid_repeat(uint8_t ch) "got invalid RLE count: 0x%02x" -gdbstub_err_invalid_rle(void) "got invalid RLE sequence" -gdbstub_err_checksum_invalid(uint8_t ch) "got invalid command checksum digit: 0x%02x" -gdbstub_err_checksum_incorrect(uint8_t expected, uint8_t got) "got command packet with incorrect checksum, expected=0x%02x, received=0x%02x" - # job.c job_state_transition(void *job, int ret, const char *legal, const char *s0, const char *s1) "job %p (ret: %d) attempting %s transition (%s-->%s)" job_apply_verb(void *job, const char *state, const char *verb, const char *legal) "job %p in state %s; applying verb %s (%s)" From patchwork Thu Sep 29 11:42:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610611 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp921088pvb; Thu, 29 Sep 2022 07:18:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM607ZXV8tc/eQrNwz3EZDYten3eSWr9uLVGld44jK6xQ7aRJBYbMDoSFdhfZL/eDMUJ7q6n X-Received: by 2002:ac8:7f54:0:b0:35d:159d:f88e with SMTP id g20-20020ac87f54000000b0035d159df88emr2556949qtk.415.1664461122601; Thu, 29 Sep 2022 07:18:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664461122; cv=none; d=google.com; s=arc-20160816; b=sNx4pzDy0LLykQUIY2B9QQOOoRV/V7+MoAgasDkdpSwTDehPcjwc0aw5wAhzB8fPAs vg7pO33zITKDgP6wsUfSMc1QbwrltDXFjoKeDK/G/1mLeZLhAsRu50UpqyTBMG2jUOdL PaFEOtPt5DwupIiQQzpZXTrrrs7uD9CKSahbvdNXyQAfzzlyX2xVNceHBvfe1lsZTog6 TXFt72iO5/ynyrWfAEKlf1Jhh887H1bwHEtf/Qfo9Mn2MkiewP/kLTK53ZXNNVcRKrDP mywVefk01q4kzinrWEp2XJBz6NEaWLoWtJNfILeXG04cHm0vypRPzIA4H8CgZzkhiDhJ 0ndg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2uVWGDizSikUyJ3V+rUokvNA+pyyWFcnEoJpXpnX15E=; b=EUM3KtO3INnDCqZyGnZRbcLId4g74M70JZ+xX2qf2UmuLuTR9yxPThZhnaFVDwhm3p 9CbN2YOQM5bh34JxOHBTcsFs5rMkcWgIsDYKywPDu/Kr2Q0RkJER/JFxiuwg0hwZhg/o iLf1nLBRtxHTXVydX8rUqXl+Ht31Qizy0N4CR0TtFsJmxyiMS+HIshtRuiTlm8vXnxkW QbyN4qKP/H2rRX7GjiQBDr8nDK08TWMIjdyIMsIcy42LgBTYTy44zg0WSk6huox3e778 z+dk6BzvYLBn42xqtYQxLb8H3/xaiVHVqz1r0HElx4s1uiBUEeCOL5LnH/9i6W1tCNyc BS1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rBdRTxMo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h15-20020a05622a170f00b0035bb28f0d8esi1464922qtk.650.2022.09.29.07.18.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 07:18:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rBdRTxMo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oduN8-0002Nq-3v for patch@linaro.org; Thu, 29 Sep 2022 10:18:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3J-0000NX-53 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:06 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:44693) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods3D-0002OF-Tp for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:03 -0400 Received: by mail-wr1-x429.google.com with SMTP id c11so1760917wrp.11 for ; Thu, 29 Sep 2022 04:49:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=2uVWGDizSikUyJ3V+rUokvNA+pyyWFcnEoJpXpnX15E=; b=rBdRTxMoWrf+jXplRsG7YNS0Ig1ZlM3mcZHPC4s4QO2PvSFGbaee2xRbeE+SoSVecC HfBpuqkrOoiAo0IvusRkyZSHmdHRzKaGGLD847f07u9InySJ1DERtajyCJqULUnZ5cHh 6SHujvyGlwU1pF2Mjc4+7Kdej+xlXQToFSmylSjRgPgZ0o8XOrXV+TCdcr/jmr05Omek yGqX9uM7C2YNGtYtTbpywJuzzLtfhK7mVH/+ELTQKeOE7pSjxBF/8WSgFUjkwYZQCY1u VcJM1KJcK2phJ4lLwipEXozw6vMt42A2vaxptiQcHklRgbraF/0jQqtYUDq0C9l7YXGO UFDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=2uVWGDizSikUyJ3V+rUokvNA+pyyWFcnEoJpXpnX15E=; b=iXFW0Yjtkiq1/bRpuYFQ2V2PhNz485cGGCLMXr5n0BVCaU25iA35uVCtMQ/VxT1Phv XL/AKKODgsum+Ab86/vqJ6kXf9bR3P2fuuqDLw5uQDs1jfMRx/qeoGFogpv2XbkubeZ+ SjnNQVLBpwy7sW0BZ5flRdkc7nmShw/Hf2GOuKP555rq0z7oLPEBoOkacNwqNEfWZ70u zhohNoTq5G6D/zrhskNCR3w0ksG3zIC84blLTNlTPzs/bAOgBK64wdB4JznNxBgew172 kr6Xywy5wTItJk2nm0zGopzUBKJt3mZXe2PiFxokDzXsmkFvbA4azJOKDB3UWQtjtYuQ sikQ== X-Gm-Message-State: ACrzQf2BZd0ue2Keadf2yisLBuOxe69f0CG7KJOVfJOJF94+mzMD1tND WoEQnnivULjDlMZTyTE0+Td5gg== X-Received: by 2002:a05:6000:1806:b0:22c:ca13:20c1 with SMTP id m6-20020a056000180600b0022cca1320c1mr1857170wrh.460.1664452196736; Thu, 29 Sep 2022 04:49:56 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id r7-20020adfda47000000b0021e51c039c5sm6429437wrl.80.2022.09.29.04.49.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 394EC1FFDC; Thu, 29 Sep 2022 12:42:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Mads Ynddal , kvm@vger.kernel.org (open list:Overall KVM CPUs) Subject: [PATCH v1 43/51] gdbstub: move sstep flags probing into AccelClass Date: Thu, 29 Sep 2022 12:42:23 +0100 Message-Id: <20220929114231.583801-44-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The support of single-stepping is very much dependent on support from the accelerator we are using. To avoid special casing in gdbstub move the probing out to an AccelClass function so future accelerators can put their code there. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Cc: Mads Ynddal Message-Id: <20220927141504.3886314-13-alex.bennee@linaro.org> --- include/qemu/accel.h | 12 ++++++++++++ include/sysemu/kvm.h | 8 -------- accel/accel-common.c | 10 ++++++++++ accel/kvm/kvm-all.c | 14 +++++++++++++- accel/tcg/tcg-all.c | 17 +++++++++++++++++ gdbstub/gdbstub.c | 22 ++++------------------ 6 files changed, 56 insertions(+), 27 deletions(-) diff --git a/include/qemu/accel.h b/include/qemu/accel.h index be56da1b99..ce4747634a 100644 --- a/include/qemu/accel.h +++ b/include/qemu/accel.h @@ -43,6 +43,10 @@ typedef struct AccelClass { bool (*has_memory)(MachineState *ms, AddressSpace *as, hwaddr start_addr, hwaddr size); #endif + + /* gdbstub related hooks */ + int (*gdbstub_supported_sstep_flags)(void); + bool *allowed; /* * Array of global properties that would be applied when specific @@ -92,4 +96,12 @@ void accel_cpu_instance_init(CPUState *cpu); */ bool accel_cpu_realizefn(CPUState *cpu, Error **errp); +/** + * accel_supported_gdbstub_sstep_flags: + * + * Returns the supported single step modes for the configured + * accelerator. + */ +int accel_supported_gdbstub_sstep_flags(void); + #endif /* QEMU_ACCEL_H */ diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index efd6dee818..a20ad51aad 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -47,7 +47,6 @@ extern bool kvm_direct_msi_allowed; extern bool kvm_ioeventfd_any_length_allowed; extern bool kvm_msi_use_devid; extern bool kvm_has_guest_debug; -extern int kvm_sstep_flags; #define kvm_enabled() (kvm_allowed) /** @@ -174,12 +173,6 @@ extern int kvm_sstep_flags; */ #define kvm_supports_guest_debug() (kvm_has_guest_debug) -/* - * kvm_supported_sstep_flags - * Returns: SSTEP_* flags that KVM supports for guest debug - */ -#define kvm_get_supported_sstep_flags() (kvm_sstep_flags) - #else #define kvm_enabled() (0) @@ -198,7 +191,6 @@ extern int kvm_sstep_flags; #define kvm_ioeventfd_any_length_enabled() (false) #define kvm_msi_devid_required() (false) #define kvm_supports_guest_debug() (false) -#define kvm_get_supported_sstep_flags() (0) #endif /* CONFIG_KVM_IS_POSSIBLE */ diff --git a/accel/accel-common.c b/accel/accel-common.c index 50035bda55..df72cc989a 100644 --- a/accel/accel-common.c +++ b/accel/accel-common.c @@ -129,6 +129,16 @@ bool accel_cpu_realizefn(CPUState *cpu, Error **errp) return true; } +int accel_supported_gdbstub_sstep_flags(void) +{ + AccelState *accel = current_accel(); + AccelClass *acc = ACCEL_GET_CLASS(accel); + if (acc->gdbstub_supported_sstep_flags) { + return acc->gdbstub_supported_sstep_flags(); + } + return 0; +} + static const TypeInfo accel_cpu_type = { .name = TYPE_ACCEL_CPU, .parent = TYPE_OBJECT, diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 5acab1767f..c55938453a 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -175,7 +175,7 @@ bool kvm_direct_msi_allowed; bool kvm_ioeventfd_any_length_allowed; bool kvm_msi_use_devid; bool kvm_has_guest_debug; -int kvm_sstep_flags; +static int kvm_sstep_flags; static bool kvm_immediate_exit; static hwaddr kvm_max_slot_size = ~0; @@ -3712,6 +3712,17 @@ static void kvm_accel_instance_init(Object *obj) s->kvm_dirty_ring_size = 0; } +/** + * kvm_gdbstub_sstep_flags(): + * + * Returns: SSTEP_* flags that KVM supports for guest debug. The + * support is probed during kvm_init() + */ +static int kvm_gdbstub_sstep_flags(void) +{ + return kvm_sstep_flags; +} + static void kvm_accel_class_init(ObjectClass *oc, void *data) { AccelClass *ac = ACCEL_CLASS(oc); @@ -3719,6 +3730,7 @@ static void kvm_accel_class_init(ObjectClass *oc, void *data) ac->init_machine = kvm_init; ac->has_memory = kvm_accel_has_memory; ac->allowed = &kvm_allowed; + ac->gdbstub_supported_sstep_flags = kvm_gdbstub_sstep_flags; object_class_property_add(oc, "kernel-irqchip", "on|off|split", NULL, kvm_set_kernel_irqchip, diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index 47952eecd7..30b503fb22 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "sysemu/tcg.h" +#include "sysemu/replay.h" #include "sysemu/cpu-timers.h" #include "tcg/tcg.h" #include "qapi/error.h" @@ -207,12 +208,28 @@ static void tcg_set_splitwx(Object *obj, bool value, Error **errp) s->splitwx_enabled = value; } +static int tcg_gdbstub_supported_sstep_flags(void) +{ + /* + * In replay mode all events will come from the log and can't be + * suppressed otherwise we would break determinism. However as those + * events are tied to the number of executed instructions we won't see + * them occurring every time we single step. + */ + if (replay_mode != REPLAY_MODE_NONE) { + return SSTEP_ENABLE; + } else { + return SSTEP_ENABLE | SSTEP_NOIRQ | SSTEP_NOTIMER; + } +} + static void tcg_accel_class_init(ObjectClass *oc, void *data) { AccelClass *ac = ACCEL_CLASS(oc); ac->name = "tcg"; ac->init_machine = tcg_init_machine; ac->allowed = &tcg_allowed; + ac->gdbstub_supported_sstep_flags = tcg_gdbstub_supported_sstep_flags; object_class_property_add_str(oc, "thread", tcg_get_thread, diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 7d8fe475b3..a0755e6505 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -383,27 +383,13 @@ static void init_gdbserver_state(void) gdbserver_state.last_packet = g_byte_array_sized_new(MAX_PACKET_LENGTH + 4); /* - * In replay mode all events will come from the log and can't be - * suppressed otherwise we would break determinism. However as those - * events are tied to the number of executed instructions we won't see - * them occurring every time we single step. - */ - if (replay_mode != REPLAY_MODE_NONE) { - gdbserver_state.supported_sstep_flags = SSTEP_ENABLE; - } else if (kvm_enabled()) { - gdbserver_state.supported_sstep_flags = kvm_get_supported_sstep_flags(); - } else { - gdbserver_state.supported_sstep_flags = - SSTEP_ENABLE | SSTEP_NOIRQ | SSTEP_NOTIMER; - } - - /* - * By default use no IRQs and no timers while single stepping so as to - * make single stepping like an ICE HW step. + * What single-step modes are supported is accelerator dependent. + * By default try to use no IRQs and no timers while single + * stepping so as to make single stepping like a typical ICE HW step. */ + gdbserver_state.supported_sstep_flags = accel_supported_gdbstub_sstep_flags(); gdbserver_state.sstep_flags = SSTEP_ENABLE | SSTEP_NOIRQ | SSTEP_NOTIMER; gdbserver_state.sstep_flags &= gdbserver_state.supported_sstep_flags; - } #ifndef CONFIG_USER_ONLY From patchwork Thu Sep 29 11:42:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610597 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp899782pvb; Thu, 29 Sep 2022 06:43:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6soYCQeadNHzccHF/VAQbAIdj2oF6E/iJ7QFAyy6htlbQ999MySg5skbuvQKd1B7TjaAZO X-Received: by 2002:ac8:7fc1:0:b0:35c:be1b:2831 with SMTP id b1-20020ac87fc1000000b0035cbe1b2831mr2385167qtk.353.1664459030346; Thu, 29 Sep 2022 06:43:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664459030; cv=none; d=google.com; s=arc-20160816; b=RciH3UjG1zjPdNKFjEE8AJOw/v97uSQiayqC4Zrpeu5rXtvG2RgbUpd2g4mH6WKdGW CDcofdcnxmgawbmoyTmArUG+zj62SY4yJ3bSp0+vUgEcfeladZ2VFBRW4M/AjH6hHhOU PwG/5AN5AdsNgVaTIXe4rdj3hlxVjPhptYMafc5kAq5ada3RyM93hv7jyeV0zlLkdYkY 7rqK4wQFi16HtEUhkwP6xQ2uRqQIZNrVw8hKteGgh0w8oZuPmd/iRK1sMk7wPXcOhUaq Uo2kooqDVza/READEflNh36zN++Cg0G2TdlCpNqgNzDFwU92sxQSY3rYX5hQLj0goNOY rzvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tOBIIqCWps5E2UlF6sU9JcaMK366qSH1LB/0u2X36ic=; b=PkF2zzh0qz9ROruRp8C8VYKyxQynfr7vBPaimztt6dZ3fXtzrJVilcW5ZAGUSlqq5n EwZYUqg1NVyV4Plkumo0gvh9j3L98lounnAn1jDz6FD9psPDEF+u+/gFZONHkupAf9zo rs4JL2H3xf1boLqOA8uK9BVP/13/SdHS3ylmyeMQuLdr8GIzlnl5vFn/VfTdi4YHR5TL FfBcIyw0AXERyTCH/Upgh7PN9kgLPrCza3xZWUKRyojsd3LL3aDryareEOs9+WYjstM4 +eRwJxGp/t4UXk789x+HjPZmG7XSyPEI5g+z02K2PNlVdwiktU5IuFYwA+dyXOqlf7HO tFCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q7NHJNky; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q14-20020a37f70e000000b006ce800c8bcasi1045480qkj.670.2022.09.29.06.43.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:43:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q7NHJNky; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odtpN-0006yZ-QZ for patch@linaro.org; Thu, 29 Sep 2022 09:43:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3T-0000jI-NL for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:19 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:53815) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods3J-0002aM-W5 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:15 -0400 Received: by mail-wm1-x331.google.com with SMTP id e18so782298wmq.3 for ; Thu, 29 Sep 2022 04:50:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=tOBIIqCWps5E2UlF6sU9JcaMK366qSH1LB/0u2X36ic=; b=q7NHJNkyoZp3zIESJcGtCk9f8rYUEWsbiy+Mumu7AxsBSIA4R2XmIS4iQKYYaxI3N4 YCnGmKKTZcGvAr09uG2wCXyYyqSi3jT7DFk9H9mM0z261mkmILIyVDOKBbvqoou3cF/P dfo6izoZEH4AIOXDMJMBEn48iwxNihsZA1vladYWoLV38PmEZHBGnyS1PriZQbPW9buT JsYjYedBBZV79dI9szx+602WgYwA5cdN0XA+n7o4x7o7kER6gwT3asMgU8qNpNzJbW6H yJZ75s8VzjZTq5ceeP2loa/n8n7z3xiCWFdHk+OJHLdRHY7lhH4BTEHWITJt5TN1uxmL jUEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=tOBIIqCWps5E2UlF6sU9JcaMK366qSH1LB/0u2X36ic=; b=oGDVwYZanetn1WavD01GhQSWbbspp4bLuSOvQCiVG2WXMUt/Q0JjiNdmZdnEBuhPU3 mOsn1PT/LTEQS914C1rMYuPjyt4ooOOUH4Cad6IOClVpsOIz96h0dSf+3jfOoioYHRMw gCmlXtV2g2E2u0whE9q4AveAhJeNwC0xEMgSFVIihyjlV8K0ucQd1f7AZE75sOqo4wnh KoPfKpVrR7t23sndvGeuorVFfl1hcmnKIHzNWXMyTLHWhx7Kt+SG63X+GNlCLxfbRVoj 6HcbCUjuS81g8g6DyDwmIPnXVoI59s21diUHo5SYkgmaj269XLHaq//0oqQL1F6eOAgs tGfA== X-Gm-Message-State: ACrzQf09tPe6XOtfqaavFN0eS5/9h0FpgXAW261noD8JYQZQJz0xs0RJ VjJBWnCROtW2uPORpm301S68zw== X-Received: by 2002:a05:600c:424c:b0:3b4:6359:b301 with SMTP id r12-20020a05600c424c00b003b46359b301mr10149786wmm.125.1664452203682; Thu, 29 Sep 2022 04:50:03 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q17-20020adff511000000b002253fd19a6asm8264132wro.18.2022.09.29.04.49.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 76EFE1FFDD; Thu, 29 Sep 2022 12:42:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Mads Ynddal , kvm@vger.kernel.org (open list:Overall KVM CPUs) Subject: [PATCH v1 44/51] gdbstub: move breakpoint logic to accel ops Date: Thu, 29 Sep 2022 12:42:24 +0100 Message-Id: <20220929114231.583801-45-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" As HW virtualization requires specific support to handle breakpoints lets push out special casing out of the core gdbstub code and into AccelOpsClass. This will make it easier to add other accelerator support and reduces some of the stub shenanigans. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Cc: Mads Ynddal Message-Id: <20220927141504.3886314-14-alex.bennee@linaro.org> --- accel/kvm/kvm-cpus.h | 3 + gdbstub/internals.h | 16 +++++ include/sysemu/accel-ops.h | 6 ++ include/sysemu/cpus.h | 3 + include/sysemu/kvm.h | 5 -- accel/kvm/kvm-accel-ops.c | 8 +++ accel/kvm/kvm-all.c | 24 +------ accel/stubs/kvm-stub.c | 16 ----- accel/tcg/tcg-accel-ops.c | 92 +++++++++++++++++++++++++++ gdbstub/gdbstub.c | 127 +++---------------------------------- gdbstub/softmmu.c | 42 ++++++++++++ gdbstub/user.c | 62 ++++++++++++++++++ softmmu/cpus.c | 7 ++ gdbstub/meson.build | 8 +++ 14 files changed, 259 insertions(+), 160 deletions(-) create mode 100644 gdbstub/internals.h create mode 100644 gdbstub/softmmu.c create mode 100644 gdbstub/user.c diff --git a/accel/kvm/kvm-cpus.h b/accel/kvm/kvm-cpus.h index bf0bd1bee4..33e435d62b 100644 --- a/accel/kvm/kvm-cpus.h +++ b/accel/kvm/kvm-cpus.h @@ -18,5 +18,8 @@ void kvm_destroy_vcpu(CPUState *cpu); void kvm_cpu_synchronize_post_reset(CPUState *cpu); void kvm_cpu_synchronize_post_init(CPUState *cpu); void kvm_cpu_synchronize_pre_loadvm(CPUState *cpu); +int kvm_insert_breakpoint(CPUState *cpu, int type, hwaddr addr, hwaddr len); +int kvm_remove_breakpoint(CPUState *cpu, int type, hwaddr addr, hwaddr len); +void kvm_remove_all_breakpoints(CPUState *cpu); #endif /* KVM_CPUS_H */ diff --git a/gdbstub/internals.h b/gdbstub/internals.h new file mode 100644 index 0000000000..41e2e72dbf --- /dev/null +++ b/gdbstub/internals.h @@ -0,0 +1,16 @@ +/* + * gdbstub internals + * + * Copyright (c) 2022 Linaro Ltd + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef _INTERNALS_H_ +#define _INTERNALS_H_ + +int gdb_breakpoint_insert(CPUState *cs, int type, hwaddr addr, hwaddr len); +int gdb_breakpoint_remove(CPUState *cs, int type, hwaddr addr, hwaddr len); +void gdb_breakpoint_remove_all(CPUState *cs); + +#endif /* _INTERNALS_H_ */ diff --git a/include/sysemu/accel-ops.h b/include/sysemu/accel-ops.h index a0572ea87a..86794ac273 100644 --- a/include/sysemu/accel-ops.h +++ b/include/sysemu/accel-ops.h @@ -10,6 +10,7 @@ #ifndef ACCEL_OPS_H #define ACCEL_OPS_H +#include "exec/hwaddr.h" #include "qom/object.h" #define ACCEL_OPS_SUFFIX "-ops" @@ -44,6 +45,11 @@ struct AccelOpsClass { int64_t (*get_virtual_clock)(void); int64_t (*get_elapsed_ticks)(void); + + /* gdbstub hooks */ + int (*insert_breakpoint)(CPUState *cpu, int type, hwaddr addr, hwaddr len); + int (*remove_breakpoint)(CPUState *cpu, int type, hwaddr addr, hwaddr len); + void (*remove_all_breakpoints)(CPUState *cpu); }; #endif /* ACCEL_OPS_H */ diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h index b5c87d48b3..1bace3379b 100644 --- a/include/sysemu/cpus.h +++ b/include/sysemu/cpus.h @@ -7,6 +7,9 @@ /* register accel-specific operations */ void cpus_register_accel(const AccelOpsClass *i); +/* return registers ops */ +const AccelOpsClass *cpus_get_accel(void); + /* accel/dummy-cpus.c */ /* Create a dummy vcpu for AccelOpsClass->create_vcpu_thread */ diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index a20ad51aad..21d3f1d01e 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -254,11 +254,6 @@ int kvm_on_sigbus(int code, void *addr); void kvm_flush_coalesced_mmio_buffer(void); -int kvm_insert_breakpoint(CPUState *cpu, target_ulong addr, - target_ulong len, int type); -int kvm_remove_breakpoint(CPUState *cpu, target_ulong addr, - target_ulong len, int type); -void kvm_remove_all_breakpoints(CPUState *cpu); int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap); /* internal API */ diff --git a/accel/kvm/kvm-accel-ops.c b/accel/kvm/kvm-accel-ops.c index c4244a23c6..5c0e37514c 100644 --- a/accel/kvm/kvm-accel-ops.c +++ b/accel/kvm/kvm-accel-ops.c @@ -16,12 +16,14 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" +#include "sysemu/kvm.h" #include "sysemu/kvm_int.h" #include "sysemu/runstate.h" #include "sysemu/cpus.h" #include "qemu/guest-random.h" #include "qapi/error.h" +#include #include "kvm-cpus.h" static void *kvm_vcpu_thread_fn(void *arg) @@ -95,6 +97,12 @@ static void kvm_accel_ops_class_init(ObjectClass *oc, void *data) ops->synchronize_post_init = kvm_cpu_synchronize_post_init; ops->synchronize_state = kvm_cpu_synchronize_state; ops->synchronize_pre_loadvm = kvm_cpu_synchronize_pre_loadvm; + +#ifdef KVM_CAP_SET_GUEST_DEBUG + ops->insert_breakpoint = kvm_insert_breakpoint; + ops->remove_breakpoint = kvm_remove_breakpoint; + ops->remove_all_breakpoints = kvm_remove_all_breakpoints; +#endif } static const TypeInfo kvm_accel_ops_type = { diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index c55938453a..b8c734fe3a 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -3287,8 +3287,7 @@ int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap) return data.err; } -int kvm_insert_breakpoint(CPUState *cpu, target_ulong addr, - target_ulong len, int type) +int kvm_insert_breakpoint(CPUState *cpu, int type, hwaddr addr, hwaddr len) { struct kvm_sw_breakpoint *bp; int err; @@ -3326,8 +3325,7 @@ int kvm_insert_breakpoint(CPUState *cpu, target_ulong addr, return 0; } -int kvm_remove_breakpoint(CPUState *cpu, target_ulong addr, - target_ulong len, int type) +int kvm_remove_breakpoint(CPUState *cpu, int type, hwaddr addr, hwaddr len) { struct kvm_sw_breakpoint *bp; int err; @@ -3393,26 +3391,10 @@ void kvm_remove_all_breakpoints(CPUState *cpu) #else /* !KVM_CAP_SET_GUEST_DEBUG */ -int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap) +static int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap) { return -EINVAL; } - -int kvm_insert_breakpoint(CPUState *cpu, target_ulong addr, - target_ulong len, int type) -{ - return -EINVAL; -} - -int kvm_remove_breakpoint(CPUState *cpu, target_ulong addr, - target_ulong len, int type) -{ - return -EINVAL; -} - -void kvm_remove_all_breakpoints(CPUState *cpu) -{ -} #endif /* !KVM_CAP_SET_GUEST_DEBUG */ static int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset) diff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c index 2ac5f9c036..2d79333143 100644 --- a/accel/stubs/kvm-stub.c +++ b/accel/stubs/kvm-stub.c @@ -51,22 +51,6 @@ int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap) return -ENOSYS; } -int kvm_insert_breakpoint(CPUState *cpu, target_ulong addr, - target_ulong len, int type) -{ - return -EINVAL; -} - -int kvm_remove_breakpoint(CPUState *cpu, target_ulong addr, - target_ulong len, int type) -{ - return -EINVAL; -} - -void kvm_remove_all_breakpoints(CPUState *cpu) -{ -} - int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr) { return 1; diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index 786d90c08f..965c2ad581 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -32,6 +32,8 @@ #include "qemu/main-loop.h" #include "qemu/guest-random.h" #include "exec/exec-all.h" +#include "exec/hwaddr.h" +#include "exec/gdbstub.h" #include "tcg-accel-ops.h" #include "tcg-accel-ops-mttcg.h" @@ -91,6 +93,92 @@ void tcg_handle_interrupt(CPUState *cpu, int mask) } } +/* Translate GDB watchpoint type to a flags value for cpu_watchpoint_* */ +static inline int xlat_gdb_type(CPUState *cpu, int gdbtype) +{ + static const int xlat[] = { + [GDB_WATCHPOINT_WRITE] = BP_GDB | BP_MEM_WRITE, + [GDB_WATCHPOINT_READ] = BP_GDB | BP_MEM_READ, + [GDB_WATCHPOINT_ACCESS] = BP_GDB | BP_MEM_ACCESS, + }; + + CPUClass *cc = CPU_GET_CLASS(cpu); + int cputype = xlat[gdbtype]; + + if (cc->gdb_stop_before_watchpoint) { + cputype |= BP_STOP_BEFORE_ACCESS; + } + return cputype; +} + +static int tcg_insert_breakpoint(CPUState *cs, int type, hwaddr addr, hwaddr len) +{ + CPUState *cpu; + int err = 0; + + switch (type) { + case GDB_BREAKPOINT_SW: + case GDB_BREAKPOINT_HW: + CPU_FOREACH(cpu) { + err = cpu_breakpoint_insert(cpu, addr, BP_GDB, NULL); + if (err) { + break; + } + } + return err; + case GDB_WATCHPOINT_WRITE: + case GDB_WATCHPOINT_READ: + case GDB_WATCHPOINT_ACCESS: + CPU_FOREACH(cpu) { + err = cpu_watchpoint_insert(cpu, addr, len, + xlat_gdb_type(cpu, type), NULL); + if (err) { + break; + } + } + return err; + default: + return -ENOSYS; + } +} + +static int tcg_remove_breakpoint(CPUState *cs, int type, hwaddr addr, hwaddr len) +{ + CPUState *cpu; + int err = 0; + + switch (type) { + case GDB_BREAKPOINT_SW: + case GDB_BREAKPOINT_HW: + CPU_FOREACH(cpu) { + err = cpu_breakpoint_remove(cpu, addr, BP_GDB); + if (err) { + break; + } + } + return err; + case GDB_WATCHPOINT_WRITE: + case GDB_WATCHPOINT_READ: + case GDB_WATCHPOINT_ACCESS: + CPU_FOREACH(cpu) { + err = cpu_watchpoint_remove(cpu, addr, len, + xlat_gdb_type(cpu, type)); + if (err) { + break; + } + } + return err; + default: + return -ENOSYS; + } +} + +static inline void tcg_remove_all_breakpoints(CPUState *cpu) +{ + cpu_breakpoint_remove_all(cpu, BP_GDB); + cpu_watchpoint_remove_all(cpu, BP_GDB); +} + static void tcg_accel_ops_init(AccelOpsClass *ops) { if (qemu_tcg_mttcg_enabled()) { @@ -109,6 +197,10 @@ static void tcg_accel_ops_init(AccelOpsClass *ops) ops->handle_interrupt = tcg_handle_interrupt; } } + + ops->insert_breakpoint = tcg_insert_breakpoint; + ops->remove_breakpoint = tcg_remove_breakpoint; + ops->remove_all_breakpoints = tcg_remove_all_breakpoints; } static void tcg_accel_ops_class_init(ObjectClass *oc, void *data) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index a0755e6505..ff9f3f9586 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -49,8 +49,11 @@ #include "sysemu/runstate.h" #include "semihosting/semihost.h" #include "exec/exec-all.h" +#include "exec/hwaddr.h" #include "sysemu/replay.h" +#include "internals.h" + #ifdef CONFIG_USER_ONLY #define GDB_ATTACHED "0" #else @@ -1012,130 +1015,16 @@ void gdb_register_coprocessor(CPUState *cpu, } } -#ifndef CONFIG_USER_ONLY -/* Translate GDB watchpoint type to a flags value for cpu_watchpoint_* */ -static inline int xlat_gdb_type(CPUState *cpu, int gdbtype) -{ - static const int xlat[] = { - [GDB_WATCHPOINT_WRITE] = BP_GDB | BP_MEM_WRITE, - [GDB_WATCHPOINT_READ] = BP_GDB | BP_MEM_READ, - [GDB_WATCHPOINT_ACCESS] = BP_GDB | BP_MEM_ACCESS, - }; - - CPUClass *cc = CPU_GET_CLASS(cpu); - int cputype = xlat[gdbtype]; - - if (cc->gdb_stop_before_watchpoint) { - cputype |= BP_STOP_BEFORE_ACCESS; - } - return cputype; -} -#endif - -static int gdb_breakpoint_insert(int type, target_ulong addr, target_ulong len) -{ - CPUState *cpu; - int err = 0; - - if (kvm_enabled()) { - return kvm_insert_breakpoint(gdbserver_state.c_cpu, addr, len, type); - } - - switch (type) { - case GDB_BREAKPOINT_SW: - case GDB_BREAKPOINT_HW: - CPU_FOREACH(cpu) { - err = cpu_breakpoint_insert(cpu, addr, BP_GDB, NULL); - if (err) { - break; - } - } - return err; -#ifndef CONFIG_USER_ONLY - case GDB_WATCHPOINT_WRITE: - case GDB_WATCHPOINT_READ: - case GDB_WATCHPOINT_ACCESS: - CPU_FOREACH(cpu) { - err = cpu_watchpoint_insert(cpu, addr, len, - xlat_gdb_type(cpu, type), NULL); - if (err) { - break; - } - } - return err; -#endif - default: - return -ENOSYS; - } -} - -static int gdb_breakpoint_remove(int type, target_ulong addr, target_ulong len) -{ - CPUState *cpu; - int err = 0; - - if (kvm_enabled()) { - return kvm_remove_breakpoint(gdbserver_state.c_cpu, addr, len, type); - } - - switch (type) { - case GDB_BREAKPOINT_SW: - case GDB_BREAKPOINT_HW: - CPU_FOREACH(cpu) { - err = cpu_breakpoint_remove(cpu, addr, BP_GDB); - if (err) { - break; - } - } - return err; -#ifndef CONFIG_USER_ONLY - case GDB_WATCHPOINT_WRITE: - case GDB_WATCHPOINT_READ: - case GDB_WATCHPOINT_ACCESS: - CPU_FOREACH(cpu) { - err = cpu_watchpoint_remove(cpu, addr, len, - xlat_gdb_type(cpu, type)); - if (err) - break; - } - return err; -#endif - default: - return -ENOSYS; - } -} - -static inline void gdb_cpu_breakpoint_remove_all(CPUState *cpu) -{ - cpu_breakpoint_remove_all(cpu, BP_GDB); -#ifndef CONFIG_USER_ONLY - cpu_watchpoint_remove_all(cpu, BP_GDB); -#endif -} - static void gdb_process_breakpoint_remove_all(GDBProcess *p) { CPUState *cpu = get_first_cpu_in_process(p); while (cpu) { - gdb_cpu_breakpoint_remove_all(cpu); + gdb_breakpoint_remove_all(cpu); cpu = gdb_next_cpu_in_process(cpu); } } -static void gdb_breakpoint_remove_all(void) -{ - CPUState *cpu; - - if (kvm_enabled()) { - kvm_remove_all_breakpoints(gdbserver_state.c_cpu); - return; - } - - CPU_FOREACH(cpu) { - gdb_cpu_breakpoint_remove_all(cpu); - } -} static void gdb_set_cpu_pc(target_ulong pc) { @@ -1667,7 +1556,8 @@ static void handle_insert_bp(GArray *params, void *user_ctx) return; } - res = gdb_breakpoint_insert(get_param(params, 0)->val_ul, + res = gdb_breakpoint_insert(gdbserver_state.c_cpu, + get_param(params, 0)->val_ul, get_param(params, 1)->val_ull, get_param(params, 2)->val_ull); if (res >= 0) { @@ -1690,7 +1580,8 @@ static void handle_remove_bp(GArray *params, void *user_ctx) return; } - res = gdb_breakpoint_remove(get_param(params, 0)->val_ul, + res = gdb_breakpoint_remove(gdbserver_state.c_cpu, + get_param(params, 0)->val_ul, get_param(params, 1)->val_ull, get_param(params, 2)->val_ull); if (res >= 0) { @@ -2541,7 +2432,7 @@ static void handle_target_halt(GArray *params, void *user_ctx) * because gdb is doing an initial connect and the state * should be cleaned up. */ - gdb_breakpoint_remove_all(); + gdb_breakpoint_remove_all(gdbserver_state.c_cpu); } static int gdb_handle_packet(const char *line_buf) diff --git a/gdbstub/softmmu.c b/gdbstub/softmmu.c new file mode 100644 index 0000000000..4e73890379 --- /dev/null +++ b/gdbstub/softmmu.c @@ -0,0 +1,42 @@ +/* + * gdb server stub - softmmu specific bits + * + * Debug integration depends on support from the individual + * accelerators so most of this involves calling the ops helpers. + * + * Copyright (c) 2022 Linaro Ltd + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "exec/gdbstub.h" +#include "exec/hwaddr.h" +#include "sysemu/cpus.h" +#include "internals.h" + +int gdb_breakpoint_insert(CPUState *cs, int type, hwaddr addr, hwaddr len) +{ + const AccelOpsClass *ops = cpus_get_accel(); + if (ops->insert_breakpoint) { + return ops->insert_breakpoint(cs, type, addr, len); + } + return -ENOSYS; +} + +int gdb_breakpoint_remove(CPUState *cs, int type, hwaddr addr, hwaddr len) +{ + const AccelOpsClass *ops = cpus_get_accel(); + if (ops->remove_breakpoint) { + return ops->remove_breakpoint(cs, type, addr, len); + } + return -ENOSYS; +} + +void gdb_breakpoint_remove_all(CPUState *cs) +{ + const AccelOpsClass *ops = cpus_get_accel(); + if (ops->remove_all_breakpoints) { + ops->remove_all_breakpoints(cs); + } +} diff --git a/gdbstub/user.c b/gdbstub/user.c new file mode 100644 index 0000000000..42652b28a7 --- /dev/null +++ b/gdbstub/user.c @@ -0,0 +1,62 @@ +/* + * gdbstub user-mode helper routines. + * + * We know for user-mode we are using TCG so we can call stuff directly. + * + * Copyright (c) 2022 Linaro Ltd + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "exec/hwaddr.h" +#include "exec/gdbstub.h" +#include "hw/core/cpu.h" +#include "internals.h" + +int gdb_breakpoint_insert(CPUState *cs, int type, hwaddr addr, hwaddr len) +{ + CPUState *cpu; + int err = 0; + + switch (type) { + case GDB_BREAKPOINT_SW: + case GDB_BREAKPOINT_HW: + CPU_FOREACH(cpu) { + err = cpu_breakpoint_insert(cpu, addr, BP_GDB, NULL); + if (err) { + break; + } + } + return err; + default: + /* user-mode doesn't support watchpoints */ + return -ENOSYS; + } +} + +int gdb_breakpoint_remove(CPUState *cs, int type, hwaddr addr, hwaddr len) +{ + CPUState *cpu; + int err = 0; + + switch (type) { + case GDB_BREAKPOINT_SW: + case GDB_BREAKPOINT_HW: + CPU_FOREACH(cpu) { + err = cpu_breakpoint_remove(cpu, addr, BP_GDB); + if (err) { + break; + } + } + return err; + default: + /* user-mode doesn't support watchpoints */ + return -ENOSYS; + } +} + +void gdb_breakpoint_remove_all(CPUState *cs) +{ + cpu_breakpoint_remove_all(cs, BP_GDB); +} diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 23b30484b2..61b27ff59d 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -617,6 +617,13 @@ void cpus_register_accel(const AccelOpsClass *ops) cpus_accel = ops; } +const AccelOpsClass *cpus_get_accel(void) +{ + /* broken if we call this early */ + assert(cpus_accel); + return cpus_accel; +} + void qemu_init_vcpu(CPUState *cpu) { MachineState *ms = MACHINE(qdev_get_machine()); diff --git a/gdbstub/meson.build b/gdbstub/meson.build index 6d4ae2d03c..fc895a2c39 100644 --- a/gdbstub/meson.build +++ b/gdbstub/meson.build @@ -1 +1,9 @@ +# +# The main gdbstub still relies on per-build definitions of various +# types. The bits pushed to softmmu/user.c try to use guest agnostic +# types such as hwaddr. +# + specific_ss.add(files('gdbstub.c')) +softmmu_ss.add(files('softmmu.c')) +user_ss.add(files('user.c')) From patchwork Thu Sep 29 11:42:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610617 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp933993pvb; Thu, 29 Sep 2022 07:39:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6F2duNPk7u2TItzB8s6JNlkydWACzENt8MJMHFqgFBrmjZ1GKRfAMf2tUwymGS6CqSvlwD X-Received: by 2002:a05:6214:2b0f:b0:4af:b379:256 with SMTP id jx15-20020a0562142b0f00b004afb3790256mr1164545qvb.117.1664462391349; Thu, 29 Sep 2022 07:39:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664462391; cv=none; d=google.com; s=arc-20160816; b=VrEUeGZ6x5FDCA6JigFA66/VD6P3bBlpq/e0YHkZxUHStF0KXvkjBVP3PdGSfsZIXp TNopEE4kMq26y0hM440M2PZLYvr/mtR2MpdmVfeXV9TQGAwmPyD6EiV47m/cOvjGfPpm GDiCFiwaY5aEIv3xGXXmb0AhpnL9AqKihHH1yRMCDPBD3zqANzfF4Z73t3Gh/OkI80w7 HM5S9k3Zj7iYCca6dTbaxu6U0SwOwug5wL3reEVRMcy+m0ju3LUuVkOyV+agPuueP0ae 5CUb/81MbWcsOJ26fHdY+VpMiZNeMZXZhdlQ+I6MX1ZFSmTUhgMXHAJrH7OrJNqydfO7 1LBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RThMpAcquckEsmo9M7gWSUy/bG/u2xwngozgZS5qNSs=; b=UHp51OBLejTIp1r1pSMr1HOnL5eh5jQYsgDFU5qg8ETiBdwb53sYWb5ZS6IO0wwgsV pb/P0RqxPbngRcX8TMiNNcUO30UmTU/lkc8L9r1eFxkLjLDTK16qn/85ihkWxDgmnuTe /348DrEO/jBMkmzBeO9RCZnSFoZvoLJLUyHTufpYQ3X6a4A6//1rkNdekmtbR+fgEcTp njq64ays4aOcDdZvEZ88xi3x4sturEsluyNZP4tZ+5BrQhTDYCnzZEAn3+wQN9bxYX/E HdJYudfkgY0PIkn8j5XhrZnu++d7OnT+ZZGMQHU6wJ0QbrY8scEGDmhjt4E9htF/yO5z rLiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S1XZE1uL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y9-20020ac85f49000000b00342f7a2c176si1643188qta.678.2022.09.29.07.39.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 07:39:51 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S1XZE1uL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oduha-0004Uz-Jf for patch@linaro.org; Thu, 29 Sep 2022 10:39:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odsD2-0007XO-SY for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:08 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:35498) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odsCs-0004Me-NJ for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:08 -0400 Received: by mail-wr1-x432.google.com with SMTP id u10so1708291wrq.2 for ; Thu, 29 Sep 2022 04:59:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=RThMpAcquckEsmo9M7gWSUy/bG/u2xwngozgZS5qNSs=; b=S1XZE1uLP2UXXLgT81/QSvXAqcZG/Io9mliRlSL6zKPW+/qD78VuO41qA3TyWenOFo 1O4CBzQEs6sfc4+/fVdeS7V1N8UHOcfMsVj6e240+w1GGWjk9P+ODNGo/do0TJf1a11e 339JVlJkRekRZhqfJ49YXQvKAOUpxQdVGcKCU/+Cw25sMuKLY4OqQZaY0oXO82MlwVyF Nh+QQU5/UAQPUWYyfoW/ntZAVu7svBwu1ZFjIAHmmigm8vvOS/kz1WN4Ra+KBHCqeMiS dipwb14T7SOTC9jdqFbU5nq67pNxWMAhjOJCIM8d/Xf7OaWX5hPEVwBqO0oJL1IvYcOx Fs5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=RThMpAcquckEsmo9M7gWSUy/bG/u2xwngozgZS5qNSs=; b=R50sw65d9pyAiU91yAqboiKJQn8sTAaJB2jEIX6HDtfQr4Te6rxOr3l0Z6I66m7aDv Ywj155X3UBngmEiT28iJXYRjbTdUCeIkaoSo/kvYtHM6+s3FDTdsQxnWqn0fg37XU1zs qTBg7xr86SZkxno4ayRZE2UImG2rmCJaxJZogpWmOWHwIGrdKIDarmdbDvDEAlurLH2l bTI9tdXIzJ/vearCYXBUeYj5exbvrRmi9w/MzsUqARCHIe7dKIv7R7WUsEhenMqJeRrV 3RM10UcDBxTQ5injiQSxjP4Zu+jR1GxrOxuMhgCqWgMmvHlJAU3nzJjjuOBDrxPqtYSt AncA== X-Gm-Message-State: ACrzQf3IsG9vYzWa0W7BiTjtDadcsez4QDTsJZl/160ZzePTqi+eYVI6 1yF4HuRiL5u4yyUeqQLcMXtkvQ== X-Received: by 2002:a05:6000:711:b0:22a:e78d:be05 with SMTP id bs17-20020a056000071100b0022ae78dbe05mr2071108wrb.338.1664452796998; Thu, 29 Sep 2022 04:59:56 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q4-20020adf9dc4000000b0022cce7689d3sm2609026wre.36.2022.09.29.04.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A522C1FFDE; Thu, 29 Sep 2022 12:42:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Mads Ynddal , Richard Henderson , kvm@vger.kernel.org (open list:Overall KVM CPUs) Subject: [PATCH v1 45/51] gdbstub: move guest debug support check to ops Date: Thu, 29 Sep 2022 12:42:25 +0100 Message-Id: <20220929114231.583801-46-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This removes the final hard coding of kvm_enabled() in gdbstub and moves the check to an AccelOps. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Cc: Mads Ynddal Message-Id: <20220927141504.3886314-15-alex.bennee@linaro.org> --- accel/kvm/kvm-cpus.h | 1 + gdbstub/internals.h | 1 + include/sysemu/accel-ops.h | 1 + include/sysemu/kvm.h | 7 ------- accel/kvm/kvm-accel-ops.c | 1 + accel/kvm/kvm-all.c | 6 ++++++ accel/tcg/tcg-accel-ops.c | 6 ++++++ gdbstub/gdbstub.c | 5 ++--- gdbstub/softmmu.c | 9 +++++++++ gdbstub/user.c | 6 ++++++ 10 files changed, 33 insertions(+), 10 deletions(-) diff --git a/accel/kvm/kvm-cpus.h b/accel/kvm/kvm-cpus.h index 33e435d62b..fd63fe6a59 100644 --- a/accel/kvm/kvm-cpus.h +++ b/accel/kvm/kvm-cpus.h @@ -18,6 +18,7 @@ void kvm_destroy_vcpu(CPUState *cpu); void kvm_cpu_synchronize_post_reset(CPUState *cpu); void kvm_cpu_synchronize_post_init(CPUState *cpu); void kvm_cpu_synchronize_pre_loadvm(CPUState *cpu); +bool kvm_supports_guest_debug(void); int kvm_insert_breakpoint(CPUState *cpu, int type, hwaddr addr, hwaddr len); int kvm_remove_breakpoint(CPUState *cpu, int type, hwaddr addr, hwaddr len); void kvm_remove_all_breakpoints(CPUState *cpu); diff --git a/gdbstub/internals.h b/gdbstub/internals.h index 41e2e72dbf..eabb0341d1 100644 --- a/gdbstub/internals.h +++ b/gdbstub/internals.h @@ -9,6 +9,7 @@ #ifndef _INTERNALS_H_ #define _INTERNALS_H_ +bool gdb_supports_guest_debug(void); int gdb_breakpoint_insert(CPUState *cs, int type, hwaddr addr, hwaddr len); int gdb_breakpoint_remove(CPUState *cs, int type, hwaddr addr, hwaddr len); void gdb_breakpoint_remove_all(CPUState *cs); diff --git a/include/sysemu/accel-ops.h b/include/sysemu/accel-ops.h index 86794ac273..8cc7996def 100644 --- a/include/sysemu/accel-ops.h +++ b/include/sysemu/accel-ops.h @@ -47,6 +47,7 @@ struct AccelOpsClass { int64_t (*get_elapsed_ticks)(void); /* gdbstub hooks */ + bool (*supports_guest_debug)(void); int (*insert_breakpoint)(CPUState *cpu, int type, hwaddr addr, hwaddr len); int (*remove_breakpoint)(CPUState *cpu, int type, hwaddr addr, hwaddr len); void (*remove_all_breakpoints)(CPUState *cpu); diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 21d3f1d01e..6e1bd01725 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -46,7 +46,6 @@ extern bool kvm_readonly_mem_allowed; extern bool kvm_direct_msi_allowed; extern bool kvm_ioeventfd_any_length_allowed; extern bool kvm_msi_use_devid; -extern bool kvm_has_guest_debug; #define kvm_enabled() (kvm_allowed) /** @@ -168,11 +167,6 @@ extern bool kvm_has_guest_debug; */ #define kvm_msi_devid_required() (kvm_msi_use_devid) -/* - * Does KVM support guest debugging - */ -#define kvm_supports_guest_debug() (kvm_has_guest_debug) - #else #define kvm_enabled() (0) @@ -190,7 +184,6 @@ extern bool kvm_has_guest_debug; #define kvm_direct_msi_enabled() (false) #define kvm_ioeventfd_any_length_enabled() (false) #define kvm_msi_devid_required() (false) -#define kvm_supports_guest_debug() (false) #endif /* CONFIG_KVM_IS_POSSIBLE */ diff --git a/accel/kvm/kvm-accel-ops.c b/accel/kvm/kvm-accel-ops.c index 5c0e37514c..fbf4fe3497 100644 --- a/accel/kvm/kvm-accel-ops.c +++ b/accel/kvm/kvm-accel-ops.c @@ -99,6 +99,7 @@ static void kvm_accel_ops_class_init(ObjectClass *oc, void *data) ops->synchronize_pre_loadvm = kvm_cpu_synchronize_pre_loadvm; #ifdef KVM_CAP_SET_GUEST_DEBUG + ops->supports_guest_debug = kvm_supports_guest_debug; ops->insert_breakpoint = kvm_insert_breakpoint; ops->remove_breakpoint = kvm_remove_breakpoint; ops->remove_all_breakpoints = kvm_remove_all_breakpoints; diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index b8c734fe3a..6ebff6e5a6 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -3287,6 +3287,12 @@ int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap) return data.err; } +bool kvm_supports_guest_debug(void) +{ + /* probed during kvm_init() */ + return kvm_has_guest_debug; +} + int kvm_insert_breakpoint(CPUState *cpu, int type, hwaddr addr, hwaddr len) { struct kvm_sw_breakpoint *bp; diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index 965c2ad581..19cbf1db3a 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -93,6 +93,11 @@ void tcg_handle_interrupt(CPUState *cpu, int mask) } } +static bool tcg_supports_guest_debug(void) +{ + return true; +} + /* Translate GDB watchpoint type to a flags value for cpu_watchpoint_* */ static inline int xlat_gdb_type(CPUState *cpu, int gdbtype) { @@ -198,6 +203,7 @@ static void tcg_accel_ops_init(AccelOpsClass *ops) } } + ops->supports_guest_debug = tcg_supports_guest_debug; ops->insert_breakpoint = tcg_insert_breakpoint; ops->remove_breakpoint = tcg_remove_breakpoint; ops->remove_all_breakpoints = tcg_remove_all_breakpoints; diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index ff9f3f9586..be88ca0d71 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -45,7 +45,6 @@ #include "qemu/sockets.h" #include "sysemu/hw_accel.h" -#include "sysemu/kvm.h" #include "sysemu/runstate.h" #include "semihosting/semihost.h" #include "exec/exec-all.h" @@ -3447,8 +3446,8 @@ int gdbserver_start(const char *device) return -1; } - if (kvm_enabled() && !kvm_supports_guest_debug()) { - error_report("gdbstub: KVM doesn't support guest debugging"); + if (!gdb_supports_guest_debug()) { + error_report("gdbstub: current accelerator doesn't support guest debugging"); return -1; } diff --git a/gdbstub/softmmu.c b/gdbstub/softmmu.c index 4e73890379..f208c6cf15 100644 --- a/gdbstub/softmmu.c +++ b/gdbstub/softmmu.c @@ -15,6 +15,15 @@ #include "sysemu/cpus.h" #include "internals.h" +bool gdb_supports_guest_debug(void) +{ + const AccelOpsClass *ops = cpus_get_accel(); + if (ops->supports_guest_debug) { + return ops->supports_guest_debug(); + } + return false; +} + int gdb_breakpoint_insert(CPUState *cs, int type, hwaddr addr, hwaddr len) { const AccelOpsClass *ops = cpus_get_accel(); diff --git a/gdbstub/user.c b/gdbstub/user.c index 42652b28a7..033e5fdd71 100644 --- a/gdbstub/user.c +++ b/gdbstub/user.c @@ -14,6 +14,12 @@ #include "hw/core/cpu.h" #include "internals.h" +bool gdb_supports_guest_debug(void) +{ + /* user-mode == TCG == supported */ + return true; +} + int gdb_breakpoint_insert(CPUState *cs, int type, hwaddr addr, hwaddr len) { CPUState *cpu; From patchwork Thu Sep 29 11:42:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610616 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp928890pvb; Thu, 29 Sep 2022 07:31:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7ql/MlQF5hF6ID/ZNN3QOOCq8F906iY+vo72jNdmP1goNQdOCG2eEdiZzMeDBXKlCYbkiv X-Received: by 2002:ac8:57ca:0:b0:35b:b51f:94fc with SMTP id w10-20020ac857ca000000b0035bb51f94fcmr2598458qta.276.1664461910772; Thu, 29 Sep 2022 07:31:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664461910; cv=none; d=google.com; s=arc-20160816; b=GkDnmz+eBAHRS7dET9jjKrM0KCG23CB4M0kxRIMJPrvTm5C178CPUl0J5BxFbkzcte 7wzuD5BgJG7TnJ8xmnZssTu3l0BCcDZ/Nivx1TT8K1+ZRRushuYT59Flsk8u9LOPwwve 93W1K+lF5umOQC0aFGOB2ZjOcajk+CK7wZSO3km09xaIXMtA8W9CI2Q8RmskRANgMP70 twxMK6doz+1i7kY4i4c8nLUFbDj1hKZvh2UWKpJLbiOLxdyVpL7YzC5Ek0kPU33/RTRw GEzRv8iF7hcUkWzw2gLOTpg+eyTXjBh0Ol4NeTzQ5mxfkuz1swHPPA/iD6Kb8jglHGJ0 PErg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DHq1AQi9rI4q4IRUhBPRUGpA6QqNDihLOg2w93Jsa1M=; b=yiWjnMV/Uzwr/BDaALssjs1ldYSI7cDrgUu6f/TgSnjBZNaVqHS/2VA91YqJ7NQSBx 4OH6bTsJbKNkunvVaZ1Zu0q4AYvwqrtSy5fW+86Nao630kduKyPn16WbZ5eLJoieKqdL O1OHCdPxiM/5TzHXTQd25FTuvDeYLr2izYLH3Lt7qoiskXTo5onoL0rmjOy8TbIUPkMA umbHLlacl69wcnoJ5z759GSeCKa2WnN8iZ0H+9wfaFJBi/E+TtEgFKUOyBwqyH0xvafj twWV4BQXDo/7tIS2cMCm/Krot8KGDrRb8FrwrqSaZ0/hWS/EB16KqRNq8rNUVDpkGHI0 KXqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dO8Scfs3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id hf6-20020a05622a608600b0035ce734e127si1263888qtb.432.2022.09.29.07.31.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 07:31:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dO8Scfs3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oduZn-0006GY-VQ for patch@linaro.org; Thu, 29 Sep 2022 10:31:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odsD1-0007V8-MQ for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:07 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:37841) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odsCw-0004Qe-Va for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:07 -0400 Received: by mail-wr1-x431.google.com with SMTP id bq9so1827548wrb.4 for ; Thu, 29 Sep 2022 05:00:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=DHq1AQi9rI4q4IRUhBPRUGpA6QqNDihLOg2w93Jsa1M=; b=dO8Scfs3gyKI6/yrarry+x5ozfjeCSpMmMBfWkU3fulJ/IfH+mivqbXlavSpYddHBN 4FU9FoUyKtrlra5Zp30rBHvxub98kRAeTAIbzV1dFAVEIN2SGp9ya20VT46D6eQIAZ0M pbBpci9fdrLV/dI/BHa8xYLnpbf+JeWw5cOITrvXdSu/2z506YuCaTaoy9Lf70RMiGpK BMaHaFrNN5P5XA2j10PIXkkUYGQx2yAWOrfsUPwCxJ0ARTcZb46ajzieh1EJHNh6SphE IX4vh+jyzbCstEIjXSnj5qGageTBJ0Wfdq6HdWuJChGA8RPQ0A3h7/w99lbVU2vFyHm6 TI9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=DHq1AQi9rI4q4IRUhBPRUGpA6QqNDihLOg2w93Jsa1M=; b=uOIrd6YcWbNoO9LOlQ0E0hWS8W8+8GUNXuL2X9NAf0kiz7jKywl/AfiKG4jjbaEkJs tYiTVF+1fPG0VMh8shJtQRo4avyY/N8g+eG25ZRelEGVLydf0BkixBxlcMey+yFruHZm PZIZ8Dq3m3QRaOf/xdDgtYSRb92NhkojSAwwFPSul81rfOd9rewsXvmse6sCwv3xu55S 3RGfxR/K/eVTfAUxa+UbwfXDlxlw0zCaXSfzD89w43LEllRqr8xeEFKhXrDZnN+7Bp+J qoalFiE8O3FsWkCa36J0jVtJJk3HPTd94liivYd9IOnTalN0eXqqK1t5VVuNUFcvV0Ad bbqw== X-Gm-Message-State: ACrzQf07WP0+dCHD5uKVmBZx2bUkjEuIxO/WhiwBMVR+0b95i28hGaqa I+aXdE49pI9w8EiLwZfaWcxpLcurn9wjWw== X-Received: by 2002:a05:6000:689:b0:228:e2cf:d20e with SMTP id bo9-20020a056000068900b00228e2cfd20emr1894309wrb.147.1664452801164; Thu, 29 Sep 2022 05:00:01 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o9-20020a05600c510900b003a5c244fc13sm4817516wms.2.2022.09.29.04.59.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:59:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C12E01FFDF; Thu, 29 Sep 2022 12:42:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , kvm@vger.kernel.org (open list:Overall KVM CPUs) Subject: [PATCH v1 46/51] accel/kvm: move kvm_update_guest_debug to inline stub Date: Thu, 29 Sep 2022 12:42:26 +0100 Message-Id: <20220929114231.583801-47-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Message-Id: <20220927141504.3886314-16-alex.bennee@linaro.org> --- include/sysemu/kvm.h | 16 ++++++++++++++++ accel/kvm/kvm-all.c | 6 ------ accel/stubs/kvm-stub.c | 5 ----- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 6e1bd01725..790d35ef78 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -247,7 +247,23 @@ int kvm_on_sigbus(int code, void *addr); void kvm_flush_coalesced_mmio_buffer(void); +/** + * kvm_update_guest_debug(): ensure KVM debug structures updated + * @cs: the CPUState for this cpu + * @reinject_trap: KVM trap injection control + * + * There are usually per-arch specifics which will be handled by + * calling down to kvm_arch_update_guest_debug after the generic + * fields have been set. + */ +#ifdef KVM_CAP_SET_GUEST_DEBUG int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap); +#else +static inline int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap) +{ + return -EINVAL; +} +#endif /* internal API */ diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 6ebff6e5a6..423fb1936f 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -3395,12 +3395,6 @@ void kvm_remove_all_breakpoints(CPUState *cpu) } } -#else /* !KVM_CAP_SET_GUEST_DEBUG */ - -static int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap) -{ - return -EINVAL; -} #endif /* !KVM_CAP_SET_GUEST_DEBUG */ static int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset) diff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c index 2d79333143..5d2dd8f351 100644 --- a/accel/stubs/kvm-stub.c +++ b/accel/stubs/kvm-stub.c @@ -46,11 +46,6 @@ int kvm_has_many_ioeventfds(void) return 0; } -int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap) -{ - return -ENOSYS; -} - int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr) { return 1; From patchwork Thu Sep 29 11:42:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610606 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp912722pvb; Thu, 29 Sep 2022 07:06:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7rWt9P+3lfggFW+QjEkYVm//6+fPObCbNNflBHpf/9gKTHop7VKYtWw01hXj6jNQymSewi X-Received: by 2002:a05:622a:14c9:b0:35b:b744:a7c8 with SMTP id u9-20020a05622a14c900b0035bb744a7c8mr2466911qtx.570.1664460383269; Thu, 29 Sep 2022 07:06:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664460383; cv=none; d=google.com; s=arc-20160816; b=aoNFubPOButVGvt5dwuL6Fruc8U3ibt8+Dc0gCL8gHvcsUPXSqHcpFAbALfooW6b3D mrRcPcA9iV7ogdgJDA8Kjegr+VRCHrhj8VTxU1+wlEuR9MWC3/aYR2OcWl7iKYSb68Eh LrrZnRVAuTHV8x7/jjWu68kTikI//2Of3x1EDQbsBogyZQmXBxvXzPEAGYOK+gV4BQyW dj6VYpk+gQw8hO/yXg3SKtnsItidkWuqbxGtCELo7FUhteLQh9HXBaM40q8C6NPzsWd6 mZKldcMTMttUznskdRoxj5mCsJHmiykK3ccCWU+tkbRywB9NyTVs+a2p3cBU6mMEfVeF mxYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eojMqPAhRFgb7PwX6Obti6a+1AdWRxyR2s96Roci+l4=; b=Pd5arWGJICxNXzX6W8L/nW/OoQA9jOIcivlVC5kBs0eoUy5Ci34mAkK8T3TCf235k7 +ITCTnqtIKjPRLwtA+/ayfzI6wvHwJJ7wai3EFtQ/6/bheean+C/3JRkAnL23As6/dnt PmefR6w6v9wD/n48KpCm9eBA37drSlzB3F94X9Tn+NSDdLStNaiMIjnaPQI1myVoECuT /2OuXV2M1Q9aDmA+NtU4q2am/Ge0vbShq86tvV3f67icezOYJ4sMfZwD4NjM/g+6kPOM G1ezZZZ4TPvVyFA0HR4/IxM9C8bn2TQ7ZTcyhmxNUhrAmw5ruZWJjAq1P0HaI09+kf0M zpug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LHdiFleE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w22-20020a05622a135600b0035cceb34440si1506899qtk.491.2022.09.29.07.06.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 07:06:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LHdiFleE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oduBC-0002R6-PB for patch@linaro.org; Thu, 29 Sep 2022 10:06:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3O-0000ZN-U5 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:10 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:37878) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods3I-0002P0-S3 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:10 -0400 Received: by mail-wm1-x32a.google.com with SMTP id z13-20020a7bc7cd000000b003b5054c6f9bso3068722wmk.2 for ; Thu, 29 Sep 2022 04:50:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=eojMqPAhRFgb7PwX6Obti6a+1AdWRxyR2s96Roci+l4=; b=LHdiFleEfPn44/62o7UYiYc+XNMT03HxPSOrkuwQogbRSpWfq3lXqouwKmz6xxFr8H cn7XhrE9m5XxmNQiEyKcoZeAo6A9tnF+uyr3I/Inj3Ip9m3OqS1jpSq3OO2aWaEoGEXT 3fnSzrwZeODg7FGqthtpvFxESNySUb8yXouzE47LAldfd/sWj9/+WOGBkHgGSv6arXdn zRGnkXuq8WSqUAdb9Hv+UqJqEZyNpv0v+Vrr4kj6t31SnhVOF9AYdhgkHubz5IJgIxrS KglSOCr/FqPjBMuGchOzAPaIsYAjtXS74iL9bgoxsisR8swbaND9iVTk7buw/P6eANMU lnLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=eojMqPAhRFgb7PwX6Obti6a+1AdWRxyR2s96Roci+l4=; b=dSaQ/+teeR7x+7bQkF59RgWzkyCewZzS+ODeUhqnO3nOu/6snX6pOghWIHoE8T7a+Z yvHUUyuU1UJu00zl9o6G9er26hYoEbIjWGe2cfjC5/KHUTaH4p5+ZGM1iC7QcRP4uu2/ AA8t425hwEnI70RMIpzYh1ZLglIAj0laglVp0zZ+SZRWk5+8NV1xmxCLgdalQ+2gpFDY R64eRMsmvFKAe76kPTRzgfa1Xn8BNMR7sjsbvGqKrAD8B8M8TtJDatOWHfDaphkeAAsA VudX6yID2i/+KKG1QajyhDH2vAHmd13mGSbVR+sVHy8EHSp3nLsXXIMhhpOpsqYG6opM 9OBQ== X-Gm-Message-State: ACrzQf0RO69nrlwvP3CRI7mHrIMU25kqqpUk/mehWrx/5GaVHhKeSJri RkmeDeTGgWXVkSui7+SN0k91Vg== X-Received: by 2002:a7b:c4c2:0:b0:3b4:fdc4:6df9 with SMTP id g2-20020a7bc4c2000000b003b4fdc46df9mr1962746wmk.123.1664452199587; Thu, 29 Sep 2022 04:49:59 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id k3-20020a05600c1c8300b003b497138093sm3965447wms.47.2022.09.29.04.49.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D88A21FFE3; Thu, 29 Sep 2022 12:42:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Song Gao Subject: [PATCH v1 47/51] contrib/gitdm: add mapping for Loongson Technology Date: Thu, 29 Sep 2022 12:42:27 +0100 Message-Id: <20220929114231.583801-48-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Please confirm you are happy with this mapping. Signed-off-by: Alex Bennée Acked-by: Song Gao Message-Id: <20220926134609.3301945-3-alex.bennee@linaro.org> --- contrib/gitdm/domain-map | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map index 2800d9f986..434ef53afc 100644 --- a/contrib/gitdm/domain-map +++ b/contrib/gitdm/domain-map @@ -19,6 +19,7 @@ ibm.com IBM igalia.com Igalia intel.com Intel linaro.org Linaro +loongson.cn Loongson Technology lwn.net LWN microsoft.com Microsoft mvista.com MontaVista From patchwork Thu Sep 29 11:42:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610615 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp927002pvb; Thu, 29 Sep 2022 07:28:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5vf0e3ynjbyxI0JxJKfdYyS6k4BEn3AkumE5dzVZ9gSCt2WmFZ5sx0FAdXWdifCJQEcUnw X-Received: by 2002:a05:6214:e45:b0:4a9:ccab:b306 with SMTP id o5-20020a0562140e4500b004a9ccabb306mr2681484qvc.6.1664461736737; Thu, 29 Sep 2022 07:28:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664461736; cv=none; d=google.com; s=arc-20160816; b=huJs8Mw4NgapQEjS+gVZ8LOncY71JMmDwowR66qEVTMoz/Q5KmM1j7rGgLHW7DeLL8 hDnqrjqRlaGaa6uTul6+BJc5EF+tFZ+0Gh/oCii7f0airhxhl2oERXDRUpTn4VTm6a0f zL4S+4iRriZnIk+t+rX1wq9qu1ogJk45XLBo/5xwr7bqiKlkUcAE43Xt0j8HAzvucAK2 tPAaRim+bYzU3/ZUUfCiJRE8hanlw/fZqjKn1RsSjnq3Z6UBtKalgsWdTH+9GDvBWc3v vEd3UKuvp6+E0EkX7qYVXxj4j0UitHB+9cw1taE0ykzqTUGO9pdz3FA0TH7uuEiF/6Zl o2iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iXjhbGFiizhYgxb67PGBdW+eyz6XqT6azX1gHARCrNQ=; b=aUpzf3qbq1e+pKxxf637qUVdbzbKgegnWUPkksgJKUP5bq1w/9F5zY2TaVfzfDoyzM pp9hEuNWrkxkHX1QfqR0WjSUAjNBX6gc3KrcszLGcCrdr9ZbbyqqFB6ZiaxZrJ8jVWYH VAvkREtc27WzNjw+Z1uERPytIwFpJVSZFGue/ZXvRipke/XpUfig+YBsDmBT+z+4d1U8 gDmSl5D+AB6SGndbfMZCqJ/XpdPIsJZ2ViStNTr6ZnV7dNPSYla2hvitfdGLyWMnGw3l 7mbS853Vu7xfbXTj3tackK89u7llkBg9KRv5ETA37RhViggYYQpMutRVQgwU1ePbQYeX vh1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ld3QHLog; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ke28-20020a056214301c00b004990359d3aasi4969040qvb.462.2022.09.29.07.28.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 07:28:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ld3QHLog; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oduX1-0004J6-QV for patch@linaro.org; Thu, 29 Sep 2022 10:28:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3Q-0000fd-TA for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:13 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:42519) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods3K-0002NK-0H for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:12 -0400 Received: by mail-wr1-x42d.google.com with SMTP id l18so1768582wrw.9 for ; Thu, 29 Sep 2022 04:50:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=iXjhbGFiizhYgxb67PGBdW+eyz6XqT6azX1gHARCrNQ=; b=ld3QHLog7HE/sJ7fEbxfh9V7wvcKor0nicTUo7Gpe+N6No5Jhbs3uvCvZEQjYeom+X A+zBwA7N57e0ucbYWqGVe5enOghIyJcK3FmOlKbOHyeaocQDGwYSV6nCmDYwdNQZKrwj XNknr4lernKuBTduMdlFk+1ekyA27bFOSm4h1Xvk92wgyffFWnUFe4mIBJ1CXteePKZu PPjLUSPU6rbdfIcjGUKpj/eWLl3l+bPmcf5MAldUhGGdxtsJ8Rw4ybeOn3e1faQpiGQM glRaJ95dAe07E6yrtglDYgHIiajXxQLQ/FfB+kFJ3oGEX1zUNnE4fjp5R8ZGugc82xHg +DSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=iXjhbGFiizhYgxb67PGBdW+eyz6XqT6azX1gHARCrNQ=; b=awOl+BF4JPo8Vr3ZgtoC2eAXTc5fWVF4Kkffbsjdi9zD3zwWXrbOuenh60njbu1egt DUAFWUAc4ogWSl3dj0swrGfdQzH1dA0yeJX/+dbmlvnBOIWPHXFckOCokv/VPk/3hI7B T7zPaLea6O1zb4CfhgovutAd3AUsXiFcvI1Dl9WwE+zfM/L4E4TmHEIQjF+cLh8vbv8m ndBQDasBZTT9j1mIUgnWPlryjIyuwTfE+vSvDqPLssZxFKDOVJC8K+FnyrPq5QMAltlD x02FTEbhUBhRw+H+ZFu2XMwCFXjokoRQBxZA06u0SmT4laUZ4qpFYafLtlhboh9KISUU rAjQ== X-Gm-Message-State: ACrzQf0JflmMfL9zh/Apieg1LPy/cf6YhiOr0xlZHLd0whCpG9L6TUiT GA9MZkwcqVwgBEyBJ9amKsgVAA== X-Received: by 2002:a05:6000:184e:b0:228:bb9d:f98a with SMTP id c14-20020a056000184e00b00228bb9df98amr1858327wri.479.1664452201095; Thu, 29 Sep 2022 04:50:01 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id w1-20020a5d5441000000b0022cc0a2cbecsm6154159wrv.15.2022.09.29.04.49.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F23771FFE5; Thu, 29 Sep 2022 12:42:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Paul Brook Subject: [PATCH v1 48/51] contrib/gitdm: add Paul to individual contributors Date: Thu, 29 Sep 2022 12:42:28 +0100 Message-Id: <20220929114231.583801-49-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Also map his old codesourcery address to his canonical address. Signed-off-by: Alex Bennée Cc: Paul Brook Message-Id: <20220926134609.3301945-4-alex.bennee@linaro.org> --- v2 - also .mailmap --- .mailmap | 1 + contrib/gitdm/group-map-individuals | 1 + 2 files changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index 8c326709cf..1f7319b70b 100644 --- a/.mailmap +++ b/.mailmap @@ -65,6 +65,7 @@ James Hogan Leif Lindholm Leif Lindholm Radoslaw Biernacki +Paul Brook Paul Burton Paul Burton Paul Burton diff --git a/contrib/gitdm/group-map-individuals b/contrib/gitdm/group-map-individuals index f816aa8770..6322b3476d 100644 --- a/contrib/gitdm/group-map-individuals +++ b/contrib/gitdm/group-map-individuals @@ -34,3 +34,4 @@ bmeng.cn@gmail.com liq3ea@gmail.com chetan4windows@gmail.com akihiko.odaki@gmail.com +paul@nowt.org From patchwork Thu Sep 29 11:42:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610600 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp902889pvb; Thu, 29 Sep 2022 06:49:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM69OZE5E+B0TTQbtkyQ6aSBM07T4dSKyIzKkmlOaCGJK1ishyFYZ90S3Mx3AmDlCOBMZCSF X-Received: by 2002:a05:622a:183:b0:35d:5c28:7a2b with SMTP id s3-20020a05622a018300b0035d5c287a2bmr2394980qtw.410.1664459372618; Thu, 29 Sep 2022 06:49:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664459372; cv=none; d=google.com; s=arc-20160816; b=oU3Oq71AULfv3sPWWpXxq8aCLFsVK+M7He2f4H/+S6rl+ptD7dFbo8Pt4nOMOVeCP/ ZhUhu6c7iYKfpMeFTmBETfrYWqdVoqFPV2V3haRIs/RNAWfavExtzJFnDturKADQfCws qFDl/Hdd7LaqyKmOFm2hqruc1UZxlOAf78OKykEklHfe9UeT301KO+fRzRlUWZhsEC/e X8DD3x0zhyRY/awwRyEM2PbhKn9XxBw2QzMOyvmGYNmcwPE/nbpt8VksF/h7mVgXdocS yHAI7/wLOmzQLyVezPa5KB04wakb6+SL5vE3jY88cO0YiUTQW1Qu2OOUVwuoc95XYJUF bCDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=LtaDlUJVGMb2JqoOoenqLWs8g7TzlOytd4Bv6SYv0Bg=; b=xD+i8jIvxlEOzUi6AQy4gOGBBkJ6dy9DjKdoJ6tKC6omNJBRrgBTTAxUV1VuvujBNF ZMvxoy+LKJ8Qyl97KRS05knFI/SPEdT/RcBKgU+rwozBaMyLhsoF0YyxstTmbJXw7qvq O6FuzcUBUenHIDbwHqgTTtCbpMUpDAQs93Ez3Nh+v0rBcZTtZGs5SUSZ7JLZLnWyWUH5 8Fr+wmTeRlYs9kFMpJ+eDGboS1cZmezb44r9oKguGr2+Z+9XUs5OYNxGFZqa6X366Gw1 vYz7CAt0WenmszRXV6/Tm531c3dNOIpmUpk4QQUlPWE2Dt+N+Ni8DPNfr/Imk7OQZavG S0zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=s68wwXeo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t4-20020a05620a450400b006bc6a321891si1440088qkp.46.2022.09.29.06.49.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:49:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=s68wwXeo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odtus-00053V-Lx for patch@linaro.org; Thu, 29 Sep 2022 09:49:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3K-0000Ow-G0 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:07 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:46853) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods3F-0002Ol-Ra for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:06 -0400 Received: by mail-wr1-x432.google.com with SMTP id bk15so1755919wrb.13 for ; Thu, 29 Sep 2022 04:49:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=LtaDlUJVGMb2JqoOoenqLWs8g7TzlOytd4Bv6SYv0Bg=; b=s68wwXeoGUXbaTVEivYaekkIsgTcCggzkGKwDPe6xghEsNx/G/KDeh84lKTFEoffN8 KAwFNzRRwNG0qjM7q0ir63kLVAOaqca8E9ATMODvOEX8R4q8etgqOKipOTgLQKlaEbR4 QcVzWL4BpLMzi8/SEbDJ/ztZzPuPaNgRUQHKSd1io/E8umYMZb/oTrsshKX5Hn+k/dM2 we7PV5tyWRXcgqFSO8oyGuczLJpwJGX/3ablVjqLJ6zIYmYMTkN6B/rk89EhsMA7HlQF ARNS6HKJD1BP9hfuFYgxWqQjwPKpE242/DeEDTdDJ4go8BXTihbJTtOZ2QWQIxNm88Nd 0OVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=LtaDlUJVGMb2JqoOoenqLWs8g7TzlOytd4Bv6SYv0Bg=; b=Yk8QqBXEzA45ts/iQG+LhZYUUG4rmU2/q5010Y7R5OXZa6qvJmnoo4F6EyBlo1lrTh sbpq8iCw1UN6HHkWdeFtg0Fc2WwzBexa29D7bMmWgp+B2AS6Q6gnVh2/7+GPpvMmnNVM EXRqEIzBcpTKzod3g7oPH+x/54XGfqpv6y1XBn6PzdkFlmzhNXRJKg3FUUvCFmHZwiJV p1kP8Ytrp6bEHwZ3G4CyRJ2k8T8mnC7xy9JDuYtetJbFgb2BHMpoLMYNMfx1jwx1MfZ7 Lf5PpXUpmsKsWtwkSjOTAxGbIThjANnB/F34BzcfinSuwS4XeSSyDFcaBE5d0KRLv+UZ VG8w== X-Gm-Message-State: ACrzQf3vuJd9BRUya/HmvzXoMEvjc+Ocwutn5nFk0J6gvzQfPIZ4Jwc/ tREB36EHA7CSeKULAHuPNVTTTA== X-Received: by 2002:a5d:6c6b:0:b0:225:dde:ab40 with SMTP id r11-20020a5d6c6b000000b002250ddeab40mr1983639wrz.690.1664452198312; Thu, 29 Sep 2022 04:49:58 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id w10-20020a05600c474a00b003b4ac05a8a4sm5527858wmo.27.2022.09.29.04.49.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 145711FFE6; Thu, 29 Sep 2022 12:42:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , WANG Xuerui Subject: [PATCH v1 49/51] contrib/gitdm: add WANG Xuerui to individual contributers Date: Thu, 29 Sep 2022 12:42:29 +0100 Message-Id: <20220929114231.583801-50-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" His blog confirms he is not affiliated with Loongson. Signed-off-by: Alex Bennée Reviewed-by: WANG Xuerui Message-Id: <20220926134609.3301945-5-alex.bennee@linaro.org> --- v2 - fix spelling of Loongson --- contrib/gitdm/group-map-individuals | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/gitdm/group-map-individuals b/contrib/gitdm/group-map-individuals index 6322b3476d..e19d79626c 100644 --- a/contrib/gitdm/group-map-individuals +++ b/contrib/gitdm/group-map-individuals @@ -35,3 +35,4 @@ liq3ea@gmail.com chetan4windows@gmail.com akihiko.odaki@gmail.com paul@nowt.org +git@xen0n.name From patchwork Thu Sep 29 11:42:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610614 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp925073pvb; Thu, 29 Sep 2022 07:25:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4M3Ss3tX5A7GbaScS5e+PeQeu0nQ5opJnlnUT15GmXUJsVeo5kI1H4MgSNeDiw+fxJ8ygw X-Received: by 2002:a05:6214:230a:b0:46e:3890:afcb with SMTP id gc10-20020a056214230a00b0046e3890afcbmr2641951qvb.59.1664461515462; Thu, 29 Sep 2022 07:25:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664461515; cv=none; d=google.com; s=arc-20160816; b=onX6b77aRV8DPaYDOFsgwTDqCHseXUKl9Mseyo5yxYkrzshEZrCV5ydG3WQjG/186r FR8XkQfRiBbAmlx8comfUyJOS9utXDC9v2v3FUIe7vxGzjZPlBpGqvdEvtWl8VK0v2CK tOE3+70pmr6qSOYmzRlhzOkUqdBK+8H2PfnBd5uhPYyRy8jzB52757l6NcTouR5qcO7b cGsBJWKC5SySWWhJHP70y+0+PmGAjuUVsfe6WIHhaGUT2sL0r9rDf5ZSs9fCq0JskZsK 9RiqbZ0/Z2XfKnQ9xxfIY5BYidmZF2to5zfgFt/i1yWe3W4y7iPY1DfRVTyCqpO8/Wuf B7aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CtbYQsfls7HKk9T4QA6Y6Rsyc/LAyFcunfAWWUDR2rM=; b=QLVy5gmNDVTZlkqIkAOXLMizSGGKKud3pGYaaQAUQWYGjvN5JCXUL6jVjSqUnmmUIH oelwRL7VItnbmC0UhS90kdnabqeg/uwavH96u28T5o2BciK5UIjKteEPQ71qQKeigx9N Z2Cm/HTPn1rxWUgwvdTiClC+ImgTZk9j03kwAjoYk+aI/zrjUmDaKiN5GwSKaVWH8dkb rjnhqGlb6FVubCSyrPdIk8brMBQcaS2IKzEumr9C5u3d/p2Mexrmzie4Jgw2RAh6VWLf pTuMG8BcCzt1Ssz3upkBlCnvMjvLhuNPf5vxnS9JxCl99YWg34QnwIQTa7QuudCMSrVa hBrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RZBb0tR9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id kd21-20020a056214401500b004ac862da615si4624111qvb.372.2022.09.29.07.25.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 07:25:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RZBb0tR9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oduTS-0000F1-Tw for patch@linaro.org; Thu, 29 Sep 2022 10:25:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43506) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3X-0000kW-Rg for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:20 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:45856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods3I-0002NF-St for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:19 -0400 Received: by mail-wr1-x429.google.com with SMTP id n10so1757523wrw.12 for ; Thu, 29 Sep 2022 04:50:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=CtbYQsfls7HKk9T4QA6Y6Rsyc/LAyFcunfAWWUDR2rM=; b=RZBb0tR97Q0MsnS7WYstLsjwQKAG8UX8QTe+Mrk5fcWD51A2bC1YrS75ww898AfDLO NrLUbhJ9MASjm0jmwaloEPkUQhbqFzqzzmr4+SwVsg96tevD+v3mCzMwEBwTNksUl4zl B9e/xedssgjScdd6yejK9u+H2tOCa2Bgvm9tbj0dzrq3GkTfuwKRx+uHK/b6CaPRDSGp fEnujl+y20irATJi6ndOLWnh+Xzt6PTfURdgjoSXWEl4xH53pOuFELk1z9cj4+Qm4NNp fS1xexhnegabuK30BU98gqfBjyvxneT+mZWaqyzj6n04JTPeoXFiWSc/2uyR3KlLc4DF dJUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=CtbYQsfls7HKk9T4QA6Y6Rsyc/LAyFcunfAWWUDR2rM=; b=b8i0OH5g92J7rYaADLb8b+Wekr3j2/On60uBAIk+oUsvgfGbKGCXrTxc9vamXhOllh UH+0E3wvQbfdeBC1lcAVuDn85efW+AFiT/Phmdrf3dlk/KC2D4Ll5Dnw284QKxHZxpJa y9MGKc2hqespTB38wgfoiwW2be1eZMq7gV5WtC5vW/XC6J9r8lBgXNBPK+Rbtp7+8uxw pQQ6sSXr1N5z9CQItkGQdL0EidLm/3jWBDkVOPawSIxPtNKpsh6/NRFUHt3H8CETFCyX siCDvGLOuFnuTcSe/SGiZ3yRNWzqd08kRRP+iP+jDzzsmXG3Xw1QT1GEpigU3Be+Mxaf fsbg== X-Gm-Message-State: ACrzQf1bKd583iE2FwVRbjWH/Kl2LRnaynLKPbsYJWx3eUgWKhWnPcG3 MT1G/WXtWeTUR1W31DFj9PiQcA== X-Received: by 2002:a5d:668a:0:b0:22c:c79f:6a3c with SMTP id l10-20020a5d668a000000b0022cc79f6a3cmr2085372wru.252.1664452203183; Thu, 29 Sep 2022 04:50:03 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bi16-20020a05600c3d9000b003b4de550e34sm4003457wmb.40.2022.09.29.04.49.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2E6171FFE7; Thu, 29 Sep 2022 12:42:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Weiwei Li Subject: [PATCH v1 50/51] contrib/gitdm: add ISCAS to the academics group Date: Thu, 29 Sep 2022 12:42:30 +0100 Message-Id: <20220929114231.583801-51-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The English website (http://english.is.cas.cn/) in on a slightly different domain but has the same logo as http://www.iscas.ac.cn/. Signed-off-by: Alex Bennée Reviewed-by: Weiwei Li Message-Id: <20220926134609.3301945-6-alex.bennee@linaro.org> --- contrib/gitdm/group-map-academics | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/gitdm/group-map-academics b/contrib/gitdm/group-map-academics index 44745ca85b..877a11e69b 100644 --- a/contrib/gitdm/group-map-academics +++ b/contrib/gitdm/group-map-academics @@ -19,3 +19,6 @@ edu.cn # Boston University bu.edu + +# Institute of Software Chinese Academy of Sciences +iscas.ac.cn From patchwork Thu Sep 29 11:42:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610622 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp952748pvb; Thu, 29 Sep 2022 08:11:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6nEcu2OIQrF6CsmHFfKOOh4mLFCtVhWTnzPf7MvzymtjpSccKn1fuGH86Onuv4ITn+z5jf X-Received: by 2002:a05:622a:104:b0:35d:53cd:59c4 with SMTP id u4-20020a05622a010400b0035d53cd59c4mr2767498qtw.129.1664464273215; Thu, 29 Sep 2022 08:11:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664464273; cv=none; d=google.com; s=arc-20160816; b=sYVO4buUrtp9frQo1rIxmtJHubhanmXBYKoKH8l+ED7wumXNgMXvE8qNRduj52d+mI p3nZjALRA6fm1R2V3IOWwSIgTrBf8WuWJClG6hx/7c/LpEw5mmWBT8mfcomsnAxdGXU0 52NyAwvMf5bn4uDhvZUbo5KvEFsXysFc4yJ4gdF3hBfqVjqqn5zYQmIK+dKQyE1iPph/ /7zfOaR1YmhGLYyz689s2Z0THiJ5DGjtDsabrr/oLnbQpoQJdlhYqXCLQos2NiC3fFnB GbyVUatnEjWGJe+ETWASjchBdomxcbb2fZQAXQEXyo2GifJ11xztVw15fhTk9GztSeAz MsVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mRFn/+xNvAxYQS5AsEN4ILDp7otuD2FLSBq+XpgS+Ok=; b=UqxDZeCMK2R7Y6xwYIyBqkfvUrEncS1stzx24adtu7T/2fC6SKJAfk/3TEFD05v83k yb4OCS/3k0wzkI9mhBm/Gd4dzpJpA4QGhZ80fsL7Ru/4TC5/rX6P3VwYw0kKHmCd6s0s I54TS1BIVj96dw6793+rRyt4xTDCpYb2tjm0NyicCw/cirrp1P7J/h9hQ70n7MFtQAET WHhJPCr3U2E4z2LIi8brYeDn22wZquWVF95ue2jbSxhNWut+/HXrHmSdtu6KIFw5kHBe z4bzUBfT5yYe2Os1U/vmTq8EhtTUy6OA48NNetvBcdU2fs3jb3ADzgY0k86sdG2MkMOG +j4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=J4lNCUh2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 66-20020a370a45000000b006cf8135e7a3si1349241qkk.56.2022.09.29.08.11.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 08:11:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=J4lNCUh2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odvBw-0006Fk-Nc for patch@linaro.org; Thu, 29 Sep 2022 11:11:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odsD0-0007TK-Mq for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:06 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:37416) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odsCs-0004Ma-O0 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:06 -0400 Received: by mail-wm1-x329.google.com with SMTP id z13-20020a7bc7cd000000b003b5054c6f9bso3084417wmk.2 for ; Thu, 29 Sep 2022 04:59:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=mRFn/+xNvAxYQS5AsEN4ILDp7otuD2FLSBq+XpgS+Ok=; b=J4lNCUh2o4rOWW6W5x/C9jwEOCIqE0LG7YNkEAjsX6kPE43D9Np/9CXbrDMqJOQZfR 1RpTtD2AouHHw86DxfSr17WTOebAFG3eK33vKuPBYTwV8w/vRcZK9lElcaSeaZwF12YL v6UFww+xhii1PX9GfaFtJtkFVIxbsOo9Hka+Rn7lGPmU/IUbCWkdX0cr00xKYU2eL/O4 vQvbD3X/PITHkWTBXZx29vDEkQ+MZjw5u13ECmK8I4rjMPq8NesVdfX1LX0tJwg91Lbn ggRzmF9cykTOWoBSEe7IoKs7AqFZSo+blp93pcZ3JEiNZIqZeeRQhb4KOe48N/4L4nwY yjwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=mRFn/+xNvAxYQS5AsEN4ILDp7otuD2FLSBq+XpgS+Ok=; b=vhzFBTAtHbIa4ZHcA1H9pqdL7WgVS7Tnv5jYBic1lDeAjpe9bNCKbHBJAuVvWh3Ksl 3etcqRIfm8ks3tGLitBfMcL8bFoQ+LaoOOZNjTWIxxoKE629rSxa3k3rp0sNxemWbv2t zxH1jO7vRjHHbtbg9l0PJh+Q6VOBWMRLCIiOJOA60VF3AScYe667Jl1lrdD1FgLhJv9l 5XCil8kNmg3HL+kRJmAm2RBQOJJ6xGl527j6BvGGsWNfHiR3fOkY/h7YHCDebvpkMo4+ yFn0PEpxB3P7sBid1Zi2X/6jX0H3fYAhw6xJ11c+9iBus9LSzi4UOP1L91abkzyPKJQu ZXuw== X-Gm-Message-State: ACrzQf0+QUoWB2Uk5VRsWuJe7mMPm+hA/kZA867sxeUoFFB44wF1NcDZ 21CEhUA3URxA+KPdGy3R7BAo7g== X-Received: by 2002:a7b:ca46:0:b0:3b4:7ff1:4fcc with SMTP id m6-20020a7bca46000000b003b47ff14fccmr10730275wml.47.1664452795880; Thu, 29 Sep 2022 04:59:55 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m17-20020a05600c3b1100b003b476cabf1csm5781042wms.26.2022.09.29.04.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 456221FFC0; Thu, 29 Sep 2022 12:42:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Hyman Huang Subject: [PATCH v1 51/51] contrib/gitdm: add China Telecom to the domain map Date: Thu, 29 Sep 2022 12:42:31 +0100 Message-Id: <20220929114231.583801-52-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Acked-by: Hyman Huang(黄勇) Message-Id: <20220926134609.3301945-8-alex.bennee@linaro.org> --- contrib/gitdm/domain-map | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map index 434ef53afc..3727918641 100644 --- a/contrib/gitdm/domain-map +++ b/contrib/gitdm/domain-map @@ -10,6 +10,7 @@ bytedance.com ByteDance cmss.chinamobile.com China Mobile citrix.com Citrix crudebyte.com Crudebyte +chinatelecom.cn China Telecom eldorado.org.br Instituto de Pesquisas Eldorado fujitsu.com Fujitsu google.com Google