From patchwork Mon Oct 31 13:09:40 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: 620228 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2816805pvb; Mon, 31 Oct 2022 06:17:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6BdHoNxA5JmCjysFTnVUD7fKt6y5A5U40wDs0YjB4dPyFVIhSDZEyw3U5cyOqj13XNtyJJ X-Received: by 2002:ab0:1d94:0:b0:411:3fc9:4c66 with SMTP id l20-20020ab01d94000000b004113fc94c66mr3802272uak.45.1667222264494; Mon, 31 Oct 2022 06:17:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222264; cv=none; d=google.com; s=arc-20160816; b=jc9nq50jmxzwPo+U091MSVSHcyO2dpAVfgRc2bzOBHMoZBCTkJXAYk71jXQif3a3WC JBotmrTSinjw/wY64JR54c6MvxQcbwIQz9nV8azn1D/4B0YgJKG59M/strYYNMxR76hR XRPnLoN8jYVoz+CqXeV0HkS83vnVz2YhKz6DoO7+XpTgrD+Pk67kH4QLsKAYgGh4Ro4A KRs29zWHn9qJovTwro/zlCRvcnuWphzMOPQaCL+ddtXDk0SW0txEbAQvPG+aKQn3dkD/ uzO+G6GQWnjtxJOycVlDhT3BTteW7HfE1hof59AoHtCEFi9eEtx02D+eD+Y1KYmEvv2s wQLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=EGpVj/x6emk+Gk8JKMkbCIdsGLC6yCTvoW6GyyQvtYM=; b=df0Xad3v123izXphgPLSGa2bN4VaMXJIFQ2m6O5jTqSFCnquHynIAukgtnxDKALBzh XQTM16IPYPGGz/7UmPdLl4S0oIY/DoznmPJcyGjFdfplysE+2wL9X3KiQmqyED1xboyI XTL5aSUI84BM12YUYIig953F2mLivXUWODTN4WYljn5h3qkSCYMFIfeWbl3sE0YvBtW9 PZR1LOjZGxpr2rleqdP6Ug3ojFlmYJ+4F+68wOcFLsShFdqkI9RZJe4+H9aLCa6nP9wX t+kpQ33Sy+kEduXR2p/uLBHIEyRjf5RUXz1QU0W7ada6Op3EI+gff+yvFX0jsfgMdOQZ +qfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=msg1uJih; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 f129-20020a676a87000000b003aa4a7a5a6dsi1142761vsc.576.2022.10.31.06.17.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:17:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=msg1uJih; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUZR-0002hw-Be; Mon, 31 Oct 2022 09:11:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUYj-0007wn-Fy for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:39 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUYR-0001CZ-Pr for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:31 -0400 Received: by mail-wr1-x434.google.com with SMTP id v1so15889108wrt.11 for ; Mon, 31 Oct 2022 06:10:13 -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 :message-id:reply-to; bh=EGpVj/x6emk+Gk8JKMkbCIdsGLC6yCTvoW6GyyQvtYM=; b=msg1uJihni8aDVMTGZNA4efDITHV8HGQJ2OGQQYv/HS2ZFBjvkzfg7s7ESdTITocWT OAMV50fGLU9gKL3zcYuc2FWiJo3jGBgcIlDq88z03+dUwmVPMzDlk8reV94dfrnAElQR k0DKNEVKKENEfGfNw2ImpTGpMd3NJsvrSGwra7Wo5GLz/z1Uu5KZtTbxhNtTLvuw2ngF hMriFNyfoI1ypQUe8ATELiNjOLJb4L52A4fj2a+B1tj4UGHMfL/+eMPSxQOGh8xsG6Ir yir9uRKlC4hnaxCHA1PgusZTAl1wMld/tq5pQpBzarMtoA9ZsTMLcZr4QZeXHwPgyqiH aWBQ== 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:message-id:reply-to; bh=EGpVj/x6emk+Gk8JKMkbCIdsGLC6yCTvoW6GyyQvtYM=; b=jSWxtMTbsSJl1I9qbfKi4XzvEq73sNmtxNXKVCHmetbNT2sagxLXOaYC0ig7h7YClO 11/y3ThhvpshXc2VDOXisASHO4NN6stuiYwtVMPp2fD7qKtT57wt5zIWRZq2+3PT07CQ mTT5BAqjRyarK30yhAQqx7eCoii8kB2xjtQOSTOGOJoXKDvXBdUnVPj8GWZS+Vtnwx9c 1Mp95Trc01q9eGIs5pNd0eE8A9NuhyunEdPcJL0xCh1ph52D2Dmirk+YibcQpjVeJT5c GaJrToJ2L4Dn7a6cs5x6KOot9IpSpV9cSQ/axkT3ukeWfGsrLItftK9bVA8BHOWGc0Qf 5Pyw== X-Gm-Message-State: ACrzQf37NohCtgMcuEfIlN5KZcCD+1SGPBUdPEYZsyG1bjcGOXM88l1y KOzLRiNHWuChaJPMtT7KMDdy8g== X-Received: by 2002:adf:e84f:0:b0:235:d53a:2d7f with SMTP id d15-20020adfe84f000000b00235d53a2d7fmr8215645wrn.334.1667221812169; Mon, 31 Oct 2022 06:10:12 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h10-20020a05600c314a00b003a1980d55c4sm7435671wmo.47.2022.10.31.06.10.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:10:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CF06E1FFB8; Mon, 31 Oct 2022 13:10:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 01/31] tests/lcitool: Rename non-Debian specific helper Date: Mon, 31 Oct 2022 13:09:40 +0000 Message-Id: <20221031131010.682984-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org This helper is not Debian specific, rename it to cross_build(). Signed-off-by: Alex Bennée Acked-by: Richard Henderson Message-Id: <20220929114231.583801-10-alex.bennee@linaro.org> Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20221028095659.48734-2-philmd@linaro.org> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index e45c99adbe..a6a7c23c1d 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,45 @@ 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")) # # Cirrus packages lists for GitLab From patchwork Mon Oct 31 13:09: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: 620230 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2817061pvb; Mon, 31 Oct 2022 06:18:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM74wudASb/Bq7LPwN54VGkpJVEFfgDpgLx9WKgbil+w9QF2Bs5frJcRnl9GiV1P4Ha5Ije6 X-Received: by 2002:a05:6214:268a:b0:4bb:68c1:8216 with SMTP id gm10-20020a056214268a00b004bb68c18216mr11039500qvb.70.1667222284925; Mon, 31 Oct 2022 06:18:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222284; cv=none; d=google.com; s=arc-20160816; b=SVJm12ODxqz5q8KBFs4t+Hrht12/4UX02aOt6ZpnwrMifNt/rA0R5EtR6hi3yxWm6z q4XtFd5Jv7yl+mdbkq3NmhFavSodgqKmeEGHyizOtDefKC2W8CDymnjOKA8ICEYy2vEP YakoOmlIi0/wPRXNzcABNn7qfkFwUyMH8B2WYq5zEeB6lxIiVQv6bPhx3FIxSYXm1Qqp JKjHZOVHUG9k9u/nMatHG75su10Xyh3ZB5rGWBbQtch7FEsRkJ5yhgyvt1sSIlJcK173 1bPZkhgMf+3wGip1jA0LEiXc5BVZ12GUMN6y4AZsrDKr2ojNl/96MijGxXeb4vQbIrCT EHRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=BGrvsJCO6/ODL2zTLqCZmfvZETj7sWT3qKrT9uQPCqI=; b=hQCTDI/fj2UsBayi+lz30d2/5Nl5VbRnllWkUBWp3F5Kc5CFFzw78PE1Qqb3uSjcPA JHOspXmXvhea0gVaHMfAhyS49aO3JLG7msHd37J3HxLfNxargpNftbTcq/v3CatuG0H7 oixZR0o45xjjOz5kAm8pypvdj2sar66+ksmzY5ewHuaCPTtvDa5nh3VR/x4FnWJJB009 GGXPJLm1qDChVaCulqBvO8wyKZB1dM6syO7/PQGb2qt/PmePooqt1b4Q6kKEsxNDNXFZ gydshUnIBpqwkJnHWE0DUDtQvNOuOXdUmy8wMV434xh4qKLcAAYjB0AnR+i3eCAj134j FdGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=smRynKb6; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 bi29-20020a05620a319d00b006bb9cfda390si4119042qkb.31.2022.10.31.06.18.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:18:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=smRynKb6; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUZM-0002Y9-8b; Mon, 31 Oct 2022 09:11:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUYd-0007uJ-SS for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:29 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUYV-0001E4-NV for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:26 -0400 Received: by mail-wr1-x42b.google.com with SMTP id cl5so4256714wrb.9 for ; Mon, 31 Oct 2022 06:10:17 -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 :message-id:reply-to; bh=BGrvsJCO6/ODL2zTLqCZmfvZETj7sWT3qKrT9uQPCqI=; b=smRynKb6bnMCT0HSi56+VOr4bxwTR0E/EHZH/zXSFTletDUxCtguBDUH0qZzL/XIw7 8S+K+6gQ/nIMOg4ResGqRagqEMRI1ecdEnexiAgG7GYWjzlLLz7G6yPBk+xR9FxkSho/ fQpEEmVMoVkjuHFTUaHi7QEJNEL1MXhZV5Cst3PLAbipdigflvpID5ilY8MQ5h1Y7kYw fgW5Dti4mnZEuT0iuM6kFNlG0nRuHLWF313iTQ9DRIY9bgMB3bQDLrbappn8LkG63jlR 94ZhA30jNsITUgfNCSLT3HMk3lT/3jjYA1MVtidUpdRSXwY4zJLB8Zx8BS4vUGEXX0P7 MxKg== 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:message-id:reply-to; bh=BGrvsJCO6/ODL2zTLqCZmfvZETj7sWT3qKrT9uQPCqI=; b=YtkPTet+6nLTVdmek33Fn8KR7K/t7d3XYxpB333M3hStCxAL3jnItpBvL2/gFYMcES GQiQw6SvdaPytaVFzrkwVk9tjS9TN8NC2nnyCJqzTiYmPnL4vS9yENeH0NxN1ub3NXHh s7/Lep7G+unIUi6P0AcpcFU7D9y9YSljyRPOQ325S594mmO4UtE+l8MuJkW4Jj6qvUs7 KSWqynm7BR+63WVt+Bp8YNu3lAg40OeYUBZ5J10UeU86yC83yp+FyxsVsCYiDd6Mhzgj MRhGA+E0/YH/a/uBFlSaTTvwcmrsGtfOcVJYd8NdLn9mB+0D/B1Iy99jXZ8LCj53a7Y7 PncA== X-Gm-Message-State: ACrzQf22I6/5fFxiJzPGlnMDLAfuFfCXNtBJgpgG3C7JcBG0Nw95lQ0p vmT5tPz7dZw18b6+i7x5ayk8aQ== X-Received: by 2002:adf:d1e6:0:b0:236:5ead:eac0 with SMTP id g6-20020adfd1e6000000b002365eadeac0mr7976076wrd.629.1667221814911; Mon, 31 Oct 2022 06:10:14 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id k3-20020a5d5183000000b00231ed902a4esm7245361wrv.5.2022.10.31.06.10.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:10:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 28BC71FFBA; Mon, 31 Oct 2022 13:10:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 02/31] tests/lcitool: Refresh to latest libvirt-ci module Date: Mon, 31 Oct 2022 13:09:41 +0000 Message-Id: <20221031131010.682984-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org We need an updated lcitool for this to deal with the weirdness of a 32bit nsis tool for both 32 and 64 bit builds. As a result there are some minor whitespace and re-order changes in a bunch of the docker files. Signed-off-by: Alex Bennée Acked-by: Richard Henderson Message-Id: <20220929114231.583801-10-alex.bennee@linaro.org> Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20221028095659.48734-3-philmd@linaro.org> diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 9b7541261a..a854ae6b78 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -119,8 +119,8 @@ RUN apk update && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" 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" diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index d89113c0df..1f70d41aeb 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -130,8 +130,8 @@ RUN dnf distro-sync -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" 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" diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 9047759e76..8311024632 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -11,62 +11,62 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - libpcre2-dev \ - libspice-protocol-dev \ - llvm \ - locales \ - make \ - meson \ - ncat \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libglib2.0-dev \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" 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 export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture amd64 && \ @@ -74,76 +74,76 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-x86-64-linux-gnu \ - gcc-x86-64-linux-gnu \ - libaio-dev:amd64 \ - libasan5:amd64 \ - libasound2-dev:amd64 \ - libattr1-dev:amd64 \ - libbpf-dev:amd64 \ - libbrlapi-dev:amd64 \ - libbz2-dev:amd64 \ - libc6-dev:amd64 \ - libcacard-dev:amd64 \ - libcap-ng-dev:amd64 \ - libcapstone-dev:amd64 \ - libcmocka-dev:amd64 \ - libcurl4-gnutls-dev:amd64 \ - libdaxctl-dev:amd64 \ - libdrm-dev:amd64 \ - libepoxy-dev:amd64 \ - libfdt-dev:amd64 \ - libffi-dev:amd64 \ - libfuse3-dev:amd64 \ - libgbm-dev:amd64 \ - libgcrypt20-dev:amd64 \ - libglib2.0-dev:amd64 \ - libglusterfs-dev:amd64 \ - libgnutls28-dev:amd64 \ - libgtk-3-dev:amd64 \ - libibumad-dev:amd64 \ - libibverbs-dev:amd64 \ - libiscsi-dev:amd64 \ - libjemalloc-dev:amd64 \ - libjpeg62-turbo-dev:amd64 \ - libjson-c-dev:amd64 \ - liblttng-ust-dev:amd64 \ - liblzo2-dev:amd64 \ - libncursesw5-dev:amd64 \ - libnfs-dev:amd64 \ - libnuma-dev:amd64 \ - libpam0g-dev:amd64 \ - libpixman-1-dev:amd64 \ - libpmem-dev:amd64 \ - libpng-dev:amd64 \ - libpulse-dev:amd64 \ - librbd-dev:amd64 \ - librdmacm-dev:amd64 \ - libsasl2-dev:amd64 \ - libsdl2-dev:amd64 \ - libsdl2-image-dev:amd64 \ - libseccomp-dev:amd64 \ - libselinux1-dev:amd64 \ - libslirp-dev:amd64 \ - libsnappy-dev:amd64 \ - libspice-server-dev:amd64 \ - libssh-gcrypt-dev:amd64 \ - libsystemd-dev:amd64 \ - libtasn1-6-dev:amd64 \ - libubsan1:amd64 \ - libudev-dev:amd64 \ - liburing-dev:amd64 \ - libusb-1.0-0-dev:amd64 \ - libusbredirhost-dev:amd64 \ - libvdeplug-dev:amd64 \ - libvirglrenderer-dev:amd64 \ - libvte-2.91-dev:amd64 \ - libxen-dev:amd64 \ - libzstd-dev:amd64 \ - nettle-dev:amd64 \ - systemtap-sdt-dev:amd64 \ - xfslibs-dev:amd64 \ - zlib1g-dev:amd64 && \ + g++-x86-64-linux-gnu \ + gcc-x86-64-linux-gnu \ + libaio-dev:amd64 \ + libasan5:amd64 \ + libasound2-dev:amd64 \ + libattr1-dev:amd64 \ + libbpf-dev:amd64 \ + libbrlapi-dev:amd64 \ + libbz2-dev:amd64 \ + libc6-dev:amd64 \ + libcacard-dev:amd64 \ + libcap-ng-dev:amd64 \ + libcapstone-dev:amd64 \ + libcmocka-dev:amd64 \ + libcurl4-gnutls-dev:amd64 \ + libdaxctl-dev:amd64 \ + libdrm-dev:amd64 \ + libepoxy-dev:amd64 \ + libfdt-dev:amd64 \ + libffi-dev:amd64 \ + libfuse3-dev:amd64 \ + libgbm-dev:amd64 \ + libgcrypt20-dev:amd64 \ + libglib2.0-dev:amd64 \ + libglusterfs-dev:amd64 \ + libgnutls28-dev:amd64 \ + libgtk-3-dev:amd64 \ + libibumad-dev:amd64 \ + libibverbs-dev:amd64 \ + libiscsi-dev:amd64 \ + libjemalloc-dev:amd64 \ + libjpeg62-turbo-dev:amd64 \ + libjson-c-dev:amd64 \ + liblttng-ust-dev:amd64 \ + liblzo2-dev:amd64 \ + libncursesw5-dev:amd64 \ + libnfs-dev:amd64 \ + libnuma-dev:amd64 \ + libpam0g-dev:amd64 \ + libpixman-1-dev:amd64 \ + libpmem-dev:amd64 \ + libpng-dev:amd64 \ + libpulse-dev:amd64 \ + librbd-dev:amd64 \ + librdmacm-dev:amd64 \ + libsasl2-dev:amd64 \ + libsdl2-dev:amd64 \ + libsdl2-image-dev:amd64 \ + libseccomp-dev:amd64 \ + libselinux1-dev:amd64 \ + libslirp-dev:amd64 \ + libsnappy-dev:amd64 \ + libspice-server-dev:amd64 \ + libssh-gcrypt-dev:amd64 \ + libsystemd-dev:amd64 \ + libtasn1-6-dev:amd64 \ + libubsan1:amd64 \ + libudev-dev:amd64 \ + liburing-dev:amd64 \ + libusb-1.0-0-dev:amd64 \ + libusbredirhost-dev:amd64 \ + libvdeplug-dev:amd64 \ + libvirglrenderer-dev:amd64 \ + libvte-2.91-dev:amd64 \ + libxen-dev:amd64 \ + libzstd-dev:amd64 \ + nettle-dev:amd64 \ + systemtap-sdt-dev:amd64 \ + xfslibs-dev:amd64 \ + zlib1g-dev:amd64 && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index a8b728ca64..6db3079321 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -11,123 +11,123 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - clang \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - g++ \ - gcc \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libaio-dev \ - libasan5 \ - libasound2-dev \ - libattr1-dev \ - libbpf-dev \ - libbrlapi-dev \ - libbz2-dev \ - libc6-dev \ - libcacard-dev \ - libcap-ng-dev \ - libcapstone-dev \ - libcmocka-dev \ - libcurl4-gnutls-dev \ - libdaxctl-dev \ - libdrm-dev \ - libepoxy-dev \ - libfdt-dev \ - libffi-dev \ - libfuse3-dev \ - libgbm-dev \ - libgcrypt20-dev \ - libglib2.0-dev \ - libglusterfs-dev \ - libgnutls28-dev \ - libgtk-3-dev \ - libibumad-dev \ - libibverbs-dev \ - libiscsi-dev \ - libjemalloc-dev \ - libjpeg62-turbo-dev \ - libjson-c-dev \ - liblttng-ust-dev \ - liblzo2-dev \ - libncursesw5-dev \ - libnfs-dev \ - libnuma-dev \ - libpam0g-dev \ - libpcre2-dev \ - libpixman-1-dev \ - libpmem-dev \ - libpng-dev \ - libpulse-dev \ - librbd-dev \ - librdmacm-dev \ - libsasl2-dev \ - libsdl2-dev \ - libsdl2-image-dev \ - libseccomp-dev \ - libselinux1-dev \ - libslirp-dev \ - libsnappy-dev \ - libspice-protocol-dev \ - libspice-server-dev \ - libssh-gcrypt-dev \ - libsystemd-dev \ - libtasn1-6-dev \ - libubsan1 \ - libudev-dev \ - liburing-dev \ - libusb-1.0-0-dev \ - libusbredirhost-dev \ - libvdeplug-dev \ - libvirglrenderer-dev \ - libvte-2.91-dev \ - libxen-dev \ - libzstd-dev \ - llvm \ - locales \ - make \ - meson \ - multipath-tools \ - ncat \ - nettle-dev \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - systemtap-sdt-dev \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo \ - xfslibs-dev \ - zlib1g-dev && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + clang \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + g++ \ + gcc \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libaio-dev \ + libasan5 \ + libasound2-dev \ + libattr1-dev \ + libbpf-dev \ + libbrlapi-dev \ + libbz2-dev \ + libc6-dev \ + libcacard-dev \ + libcap-ng-dev \ + libcapstone-dev \ + libcmocka-dev \ + libcurl4-gnutls-dev \ + libdaxctl-dev \ + libdrm-dev \ + libepoxy-dev \ + libfdt-dev \ + libffi-dev \ + libfuse3-dev \ + libgbm-dev \ + libgcrypt20-dev \ + libglib2.0-dev \ + libglusterfs-dev \ + libgnutls28-dev \ + libgtk-3-dev \ + libibumad-dev \ + libibverbs-dev \ + libiscsi-dev \ + libjemalloc-dev \ + libjpeg62-turbo-dev \ + libjson-c-dev \ + liblttng-ust-dev \ + liblzo2-dev \ + libncursesw5-dev \ + libnfs-dev \ + libnuma-dev \ + libpam0g-dev \ + libpcre2-dev \ + libpixman-1-dev \ + libpmem-dev \ + libpng-dev \ + libpulse-dev \ + librbd-dev \ + librdmacm-dev \ + libsasl2-dev \ + libsdl2-dev \ + libsdl2-image-dev \ + libseccomp-dev \ + libselinux1-dev \ + libslirp-dev \ + libsnappy-dev \ + libspice-protocol-dev \ + libspice-server-dev \ + libssh-gcrypt-dev \ + libsystemd-dev \ + libtasn1-6-dev \ + libubsan1 \ + libudev-dev \ + liburing-dev \ + libusb-1.0-0-dev \ + libusbredirhost-dev \ + libvdeplug-dev \ + libvirglrenderer-dev \ + libvte-2.91-dev \ + libxen-dev \ + libzstd-dev \ + llvm \ + locales \ + make \ + meson \ + multipath-tools \ + ncat \ + nettle-dev \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + systemtap-sdt-dev \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo \ + xfslibs-dev \ + zlib1g-dev && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -140,11 +140,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" 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" # netmap/cscope/global RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index 17a5709245..1fbe2b1376 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -11,62 +11,62 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - libpcre2-dev \ - libspice-protocol-dev \ - llvm \ - locales \ - make \ - meson \ - ncat \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libglib2.0-dev \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" 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 export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ @@ -74,75 +74,75 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-aarch64-linux-gnu \ - gcc-aarch64-linux-gnu \ - libaio-dev:arm64 \ - libasan5:arm64 \ - libasound2-dev:arm64 \ - libattr1-dev:arm64 \ - libbpf-dev:arm64 \ - libbrlapi-dev:arm64 \ - libbz2-dev:arm64 \ - libc6-dev:arm64 \ - libcacard-dev:arm64 \ - libcap-ng-dev:arm64 \ - libcapstone-dev:arm64 \ - libcmocka-dev:arm64 \ - libcurl4-gnutls-dev:arm64 \ - libdaxctl-dev:arm64 \ - libdrm-dev:arm64 \ - libepoxy-dev:arm64 \ - libfdt-dev:arm64 \ - libffi-dev:arm64 \ - libfuse3-dev:arm64 \ - libgbm-dev:arm64 \ - libgcrypt20-dev:arm64 \ - libglib2.0-dev:arm64 \ - libglusterfs-dev:arm64 \ - libgnutls28-dev:arm64 \ - libgtk-3-dev:arm64 \ - libibumad-dev:arm64 \ - libibverbs-dev:arm64 \ - libiscsi-dev:arm64 \ - libjemalloc-dev:arm64 \ - libjpeg62-turbo-dev:arm64 \ - libjson-c-dev:arm64 \ - liblttng-ust-dev:arm64 \ - liblzo2-dev:arm64 \ - libncursesw5-dev:arm64 \ - libnfs-dev:arm64 \ - libnuma-dev:arm64 \ - libpam0g-dev:arm64 \ - libpixman-1-dev:arm64 \ - libpng-dev:arm64 \ - libpulse-dev:arm64 \ - librbd-dev:arm64 \ - librdmacm-dev:arm64 \ - libsasl2-dev:arm64 \ - libsdl2-dev:arm64 \ - libsdl2-image-dev:arm64 \ - libseccomp-dev:arm64 \ - libselinux1-dev:arm64 \ - libslirp-dev:arm64 \ - libsnappy-dev:arm64 \ - libspice-server-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ - libsystemd-dev:arm64 \ - libtasn1-6-dev:arm64 \ - libubsan1:arm64 \ - libudev-dev:arm64 \ - liburing-dev:arm64 \ - libusb-1.0-0-dev:arm64 \ - libusbredirhost-dev:arm64 \ - libvdeplug-dev:arm64 \ - libvirglrenderer-dev:arm64 \ - libvte-2.91-dev:arm64 \ - libxen-dev:arm64 \ - libzstd-dev:arm64 \ - nettle-dev:arm64 \ - systemtap-sdt-dev:arm64 \ - xfslibs-dev:arm64 \ - zlib1g-dev:arm64 && \ + g++-aarch64-linux-gnu \ + gcc-aarch64-linux-gnu \ + libaio-dev:arm64 \ + libasan5:arm64 \ + libasound2-dev:arm64 \ + libattr1-dev:arm64 \ + libbpf-dev:arm64 \ + libbrlapi-dev:arm64 \ + libbz2-dev:arm64 \ + libc6-dev:arm64 \ + libcacard-dev:arm64 \ + libcap-ng-dev:arm64 \ + libcapstone-dev:arm64 \ + libcmocka-dev:arm64 \ + libcurl4-gnutls-dev:arm64 \ + libdaxctl-dev:arm64 \ + libdrm-dev:arm64 \ + libepoxy-dev:arm64 \ + libfdt-dev:arm64 \ + libffi-dev:arm64 \ + libfuse3-dev:arm64 \ + libgbm-dev:arm64 \ + libgcrypt20-dev:arm64 \ + libglib2.0-dev:arm64 \ + libglusterfs-dev:arm64 \ + libgnutls28-dev:arm64 \ + libgtk-3-dev:arm64 \ + libibumad-dev:arm64 \ + libibverbs-dev:arm64 \ + libiscsi-dev:arm64 \ + libjemalloc-dev:arm64 \ + libjpeg62-turbo-dev:arm64 \ + libjson-c-dev:arm64 \ + liblttng-ust-dev:arm64 \ + liblzo2-dev:arm64 \ + libncursesw5-dev:arm64 \ + libnfs-dev:arm64 \ + libnuma-dev:arm64 \ + libpam0g-dev:arm64 \ + libpixman-1-dev:arm64 \ + libpng-dev:arm64 \ + libpulse-dev:arm64 \ + librbd-dev:arm64 \ + librdmacm-dev:arm64 \ + libsasl2-dev:arm64 \ + libsdl2-dev:arm64 \ + libsdl2-image-dev:arm64 \ + libseccomp-dev:arm64 \ + libselinux1-dev:arm64 \ + libslirp-dev:arm64 \ + libsnappy-dev:arm64 \ + libspice-server-dev:arm64 \ + libssh-gcrypt-dev:arm64 \ + libsystemd-dev:arm64 \ + libtasn1-6-dev:arm64 \ + libubsan1:arm64 \ + libudev-dev:arm64 \ + liburing-dev:arm64 \ + libusb-1.0-0-dev:arm64 \ + libusbredirhost-dev:arm64 \ + libvdeplug-dev:arm64 \ + libvirglrenderer-dev:arm64 \ + libvte-2.91-dev:arm64 \ + libxen-dev:arm64 \ + libzstd-dev:arm64 \ + nettle-dev:arm64 \ + systemtap-sdt-dev:arm64 \ + xfslibs-dev:arm64 \ + zlib1g-dev:arm64 && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index 701fc70db0..a430900505 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -11,62 +11,62 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - libpcre2-dev \ - libspice-protocol-dev \ - llvm \ - locales \ - make \ - meson \ - ncat \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libglib2.0-dev \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" 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 export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ @@ -74,74 +74,74 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-arm-linux-gnueabi \ - gcc-arm-linux-gnueabi \ - libaio-dev:armel \ - libasan5:armel \ - libasound2-dev:armel \ - libattr1-dev:armel \ - libbpf-dev:armel \ - libbrlapi-dev:armel \ - libbz2-dev:armel \ - libc6-dev:armel \ - libcacard-dev:armel \ - libcap-ng-dev:armel \ - libcapstone-dev:armel \ - libcmocka-dev:armel \ - libcurl4-gnutls-dev:armel \ - libdaxctl-dev:armel \ - libdrm-dev:armel \ - libepoxy-dev:armel \ - libfdt-dev:armel \ - libffi-dev:armel \ - libfuse3-dev:armel \ - libgbm-dev:armel \ - libgcrypt20-dev:armel \ - libglib2.0-dev:armel \ - libglusterfs-dev:armel \ - libgnutls28-dev:armel \ - libgtk-3-dev:armel \ - libibumad-dev:armel \ - libibverbs-dev:armel \ - libiscsi-dev:armel \ - libjemalloc-dev:armel \ - libjpeg62-turbo-dev:armel \ - libjson-c-dev:armel \ - liblttng-ust-dev:armel \ - liblzo2-dev:armel \ - libncursesw5-dev:armel \ - libnfs-dev:armel \ - libnuma-dev:armel \ - libpam0g-dev:armel \ - libpixman-1-dev:armel \ - libpng-dev:armel \ - libpulse-dev:armel \ - librbd-dev:armel \ - librdmacm-dev:armel \ - libsasl2-dev:armel \ - libsdl2-dev:armel \ - libsdl2-image-dev:armel \ - libseccomp-dev:armel \ - libselinux1-dev:armel \ - libslirp-dev:armel \ - libsnappy-dev:armel \ - libspice-server-dev:armel \ - libssh-gcrypt-dev:armel \ - libsystemd-dev:armel \ - libtasn1-6-dev:armel \ - libubsan1:armel \ - libudev-dev:armel \ - liburing-dev:armel \ - libusb-1.0-0-dev:armel \ - libusbredirhost-dev:armel \ - libvdeplug-dev:armel \ - libvirglrenderer-dev:armel \ - libvte-2.91-dev:armel \ - libzstd-dev:armel \ - nettle-dev:armel \ - systemtap-sdt-dev:armel \ - xfslibs-dev:armel \ - zlib1g-dev:armel && \ + g++-arm-linux-gnueabi \ + gcc-arm-linux-gnueabi \ + libaio-dev:armel \ + libasan5:armel \ + libasound2-dev:armel \ + libattr1-dev:armel \ + libbpf-dev:armel \ + libbrlapi-dev:armel \ + libbz2-dev:armel \ + libc6-dev:armel \ + libcacard-dev:armel \ + libcap-ng-dev:armel \ + libcapstone-dev:armel \ + libcmocka-dev:armel \ + libcurl4-gnutls-dev:armel \ + libdaxctl-dev:armel \ + libdrm-dev:armel \ + libepoxy-dev:armel \ + libfdt-dev:armel \ + libffi-dev:armel \ + libfuse3-dev:armel \ + libgbm-dev:armel \ + libgcrypt20-dev:armel \ + libglib2.0-dev:armel \ + libglusterfs-dev:armel \ + libgnutls28-dev:armel \ + libgtk-3-dev:armel \ + libibumad-dev:armel \ + libibverbs-dev:armel \ + libiscsi-dev:armel \ + libjemalloc-dev:armel \ + libjpeg62-turbo-dev:armel \ + libjson-c-dev:armel \ + liblttng-ust-dev:armel \ + liblzo2-dev:armel \ + libncursesw5-dev:armel \ + libnfs-dev:armel \ + libnuma-dev:armel \ + libpam0g-dev:armel \ + libpixman-1-dev:armel \ + libpng-dev:armel \ + libpulse-dev:armel \ + librbd-dev:armel \ + librdmacm-dev:armel \ + libsasl2-dev:armel \ + libsdl2-dev:armel \ + libsdl2-image-dev:armel \ + libseccomp-dev:armel \ + libselinux1-dev:armel \ + libslirp-dev:armel \ + libsnappy-dev:armel \ + libspice-server-dev:armel \ + libssh-gcrypt-dev:armel \ + libsystemd-dev:armel \ + libtasn1-6-dev:armel \ + libubsan1:armel \ + libudev-dev:armel \ + liburing-dev:armel \ + libusb-1.0-0-dev:armel \ + libusbredirhost-dev:armel \ + libvdeplug-dev:armel \ + libvirglrenderer-dev:armel \ + libvte-2.91-dev:armel \ + libzstd-dev:armel \ + nettle-dev:armel \ + systemtap-sdt-dev:armel \ + xfslibs-dev:armel \ + zlib1g-dev:armel && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index 5a11fe3900..4c54898420 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -11,62 +11,62 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - libpcre2-dev \ - libspice-protocol-dev \ - llvm \ - locales \ - make \ - meson \ - ncat \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libglib2.0-dev \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" 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 export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ @@ -74,75 +74,75 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-arm-linux-gnueabihf \ - gcc-arm-linux-gnueabihf \ - libaio-dev:armhf \ - libasan5:armhf \ - libasound2-dev:armhf \ - libattr1-dev:armhf \ - libbpf-dev:armhf \ - libbrlapi-dev:armhf \ - libbz2-dev:armhf \ - libc6-dev:armhf \ - libcacard-dev:armhf \ - libcap-ng-dev:armhf \ - libcapstone-dev:armhf \ - libcmocka-dev:armhf \ - libcurl4-gnutls-dev:armhf \ - libdaxctl-dev:armhf \ - libdrm-dev:armhf \ - libepoxy-dev:armhf \ - libfdt-dev:armhf \ - libffi-dev:armhf \ - libfuse3-dev:armhf \ - libgbm-dev:armhf \ - libgcrypt20-dev:armhf \ - libglib2.0-dev:armhf \ - libglusterfs-dev:armhf \ - libgnutls28-dev:armhf \ - libgtk-3-dev:armhf \ - libibumad-dev:armhf \ - libibverbs-dev:armhf \ - libiscsi-dev:armhf \ - libjemalloc-dev:armhf \ - libjpeg62-turbo-dev:armhf \ - libjson-c-dev:armhf \ - liblttng-ust-dev:armhf \ - liblzo2-dev:armhf \ - libncursesw5-dev:armhf \ - libnfs-dev:armhf \ - libnuma-dev:armhf \ - libpam0g-dev:armhf \ - libpixman-1-dev:armhf \ - libpng-dev:armhf \ - libpulse-dev:armhf \ - librbd-dev:armhf \ - librdmacm-dev:armhf \ - libsasl2-dev:armhf \ - libsdl2-dev:armhf \ - libsdl2-image-dev:armhf \ - libseccomp-dev:armhf \ - libselinux1-dev:armhf \ - libslirp-dev:armhf \ - libsnappy-dev:armhf \ - libspice-server-dev:armhf \ - libssh-gcrypt-dev:armhf \ - libsystemd-dev:armhf \ - libtasn1-6-dev:armhf \ - libubsan1:armhf \ - libudev-dev:armhf \ - liburing-dev:armhf \ - libusb-1.0-0-dev:armhf \ - libusbredirhost-dev:armhf \ - libvdeplug-dev:armhf \ - libvirglrenderer-dev:armhf \ - libvte-2.91-dev:armhf \ - libxen-dev:armhf \ - libzstd-dev:armhf \ - nettle-dev:armhf \ - systemtap-sdt-dev:armhf \ - xfslibs-dev:armhf \ - zlib1g-dev:armhf && \ + g++-arm-linux-gnueabihf \ + gcc-arm-linux-gnueabihf \ + libaio-dev:armhf \ + libasan5:armhf \ + libasound2-dev:armhf \ + libattr1-dev:armhf \ + libbpf-dev:armhf \ + libbrlapi-dev:armhf \ + libbz2-dev:armhf \ + libc6-dev:armhf \ + libcacard-dev:armhf \ + libcap-ng-dev:armhf \ + libcapstone-dev:armhf \ + libcmocka-dev:armhf \ + libcurl4-gnutls-dev:armhf \ + libdaxctl-dev:armhf \ + libdrm-dev:armhf \ + libepoxy-dev:armhf \ + libfdt-dev:armhf \ + libffi-dev:armhf \ + libfuse3-dev:armhf \ + libgbm-dev:armhf \ + libgcrypt20-dev:armhf \ + libglib2.0-dev:armhf \ + libglusterfs-dev:armhf \ + libgnutls28-dev:armhf \ + libgtk-3-dev:armhf \ + libibumad-dev:armhf \ + libibverbs-dev:armhf \ + libiscsi-dev:armhf \ + libjemalloc-dev:armhf \ + libjpeg62-turbo-dev:armhf \ + libjson-c-dev:armhf \ + liblttng-ust-dev:armhf \ + liblzo2-dev:armhf \ + libncursesw5-dev:armhf \ + libnfs-dev:armhf \ + libnuma-dev:armhf \ + libpam0g-dev:armhf \ + libpixman-1-dev:armhf \ + libpng-dev:armhf \ + libpulse-dev:armhf \ + librbd-dev:armhf \ + librdmacm-dev:armhf \ + libsasl2-dev:armhf \ + libsdl2-dev:armhf \ + libsdl2-image-dev:armhf \ + libseccomp-dev:armhf \ + libselinux1-dev:armhf \ + libslirp-dev:armhf \ + libsnappy-dev:armhf \ + libspice-server-dev:armhf \ + libssh-gcrypt-dev:armhf \ + libsystemd-dev:armhf \ + libtasn1-6-dev:armhf \ + libubsan1:armhf \ + libudev-dev:armhf \ + liburing-dev:armhf \ + libusb-1.0-0-dev:armhf \ + libusbredirhost-dev:armhf \ + libvdeplug-dev:armhf \ + libvirglrenderer-dev:armhf \ + libvte-2.91-dev:armhf \ + libxen-dev:armhf \ + libzstd-dev:armhf \ + nettle-dev:armhf \ + systemtap-sdt-dev:armhf \ + xfslibs-dev:armhf \ + zlib1g-dev:armhf && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index 9b90a4d6ff..c0d4b0df17 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -11,62 +11,62 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - libpcre2-dev \ - libspice-protocol-dev \ - llvm \ - locales \ - make \ - meson \ - ncat \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libglib2.0-dev \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" 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 export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ @@ -74,72 +74,72 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-mips64el-linux-gnuabi64 \ - gcc-mips64el-linux-gnuabi64 \ - libaio-dev:mips64el \ - libasound2-dev:mips64el \ - libattr1-dev:mips64el \ - libbpf-dev:mips64el \ - libbrlapi-dev:mips64el \ - libbz2-dev:mips64el \ - libc6-dev:mips64el \ - libcacard-dev:mips64el \ - libcap-ng-dev:mips64el \ - libcapstone-dev:mips64el \ - libcmocka-dev:mips64el \ - libcurl4-gnutls-dev:mips64el \ - libdaxctl-dev:mips64el \ - libdrm-dev:mips64el \ - libepoxy-dev:mips64el \ - libfdt-dev:mips64el \ - libffi-dev:mips64el \ - libfuse3-dev:mips64el \ - libgbm-dev:mips64el \ - libgcrypt20-dev:mips64el \ - libglib2.0-dev:mips64el \ - libglusterfs-dev:mips64el \ - libgnutls28-dev:mips64el \ - libgtk-3-dev:mips64el \ - libibumad-dev:mips64el \ - libibverbs-dev:mips64el \ - libiscsi-dev:mips64el \ - libjemalloc-dev:mips64el \ - libjpeg62-turbo-dev:mips64el \ - libjson-c-dev:mips64el \ - liblttng-ust-dev:mips64el \ - liblzo2-dev:mips64el \ - libncursesw5-dev:mips64el \ - libnfs-dev:mips64el \ - libnuma-dev:mips64el \ - libpam0g-dev:mips64el \ - libpixman-1-dev:mips64el \ - libpng-dev:mips64el \ - libpulse-dev:mips64el \ - librbd-dev:mips64el \ - librdmacm-dev:mips64el \ - libsasl2-dev:mips64el \ - libsdl2-dev:mips64el \ - libsdl2-image-dev:mips64el \ - libseccomp-dev:mips64el \ - libselinux1-dev:mips64el \ - libslirp-dev:mips64el \ - libsnappy-dev:mips64el \ - libspice-server-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ - libsystemd-dev:mips64el \ - libtasn1-6-dev:mips64el \ - libudev-dev:mips64el \ - liburing-dev:mips64el \ - libusb-1.0-0-dev:mips64el \ - libusbredirhost-dev:mips64el \ - libvdeplug-dev:mips64el \ - libvirglrenderer-dev:mips64el \ - libvte-2.91-dev:mips64el \ - libzstd-dev:mips64el \ - nettle-dev:mips64el \ - systemtap-sdt-dev:mips64el \ - xfslibs-dev:mips64el \ - zlib1g-dev:mips64el && \ + g++-mips64el-linux-gnuabi64 \ + gcc-mips64el-linux-gnuabi64 \ + libaio-dev:mips64el \ + libasound2-dev:mips64el \ + libattr1-dev:mips64el \ + libbpf-dev:mips64el \ + libbrlapi-dev:mips64el \ + libbz2-dev:mips64el \ + libc6-dev:mips64el \ + libcacard-dev:mips64el \ + libcap-ng-dev:mips64el \ + libcapstone-dev:mips64el \ + libcmocka-dev:mips64el \ + libcurl4-gnutls-dev:mips64el \ + libdaxctl-dev:mips64el \ + libdrm-dev:mips64el \ + libepoxy-dev:mips64el \ + libfdt-dev:mips64el \ + libffi-dev:mips64el \ + libfuse3-dev:mips64el \ + libgbm-dev:mips64el \ + libgcrypt20-dev:mips64el \ + libglib2.0-dev:mips64el \ + libglusterfs-dev:mips64el \ + libgnutls28-dev:mips64el \ + libgtk-3-dev:mips64el \ + libibumad-dev:mips64el \ + libibverbs-dev:mips64el \ + libiscsi-dev:mips64el \ + libjemalloc-dev:mips64el \ + libjpeg62-turbo-dev:mips64el \ + libjson-c-dev:mips64el \ + liblttng-ust-dev:mips64el \ + liblzo2-dev:mips64el \ + libncursesw5-dev:mips64el \ + libnfs-dev:mips64el \ + libnuma-dev:mips64el \ + libpam0g-dev:mips64el \ + libpixman-1-dev:mips64el \ + libpng-dev:mips64el \ + libpulse-dev:mips64el \ + librbd-dev:mips64el \ + librdmacm-dev:mips64el \ + libsasl2-dev:mips64el \ + libsdl2-dev:mips64el \ + libsdl2-image-dev:mips64el \ + libseccomp-dev:mips64el \ + libselinux1-dev:mips64el \ + libslirp-dev:mips64el \ + libsnappy-dev:mips64el \ + libspice-server-dev:mips64el \ + libssh-gcrypt-dev:mips64el \ + libsystemd-dev:mips64el \ + libtasn1-6-dev:mips64el \ + libudev-dev:mips64el \ + liburing-dev:mips64el \ + libusb-1.0-0-dev:mips64el \ + libusbredirhost-dev:mips64el \ + libvdeplug-dev:mips64el \ + libvirglrenderer-dev:mips64el \ + libvte-2.91-dev:mips64el \ + libzstd-dev:mips64el \ + nettle-dev:mips64el \ + systemtap-sdt-dev:mips64el \ + xfslibs-dev:mips64el \ + zlib1g-dev:mips64el && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index 02feaf26cb..940b6794d1 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -11,62 +11,62 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - libpcre2-dev \ - libspice-protocol-dev \ - llvm \ - locales \ - make \ - meson \ - ncat \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libglib2.0-dev \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" 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 export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ @@ -74,72 +74,72 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-mipsel-linux-gnu \ - gcc-mipsel-linux-gnu \ - libaio-dev:mipsel \ - libasound2-dev:mipsel \ - libattr1-dev:mipsel \ - libbpf-dev:mipsel \ - libbrlapi-dev:mipsel \ - libbz2-dev:mipsel \ - libc6-dev:mipsel \ - libcacard-dev:mipsel \ - libcap-ng-dev:mipsel \ - libcapstone-dev:mipsel \ - libcmocka-dev:mipsel \ - libcurl4-gnutls-dev:mipsel \ - libdaxctl-dev:mipsel \ - libdrm-dev:mipsel \ - libepoxy-dev:mipsel \ - libfdt-dev:mipsel \ - libffi-dev:mipsel \ - libfuse3-dev:mipsel \ - libgbm-dev:mipsel \ - libgcrypt20-dev:mipsel \ - libglib2.0-dev:mipsel \ - libglusterfs-dev:mipsel \ - libgnutls28-dev:mipsel \ - libgtk-3-dev:mipsel \ - libibumad-dev:mipsel \ - libibverbs-dev:mipsel \ - libiscsi-dev:mipsel \ - libjemalloc-dev:mipsel \ - libjpeg62-turbo-dev:mipsel \ - libjson-c-dev:mipsel \ - liblttng-ust-dev:mipsel \ - liblzo2-dev:mipsel \ - libncursesw5-dev:mipsel \ - libnfs-dev:mipsel \ - libnuma-dev:mipsel \ - libpam0g-dev:mipsel \ - libpixman-1-dev:mipsel \ - libpng-dev:mipsel \ - libpulse-dev:mipsel \ - librbd-dev:mipsel \ - librdmacm-dev:mipsel \ - libsasl2-dev:mipsel \ - libsdl2-dev:mipsel \ - libsdl2-image-dev:mipsel \ - libseccomp-dev:mipsel \ - libselinux1-dev:mipsel \ - libslirp-dev:mipsel \ - libsnappy-dev:mipsel \ - libspice-server-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ - libsystemd-dev:mipsel \ - libtasn1-6-dev:mipsel \ - libudev-dev:mipsel \ - liburing-dev:mipsel \ - libusb-1.0-0-dev:mipsel \ - libusbredirhost-dev:mipsel \ - libvdeplug-dev:mipsel \ - libvirglrenderer-dev:mipsel \ - libvte-2.91-dev:mipsel \ - libzstd-dev:mipsel \ - nettle-dev:mipsel \ - systemtap-sdt-dev:mipsel \ - xfslibs-dev:mipsel \ - zlib1g-dev:mipsel && \ + g++-mipsel-linux-gnu \ + gcc-mipsel-linux-gnu \ + libaio-dev:mipsel \ + libasound2-dev:mipsel \ + libattr1-dev:mipsel \ + libbpf-dev:mipsel \ + libbrlapi-dev:mipsel \ + libbz2-dev:mipsel \ + libc6-dev:mipsel \ + libcacard-dev:mipsel \ + libcap-ng-dev:mipsel \ + libcapstone-dev:mipsel \ + libcmocka-dev:mipsel \ + libcurl4-gnutls-dev:mipsel \ + libdaxctl-dev:mipsel \ + libdrm-dev:mipsel \ + libepoxy-dev:mipsel \ + libfdt-dev:mipsel \ + libffi-dev:mipsel \ + libfuse3-dev:mipsel \ + libgbm-dev:mipsel \ + libgcrypt20-dev:mipsel \ + libglib2.0-dev:mipsel \ + libglusterfs-dev:mipsel \ + libgnutls28-dev:mipsel \ + libgtk-3-dev:mipsel \ + libibumad-dev:mipsel \ + libibverbs-dev:mipsel \ + libiscsi-dev:mipsel \ + libjemalloc-dev:mipsel \ + libjpeg62-turbo-dev:mipsel \ + libjson-c-dev:mipsel \ + liblttng-ust-dev:mipsel \ + liblzo2-dev:mipsel \ + libncursesw5-dev:mipsel \ + libnfs-dev:mipsel \ + libnuma-dev:mipsel \ + libpam0g-dev:mipsel \ + libpixman-1-dev:mipsel \ + libpng-dev:mipsel \ + libpulse-dev:mipsel \ + librbd-dev:mipsel \ + librdmacm-dev:mipsel \ + libsasl2-dev:mipsel \ + libsdl2-dev:mipsel \ + libsdl2-image-dev:mipsel \ + libseccomp-dev:mipsel \ + libselinux1-dev:mipsel \ + libslirp-dev:mipsel \ + libsnappy-dev:mipsel \ + libspice-server-dev:mipsel \ + libssh-gcrypt-dev:mipsel \ + libsystemd-dev:mipsel \ + libtasn1-6-dev:mipsel \ + libudev-dev:mipsel \ + liburing-dev:mipsel \ + libusb-1.0-0-dev:mipsel \ + libusbredirhost-dev:mipsel \ + libvdeplug-dev:mipsel \ + libvirglrenderer-dev:mipsel \ + libvte-2.91-dev:mipsel \ + libzstd-dev:mipsel \ + nettle-dev:mipsel \ + systemtap-sdt-dev:mipsel \ + xfslibs-dev:mipsel \ + zlib1g-dev:mipsel && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 97d3872ee2..2d59288622 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -11,62 +11,62 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - libpcre2-dev \ - libspice-protocol-dev \ - llvm \ - locales \ - make \ - meson \ - ncat \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libglib2.0-dev \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" 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 export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ @@ -74,74 +74,74 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-powerpc64le-linux-gnu \ - gcc-powerpc64le-linux-gnu \ - libaio-dev:ppc64el \ - libasan5:ppc64el \ - libasound2-dev:ppc64el \ - libattr1-dev:ppc64el \ - libbpf-dev:ppc64el \ - libbrlapi-dev:ppc64el \ - libbz2-dev:ppc64el \ - libc6-dev:ppc64el \ - libcacard-dev:ppc64el \ - libcap-ng-dev:ppc64el \ - libcapstone-dev:ppc64el \ - libcmocka-dev:ppc64el \ - libcurl4-gnutls-dev:ppc64el \ - libdaxctl-dev:ppc64el \ - libdrm-dev:ppc64el \ - libepoxy-dev:ppc64el \ - libfdt-dev:ppc64el \ - libffi-dev:ppc64el \ - libfuse3-dev:ppc64el \ - libgbm-dev:ppc64el \ - libgcrypt20-dev:ppc64el \ - libglib2.0-dev:ppc64el \ - libglusterfs-dev:ppc64el \ - libgnutls28-dev:ppc64el \ - libgtk-3-dev:ppc64el \ - libibumad-dev:ppc64el \ - libibverbs-dev:ppc64el \ - libiscsi-dev:ppc64el \ - libjemalloc-dev:ppc64el \ - libjpeg62-turbo-dev:ppc64el \ - libjson-c-dev:ppc64el \ - liblttng-ust-dev:ppc64el \ - liblzo2-dev:ppc64el \ - libncursesw5-dev:ppc64el \ - libnfs-dev:ppc64el \ - libnuma-dev:ppc64el \ - libpam0g-dev:ppc64el \ - libpixman-1-dev:ppc64el \ - libpng-dev:ppc64el \ - libpulse-dev:ppc64el \ - librbd-dev:ppc64el \ - librdmacm-dev:ppc64el \ - libsasl2-dev:ppc64el \ - libsdl2-dev:ppc64el \ - libsdl2-image-dev:ppc64el \ - libseccomp-dev:ppc64el \ - libselinux1-dev:ppc64el \ - libslirp-dev:ppc64el \ - libsnappy-dev:ppc64el \ - libspice-server-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ - libsystemd-dev:ppc64el \ - libtasn1-6-dev:ppc64el \ - libubsan1:ppc64el \ - libudev-dev:ppc64el \ - liburing-dev:ppc64el \ - libusb-1.0-0-dev:ppc64el \ - libusbredirhost-dev:ppc64el \ - libvdeplug-dev:ppc64el \ - libvirglrenderer-dev:ppc64el \ - libvte-2.91-dev:ppc64el \ - libzstd-dev:ppc64el \ - nettle-dev:ppc64el \ - systemtap-sdt-dev:ppc64el \ - xfslibs-dev:ppc64el \ - zlib1g-dev:ppc64el && \ + g++-powerpc64le-linux-gnu \ + gcc-powerpc64le-linux-gnu \ + libaio-dev:ppc64el \ + libasan5:ppc64el \ + libasound2-dev:ppc64el \ + libattr1-dev:ppc64el \ + libbpf-dev:ppc64el \ + libbrlapi-dev:ppc64el \ + libbz2-dev:ppc64el \ + libc6-dev:ppc64el \ + libcacard-dev:ppc64el \ + libcap-ng-dev:ppc64el \ + libcapstone-dev:ppc64el \ + libcmocka-dev:ppc64el \ + libcurl4-gnutls-dev:ppc64el \ + libdaxctl-dev:ppc64el \ + libdrm-dev:ppc64el \ + libepoxy-dev:ppc64el \ + libfdt-dev:ppc64el \ + libffi-dev:ppc64el \ + libfuse3-dev:ppc64el \ + libgbm-dev:ppc64el \ + libgcrypt20-dev:ppc64el \ + libglib2.0-dev:ppc64el \ + libglusterfs-dev:ppc64el \ + libgnutls28-dev:ppc64el \ + libgtk-3-dev:ppc64el \ + libibumad-dev:ppc64el \ + libibverbs-dev:ppc64el \ + libiscsi-dev:ppc64el \ + libjemalloc-dev:ppc64el \ + libjpeg62-turbo-dev:ppc64el \ + libjson-c-dev:ppc64el \ + liblttng-ust-dev:ppc64el \ + liblzo2-dev:ppc64el \ + libncursesw5-dev:ppc64el \ + libnfs-dev:ppc64el \ + libnuma-dev:ppc64el \ + libpam0g-dev:ppc64el \ + libpixman-1-dev:ppc64el \ + libpng-dev:ppc64el \ + libpulse-dev:ppc64el \ + librbd-dev:ppc64el \ + librdmacm-dev:ppc64el \ + libsasl2-dev:ppc64el \ + libsdl2-dev:ppc64el \ + libsdl2-image-dev:ppc64el \ + libseccomp-dev:ppc64el \ + libselinux1-dev:ppc64el \ + libslirp-dev:ppc64el \ + libsnappy-dev:ppc64el \ + libspice-server-dev:ppc64el \ + libssh-gcrypt-dev:ppc64el \ + libsystemd-dev:ppc64el \ + libtasn1-6-dev:ppc64el \ + libubsan1:ppc64el \ + libudev-dev:ppc64el \ + liburing-dev:ppc64el \ + libusb-1.0-0-dev:ppc64el \ + libusbredirhost-dev:ppc64el \ + libvdeplug-dev:ppc64el \ + libvirglrenderer-dev:ppc64el \ + libvte-2.91-dev:ppc64el \ + libzstd-dev:ppc64el \ + nettle-dev:ppc64el \ + systemtap-sdt-dev:ppc64el \ + xfslibs-dev:ppc64el \ + zlib1g-dev:ppc64el && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index 95585e9e56..a105c1066e 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -11,62 +11,62 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdextrautils \ - bzip2 \ - ca-certificates \ - ccache \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libglib2.0-dev \ - libpcre2-dev \ - libspice-protocol-dev \ - llvm \ - locales \ - make \ - meson \ - ncat \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libglib2.0-dev \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" 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 export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ @@ -74,73 +74,73 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-s390x-linux-gnu \ - gcc-s390x-linux-gnu \ - libaio-dev:s390x \ - libasan5:s390x \ - libasound2-dev:s390x \ - libattr1-dev:s390x \ - libbpf-dev:s390x \ - libbrlapi-dev:s390x \ - libbz2-dev:s390x \ - libc6-dev:s390x \ - libcacard-dev:s390x \ - libcap-ng-dev:s390x \ - libcapstone-dev:s390x \ - libcmocka-dev:s390x \ - libcurl4-gnutls-dev:s390x \ - libdaxctl-dev:s390x \ - libdrm-dev:s390x \ - libepoxy-dev:s390x \ - libfdt-dev:s390x \ - libffi-dev:s390x \ - libfuse3-dev:s390x \ - libgbm-dev:s390x \ - libgcrypt20-dev:s390x \ - libglib2.0-dev:s390x \ - libglusterfs-dev:s390x \ - libgnutls28-dev:s390x \ - libgtk-3-dev:s390x \ - libibumad-dev:s390x \ - libibverbs-dev:s390x \ - libiscsi-dev:s390x \ - libjemalloc-dev:s390x \ - libjpeg62-turbo-dev:s390x \ - libjson-c-dev:s390x \ - liblttng-ust-dev:s390x \ - liblzo2-dev:s390x \ - libncursesw5-dev:s390x \ - libnfs-dev:s390x \ - libnuma-dev:s390x \ - libpam0g-dev:s390x \ - libpixman-1-dev:s390x \ - libpng-dev:s390x \ - libpulse-dev:s390x \ - librbd-dev:s390x \ - librdmacm-dev:s390x \ - libsasl2-dev:s390x \ - libsdl2-dev:s390x \ - libsdl2-image-dev:s390x \ - libseccomp-dev:s390x \ - libselinux1-dev:s390x \ - libslirp-dev:s390x \ - libsnappy-dev:s390x \ - libssh-gcrypt-dev:s390x \ - libsystemd-dev:s390x \ - libtasn1-6-dev:s390x \ - libubsan1:s390x \ - libudev-dev:s390x \ - liburing-dev:s390x \ - libusb-1.0-0-dev:s390x \ - libusbredirhost-dev:s390x \ - libvdeplug-dev:s390x \ - libvirglrenderer-dev:s390x \ - libvte-2.91-dev:s390x \ - libzstd-dev:s390x \ - nettle-dev:s390x \ - systemtap-sdt-dev:s390x \ - xfslibs-dev:s390x \ - zlib1g-dev:s390x && \ + g++-s390x-linux-gnu \ + gcc-s390x-linux-gnu \ + libaio-dev:s390x \ + libasan5:s390x \ + libasound2-dev:s390x \ + libattr1-dev:s390x \ + libbpf-dev:s390x \ + libbrlapi-dev:s390x \ + libbz2-dev:s390x \ + libc6-dev:s390x \ + libcacard-dev:s390x \ + libcap-ng-dev:s390x \ + libcapstone-dev:s390x \ + libcmocka-dev:s390x \ + libcurl4-gnutls-dev:s390x \ + libdaxctl-dev:s390x \ + libdrm-dev:s390x \ + libepoxy-dev:s390x \ + libfdt-dev:s390x \ + libffi-dev:s390x \ + libfuse3-dev:s390x \ + libgbm-dev:s390x \ + libgcrypt20-dev:s390x \ + libglib2.0-dev:s390x \ + libglusterfs-dev:s390x \ + libgnutls28-dev:s390x \ + libgtk-3-dev:s390x \ + libibumad-dev:s390x \ + libibverbs-dev:s390x \ + libiscsi-dev:s390x \ + libjemalloc-dev:s390x \ + libjpeg62-turbo-dev:s390x \ + libjson-c-dev:s390x \ + liblttng-ust-dev:s390x \ + liblzo2-dev:s390x \ + libncursesw5-dev:s390x \ + libnfs-dev:s390x \ + libnuma-dev:s390x \ + libpam0g-dev:s390x \ + libpixman-1-dev:s390x \ + libpng-dev:s390x \ + libpulse-dev:s390x \ + librbd-dev:s390x \ + librdmacm-dev:s390x \ + libsasl2-dev:s390x \ + libsdl2-dev:s390x \ + libsdl2-image-dev:s390x \ + libseccomp-dev:s390x \ + libselinux1-dev:s390x \ + libslirp-dev:s390x \ + libsnappy-dev:s390x \ + libssh-gcrypt-dev:s390x \ + libsystemd-dev:s390x \ + libtasn1-6-dev:s390x \ + libubsan1:s390x \ + libudev-dev:s390x \ + liburing-dev:s390x \ + libusb-1.0-0-dev:s390x \ + libusbredirhost-dev:s390x \ + libvdeplug-dev:s390x \ + libvirglrenderer-dev:s390x \ + libvte-2.91-dev:s390x \ + libzstd-dev:s390x \ + nettle-dev:s390x \ + systemtap-sdt-dev:s390x \ + xfslibs-dev:s390x \ + zlib1g-dev:s390x && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index fe84166ca1..d200c7fc10 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -18,120 +18,120 @@ exec "$@"' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ - SDL2-devel \ - SDL2_image-devel \ - alsa-lib-devel \ - bash \ - bc \ - bison \ - brlapi-devel \ - bzip2 \ - bzip2-devel \ - ca-certificates \ - capstone-devel \ - ccache \ - clang \ - ctags \ - cyrus-sasl-devel \ - daxctl-devel \ - dbus-daemon \ - device-mapper-multipath-devel \ - diffutils \ - findutils \ - flex \ - fuse3-devel \ - gcc \ - gcc-c++ \ - gcovr \ - genisoimage \ - gettext \ - git \ - glib2-devel \ - glib2-static \ - glibc-langpack-en \ - glibc-static \ - glusterfs-api-devel \ - gnutls-devel \ - gtk3-devel \ - hostname \ - jemalloc-devel \ - json-c-devel \ - libaio-devel \ - libasan \ - libattr-devel \ - libbpf-devel \ - libcacard-devel \ - libcap-ng-devel \ - libcmocka-devel \ - libcurl-devel \ - libdrm-devel \ - libepoxy-devel \ - libfdt-devel \ - libffi-devel \ - libgcrypt-devel \ - libiscsi-devel \ - libjpeg-devel \ - libnfs-devel \ - libpmem-devel \ - libpng-devel \ - librbd-devel \ - libseccomp-devel \ - libselinux-devel \ - libslirp-devel \ - libssh-devel \ - libtasn1-devel \ - libubsan \ - liburing-devel \ - libusbx-devel \ - libzstd-devel \ - llvm \ - lttng-ust-devel \ - lzo-devel \ - make \ - mesa-libgbm-devel \ - meson \ - ncurses-devel \ - nettle-devel \ - ninja-build \ - nmap-ncat \ - numactl-devel \ - openssh-clients \ - pam-devel \ - pcre-static \ - perl-base \ - pixman-devel \ - pkgconfig \ - pulseaudio-libs-devel \ - python3 \ - python3-PyYAML \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-sphinx \ - python3-sphinx_rtd_theme \ - rdma-core-devel \ - rpm \ - sed \ - snappy-devel \ - sparse \ - spice-protocol \ - spice-server-devel \ - systemd-devel \ - systemtap-sdt-devel \ - tar \ - tesseract \ - tesseract-langpack-eng \ - texinfo \ - usbredir-devel \ - util-linux \ - virglrenderer-devel \ - vte291-devel \ - which \ - xen-devel \ - xfsprogs-devel \ - zlib-devel \ - zlib-static && \ + SDL2-devel \ + SDL2_image-devel \ + alsa-lib-devel \ + bash \ + bc \ + bison \ + brlapi-devel \ + bzip2 \ + bzip2-devel \ + ca-certificates \ + capstone-devel \ + ccache \ + clang \ + ctags \ + cyrus-sasl-devel \ + daxctl-devel \ + dbus-daemon \ + device-mapper-multipath-devel \ + diffutils \ + findutils \ + flex \ + fuse3-devel \ + gcc \ + gcc-c++ \ + gcovr \ + genisoimage \ + gettext \ + git \ + glib2-devel \ + glib2-static \ + glibc-langpack-en \ + glibc-static \ + glusterfs-api-devel \ + gnutls-devel \ + gtk3-devel \ + hostname \ + jemalloc-devel \ + json-c-devel \ + libaio-devel \ + libasan \ + libattr-devel \ + libbpf-devel \ + libcacard-devel \ + libcap-ng-devel \ + libcmocka-devel \ + libcurl-devel \ + libdrm-devel \ + libepoxy-devel \ + libfdt-devel \ + libffi-devel \ + libgcrypt-devel \ + libiscsi-devel \ + libjpeg-devel \ + libnfs-devel \ + libpmem-devel \ + libpng-devel \ + librbd-devel \ + libseccomp-devel \ + libselinux-devel \ + libslirp-devel \ + libssh-devel \ + libtasn1-devel \ + libubsan \ + liburing-devel \ + libusbx-devel \ + libzstd-devel \ + llvm \ + lttng-ust-devel \ + lzo-devel \ + make \ + mesa-libgbm-devel \ + meson \ + ncurses-devel \ + nettle-devel \ + ninja-build \ + nmap-ncat \ + numactl-devel \ + openssh-clients \ + pam-devel \ + pcre-static \ + perl-base \ + pixman-devel \ + pkgconfig \ + pulseaudio-libs-devel \ + python3 \ + python3-PyYAML \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx_rtd_theme \ + rdma-core-devel \ + rpm \ + sed \ + snappy-devel \ + sparse \ + spice-protocol \ + spice-server-devel \ + systemd-devel \ + systemtap-sdt-devel \ + tar \ + tesseract \ + tesseract-langpack-eng \ + texinfo \ + usbredir-devel \ + util-linux \ + virglrenderer-devel \ + vte291-devel \ + which \ + xen-devel \ + xfsprogs-devel \ + zlib-devel \ + zlib-static && \ nosync dnf autoremove -y && \ nosync dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ @@ -142,8 +142,8 @@ exec "$@"' > /usr/bin/nosync && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" 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" diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index d80064756f..361979d6b3 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -132,8 +132,8 @@ RUN zypper update -y && \ RUN /usr/bin/pip3 install meson==0.56.0 +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" 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" diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 24594afc15..ac16383da7 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -11,122 +11,122 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get install -y eatmydata && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdmainutils \ - bzip2 \ - ca-certificates \ - ccache \ - clang \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - g++ \ - gcc \ - gcovr \ - genisoimage \ - gettext \ - git \ - hostname \ - libaio-dev \ - libasan5 \ - libasound2-dev \ - libattr1-dev \ - libbrlapi-dev \ - libbz2-dev \ - libc6-dev \ - libcacard-dev \ - libcap-ng-dev \ - libcapstone-dev \ - libcmocka-dev \ - libcurl4-gnutls-dev \ - libdaxctl-dev \ - libdrm-dev \ - libepoxy-dev \ - libfdt-dev \ - libffi-dev \ - libfuse3-dev \ - libgbm-dev \ - libgcrypt20-dev \ - libglib2.0-dev \ - libglusterfs-dev \ - libgnutls28-dev \ - libgtk-3-dev \ - libibumad-dev \ - libibverbs-dev \ - libiscsi-dev \ - libjemalloc-dev \ - libjpeg-turbo8-dev \ - libjson-c-dev \ - liblttng-ust-dev \ - liblzo2-dev \ - libncursesw5-dev \ - libnfs-dev \ - libnuma-dev \ - libpam0g-dev \ - libpcre2-dev \ - libpixman-1-dev \ - libpmem-dev \ - libpng-dev \ - libpulse-dev \ - librbd-dev \ - librdmacm-dev \ - libsasl2-dev \ - libsdl2-dev \ - libsdl2-image-dev \ - libseccomp-dev \ - libselinux1-dev \ - libslirp-dev \ - libsnappy-dev \ - libspice-protocol-dev \ - libspice-server-dev \ - libssh-dev \ - libsystemd-dev \ - libtasn1-6-dev \ - libubsan1 \ - libudev-dev \ - libusb-1.0-0-dev \ - libusbredirhost-dev \ - libvdeplug-dev \ - libvirglrenderer-dev \ - libvte-2.91-dev \ - libxen-dev \ - libzstd-dev \ - llvm \ - locales \ - make \ - multipath-tools \ - ncat \ - nettle-dev \ - ninja-build \ - openssh-client \ - perl-base \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-setuptools \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-wheel \ - python3-yaml \ - rpm2cpio \ - sed \ - sparse \ - systemtap-sdt-dev \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - texinfo \ - xfslibs-dev \ - zlib1g-dev && \ + bash \ + bc \ + bison \ + bsdmainutils \ + bzip2 \ + ca-certificates \ + ccache \ + clang \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + g++ \ + gcc \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libaio-dev \ + libasan5 \ + libasound2-dev \ + libattr1-dev \ + libbrlapi-dev \ + libbz2-dev \ + libc6-dev \ + libcacard-dev \ + libcap-ng-dev \ + libcapstone-dev \ + libcmocka-dev \ + libcurl4-gnutls-dev \ + libdaxctl-dev \ + libdrm-dev \ + libepoxy-dev \ + libfdt-dev \ + libffi-dev \ + libfuse3-dev \ + libgbm-dev \ + libgcrypt20-dev \ + libglib2.0-dev \ + libglusterfs-dev \ + libgnutls28-dev \ + libgtk-3-dev \ + libibumad-dev \ + libibverbs-dev \ + libiscsi-dev \ + libjemalloc-dev \ + libjpeg-turbo8-dev \ + libjson-c-dev \ + liblttng-ust-dev \ + liblzo2-dev \ + libncursesw5-dev \ + libnfs-dev \ + libnuma-dev \ + libpam0g-dev \ + libpcre2-dev \ + libpixman-1-dev \ + libpmem-dev \ + libpng-dev \ + libpulse-dev \ + librbd-dev \ + librdmacm-dev \ + libsasl2-dev \ + libsdl2-dev \ + libsdl2-image-dev \ + libseccomp-dev \ + libselinux1-dev \ + libslirp-dev \ + libsnappy-dev \ + libspice-protocol-dev \ + libspice-server-dev \ + libssh-dev \ + libsystemd-dev \ + libtasn1-6-dev \ + libubsan1 \ + libudev-dev \ + libusb-1.0-0-dev \ + libusbredirhost-dev \ + libvdeplug-dev \ + libvirglrenderer-dev \ + libvte-2.91-dev \ + libxen-dev \ + libzstd-dev \ + llvm \ + locales \ + make \ + multipath-tools \ + ncat \ + nettle-dev \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-setuptools \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-wheel \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + systemtap-sdt-dev \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo \ + xfslibs-dev \ + zlib1g-dev && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -141,11 +141,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ RUN /usr/bin/pip3 install meson==0.56.0 +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" 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" # Apply patch https://reviews.llvm.org/D75820 # This is required for TSan in clang-10 to compile with QEMU. RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index e3712b7912..a2633997ff 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit e3712b79122180fdb3b7a7ea8cbee47ece253f97 +Subproject commit a2633997ffb3830acc96c98c70122885d83bebf4 From patchwork Mon Oct 31 13:09: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: 620229 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2816982pvb; Mon, 31 Oct 2022 06:17:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7bbFhkYKJ5lh7+e89GPfOaBOGxB8ucvhy6oXUX0pRn83DhKcrl9/X6RbSa2SgLXwBbPOI8 X-Received: by 2002:a05:6214:4012:b0:4bb:d57f:c7d7 with SMTP id kd18-20020a056214401200b004bbd57fc7d7mr7995575qvb.20.1667222279144; Mon, 31 Oct 2022 06:17:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222279; cv=none; d=google.com; s=arc-20160816; b=liFoNFyhfA7OxXXh20yVoF9fYO88ZUjYXEISxlvzNhgYmEoCf/uZBgydLGwl6B7mzT mmj35+sP3Rzd3tfuh6MVRQ8l/cf9nOoeZQsqey0e7VSjU5LgGbn+9evgwNq4jhcfQa2d scnX457sL4bS2wiI7cLjQTT0zLiIYMlu2pwTH8QcEujWkkgzMhPN6+YYvXZVh/x85gZL AaZYpXpr9rAFnqE9Fq7epGLs8ig60hHZBVxyXVPdYqk4/pVdHo0qba9bAcBwBukdBZJ2 xmBFfBuos6BbKPyI1xgLK81ZnWo8CENn+Ev+9eQOMlSJNDfhCTcDmBZDEYDV7yjdWW93 dTvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=I2T8D0ShdNw3jUDGJfC+s4hF5FHRSJig30tiWD+XkNY=; b=UjiHEr2KBJLRnJAI6vTRKpMMNC0tbKdJQhrspIKzvEESkUa0Iwq/sgc83IGPQGrF5U SAjGoGjbyzQ4TTLsjTtqG0Sx+Z9QxdjjOis0k3O4K0eO8Jv/lzY3wn+/yNw7RA5pU8K/ jDag2TSx4Gt/h9ZGnlCN2JMNuKxuzNNNXKZJ8XBpF5NagAVAlDZgKUdiFEhuAGeUV5dg PpnkgGCo+nzhJL/SQju7U+GmBCahYxnyCpYtAZUIFCb7t7aPbkC5fb1MFk8tXtOwVtt5 bMNZcEi7l5RgUz0/JdVDWdbVu39xRa3k1C2Nh/uyndwHJdGzs9YViFEimMkMGHj1aBqa AxZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="NHCM4l/n"; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 bq35-20020a05620a46a300b006ec50f2905asi4112203qkb.504.2022.10.31.06.17.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:17:59 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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="NHCM4l/n"; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUZ6-0000r3-So; Mon, 31 Oct 2022 09:10:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUYj-0007wp-GY for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:39 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUYR-0001Ci-Pv for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:31 -0400 Received: by mail-wr1-x429.google.com with SMTP id v1so15889184wrt.11 for ; Mon, 31 Oct 2022 06:10:14 -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 :message-id:reply-to; bh=I2T8D0ShdNw3jUDGJfC+s4hF5FHRSJig30tiWD+XkNY=; b=NHCM4l/nkX/pgb0pqgavCK4vHE07eau/rGtTI8ySuN/7ys4Hfb8x8FN+EGNbECp3Kr jAgHJj7xZrmyeHb+F6W/ID+1focot3PAekm6rXYUpLrRrY+tnDPiqQXUA7mohf1NoJHV v7EOPNVgmVll+SvyAiW2KjDsSRR2SbyEszdDHdbVse3n4i6cJ6I1eBQkdf/sD3AUS6vh 7tTcbAX/B9qTGRv9xo90mwXzW7NpreVm3lQzmeqML6jVwqI9JImsTXDBKW/vfcxgBAe4 5mecxyVZBt7IrliWTJ+nnyLkDJlV0TrJu81JSdAqESQvwcYMo6osonPE6cwxmyapSmB6 CRag== 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:message-id:reply-to; bh=I2T8D0ShdNw3jUDGJfC+s4hF5FHRSJig30tiWD+XkNY=; b=JA79G0GkAWuWDR/AtU0UAPi/aULthtF4YtN69ZSdVmZUjJiFeUXG7eRWzoUF9HQ6Nz 7AT3BmyOKHQTL2KkOksOxI7NjtDNxLN4MawdJ8yUb8HjHcHEqv8aMDQmOmGRE4EC8b3G azNsBZUeXnUPoBtkLF92/hDPtiosh8pDO/5hy+lnJoQvS7y1hqbYbD8aeuPezEExEaDD UqUZTvEWLzDWpDyULPzf3ftasC7qp8SMEE1F3YsJYcwEJ6UkoHtGXuuwN2bcYAtiOrPl +9Tu87XeONxZMiNjR/iXUE7OXZbbyZTeKKaUxiPWSJVXgCnFiVDhLEYneBFBJUTJXM6E IJwA== X-Gm-Message-State: ACrzQf0wKCRUZFemSiTdMaVUD2qRUR5W5wAFsin5RuVbuTLfqxkWSudq dhVthdzwaGZfO37Di8oIEL+i8g== X-Received: by 2002:a5d:52d0:0:b0:21e:4923:fa09 with SMTP id r16-20020a5d52d0000000b0021e4923fa09mr8287741wrv.244.1667221813208; Mon, 31 Oct 2022 06:10:13 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id ci8-20020a5d5d88000000b0023662245d3csm7125966wrb.95.2022.10.31.06.10.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:10:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4C26F1FFBB; Mon, 31 Oct 2022 13:10:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 03/31] tests/docker: update fedora-win[32|64]-cross with lcitool Date: Mon, 31 Oct 2022 13:09:42 +0000 Message-Id: <20221031131010.682984-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org Convert another two dockerfiles to lcitool and update. Signed-off-by: Alex Bennée Acked-by: Richard Henderson Message-Id: <20220929114231.583801-10-alex.bennee@linaro.org> Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20221028095659.48734-4-philmd@linaro.org> diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index aca37aabc4..75383ba185 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 CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" -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..98c03dc13b 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -1,43 +1,103 @@ +# 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 CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" -RUN dnf install -y $PACKAGES -RUN rpm -q $PACKAGES | sort > /packages.txt +RUN nosync dnf install -y \ + mingw32-nsis \ + 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 a6a7c23c1d..ce0b24c0b1 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -161,6 +161,16 @@ try: 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 Mon Oct 31 13:09: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: 620217 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2812580pvb; Mon, 31 Oct 2022 06:11:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5r00agP9JBz9v8WHXgSRsIEkhL5z6GZSXbjc0EDmfo+tWc1Nms9AwzVFubB49d8dQZSt97 X-Received: by 2002:a0c:df09:0:b0:4bb:675c:8e82 with SMTP id g9-20020a0cdf09000000b004bb675c8e82mr10953943qvl.94.1667221908423; Mon, 31 Oct 2022 06:11:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667221908; cv=none; d=google.com; s=arc-20160816; b=rPbbvU7C6SLDi1IGgbP30JHmcpeiS3zJIM3KOZqk1kM+Q0rYAvdhBj4D9WR4cYekwq 9WUKY8DjsH8uvhLC6ExB8xTPgB9ixB3BUYc754ZZkXNqi7N98gBtcvHyML4rby8N6Kl9 UZBjbFwl59cmDo+xABnfhkgGxdr5EqngSdgIeYpANl90T5rj00ezyMG8phgOEdC4VLoz Mr6VjMueuaWRPB9+aWtmshv9W33j5QUqPdrxhHcFLPesAqnN8Udlu7F2M9f1hc8w2Pkb rDAys3zv/aWd/GE+kav10lOWaiUpBFwOKs1BLeZqdtEUSamveO3ffZyL+tFxbzPo4vYV J/QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=jsUrSxO/fDhmm3Ram+m3iS+dupkr822w/hREuK9Soas=; b=Aa7YYHFAY/3qTTNd1aSYOlSc7WjdA2mObiV6udXa7HqnXEmYoA82TS5zIFGfYB9VJe BniyruiT5O08Kfpja+C9LsgCGKb/4PccgIYXyndlFsV0r4o+wqM3eEX8pujdFU1gSYuu +J+RuHlRpab0WdWqLPb6xjwdWRFbCSQp0p1UXvwK5JKvuggNx+MvDPDUMWZx6UfRgbK1 DVaClNJCT70p9nz4mkSdc4kEeQrzlQtzsVk3eOIEiQgkPUD3LWztUxtagntEZB5BKQCA +QslNe/4kKA10ORLSljid4y16/cxjc7YdHZQtPpQz00fF63Uga2/YHuPmWeKUd8j1NnN g8QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ygSohuBh; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 fe5-20020a05622a4d4500b003a51c960c9bsi3287257qtb.653.2022.10.31.06.11.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:11:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=ygSohuBh; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUZA-00019j-Ld; Mon, 31 Oct 2022 09:11:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUYf-0007wU-Mq for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:38 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUYd-0001FG-BA for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:29 -0400 Received: by mail-wm1-x333.google.com with SMTP id v7so1331121wmn.0 for ; Mon, 31 Oct 2022 06:10:22 -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 :message-id:reply-to; bh=jsUrSxO/fDhmm3Ram+m3iS+dupkr822w/hREuK9Soas=; b=ygSohuBhA+8pxZE08YR7lkYEn8Xb0c2rqQjtViSlAfSM6oM3r3Xf6Emr/QQSJvVFTI /OND+Bpa3QxshJkBI+hTm9AWOXfgdmg7nuczoGWn1Pnvuwz9DZAVzGILZY6DYu7SpcJj oecYpuKUzzkvqMhXpqIcoeGbATwZ8RMe7ataqSVjdJcPlxR+rh85K+wVX8fouCUuIxdy 2CuP7L2M77lAX2u4W5aQY7Y7xayVjgklDkQk2nopzxziZYOOfBEvtxpvxkXZKMEDw90w XmOUsfXbOcPhvwKgd8oEqKOWbnZQ1cMA35G+BUmN0Jm29gIesq71aLuafpA9+MkASe8k fV/g== 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:message-id:reply-to; bh=jsUrSxO/fDhmm3Ram+m3iS+dupkr822w/hREuK9Soas=; b=bCCeFaUSk0v8n/dHIWJmUrb/rditvpfBaA3BsSnoknw7zSTea5fFZA9UoOGXIavvtN W//J+dYUftWa1M/zyX9L51AKOxFSh6zklV4yfW09HdLlL4hbnykmkSFwe24XAbcwQ0UI BsEKDoemnfgNS4SttIzpGMqg3ZrepYlKm+Ru7ugiwKDYcTBra8ES6hmTp9TyVOZKWyLN lwxiDqBJVaght9kNt3ySLylrhgfQxm6Ayt61mlFosS13gyjg+IssrFoccfmPqdzwHWch EeG0xN+FTS+aa8KaUcb1YZyB06ICQjgEg+DolAS9jBudMgWzdu4dY+ezpBtI7HmMy15y gl2w== X-Gm-Message-State: ACrzQf0+zFDQJp+/Y7aXxqVqISjYZPSPZjLyK6bNh9+FZZTvXt3oR+hm TMQPuDEV/ElhgVXuII9Op/NT0Q== X-Received: by 2002:a05:600c:5d3:b0:3cf:6ca4:b615 with SMTP id p19-20020a05600c05d300b003cf6ca4b615mr4752064wmd.185.1667221814392; Mon, 31 Oct 2022 06:10:14 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id g13-20020a5d698d000000b0022cc3e67fc5sm6876627wru.65.2022.10.31.06.10.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:10:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 63A0A1FFBC; Mon, 31 Oct 2022 13:10:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 04/31] tests/docker: update test-mingw to run single build Date: Mon, 31 Oct 2022 13:09:43 +0000 Message-Id: <20221031131010.682984-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org While the test-build test happily run for mingw the test-mingw case runs more of the packaging inline with what our CI does. It however fails if we don't find both compilers and expects to be run on a docker image with both. Remove that distinction and make it work more like the other build test scripts. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20221027183637.2772968-3-alex.bennee@linaro.org> diff --git a/tests/docker/test-mingw b/tests/docker/test-mingw index 0bc6d78872..18366972eb 100755 --- a/tests/docker/test-mingw +++ b/tests/docker/test-mingw @@ -13,14 +13,12 @@ . common.rc -requires_binary x86_64-w64-mingw32-gcc -requires_binary i686-w64-mingw32-gcc +requires_binary x86_64-w64-mingw32-gcc i686-w64-mingw32-gcc cd "$BUILD_DIR" -for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do - TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \ - build_qemu --cross-prefix=$prefix \ +TARGET_LIST=${TARGET_LIST:-$DEF_TARGET_LIST} \ +build_qemu \ --enable-trace-backends=simple \ --enable-gnutls \ --enable-nettle \ @@ -29,8 +27,6 @@ for prefix in x86_64-w64-mingw32- i686-w64-mingw32-; do --enable-bzip2 \ --enable-guest-agent \ --enable-docs - install_qemu - make installer - make clean - -done +install_qemu +make installer +make clean From patchwork Mon Oct 31 13:09: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: 620236 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2819341pvb; Mon, 31 Oct 2022 06:21:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4Ku0lPPGGbB/7gmRc+qnslZDh1jnbMEYNy0r62CtA55E3YHGd6uqoC46Xz8E1T4QFh3De/ X-Received: by 2002:ac8:5f83:0:b0:39c:e5a2:6dfe with SMTP id j3-20020ac85f83000000b0039ce5a26dfemr10335186qta.428.1667222474839; Mon, 31 Oct 2022 06:21:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222474; cv=none; d=google.com; s=arc-20160816; b=l5NTf0rFiJsBTkEGGvfc8vptJg9afgcpLlrW9Vu9Gyo+GyaZayWcJYxMQ/vl8lYytQ eZ8t4WjW67JYoGLZaGy4LJabC36PvOl8weNFiu/Z5y9YLsJks8T0mgkuaiv8GXoWImWp TvXfGnIcBfZII8AwMoo+C73U5rRubtImmLdqb345M6NcOoYnrZ8R2NCND5K5P8Q+DGaj Vvc7RGhwR0EmD0fgmpAaVX3KjQaXOvv5k69f8qswIrTE8o5REWJap66S2cpnMn3LoFyU p4YZNP/Ach3AemCK4kPJtUwid0MoVv9m5dPfZ8CXtqcpEVWXoLrta0RMbm9w9HTZxpnf OerA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=43yJcVbTIzRPiFdwiOz7pAS4lyfDXgLdaPUV9kvWN6k=; b=CPQwSnvtgtKraXW/1ZO0eBGu3x6T1WOSbEEur01SInY4Nh4kIVB+6oB0edlGICG5rs dTl3xnEvaq3x8ldt0TQk21xYLhFwqZoOfMlymtfMeJ9w5xM+9jHGqXMQvr0oXm6nxOV8 gBpbXQJr501nVllNPr9QSd3Snlfvwhab1ZVy5dEoChkWg1XgYLS6+f9YLpLRTe2nq1hb gEZDoM3sL6L96Rl4VRpzsUDUKm31Eh7aiBFHBVcger3xTgYVf5mnCrbxeTQ9ZQtZDSPe 7A2VraW3/jIpPzp1SyU7nHB5hp2XZVvoL9ZdHk+PohTmqpfiGXGNOGVE1F3cHixMgyZo dkTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N2mlqZ37; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 81-20020a370b54000000b006ec8b771c88si3555632qkl.508.2022.10.31.06.21.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:21:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=N2mlqZ37; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUZL-0002Si-9A; Mon, 31 Oct 2022 09:11:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUYd-0007uH-Rl for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:29 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUYX-0001El-LW for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:26 -0400 Received: by mail-wm1-x32c.google.com with SMTP id l32so7107665wms.2 for ; Mon, 31 Oct 2022 06:10:20 -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 :message-id:reply-to; bh=43yJcVbTIzRPiFdwiOz7pAS4lyfDXgLdaPUV9kvWN6k=; b=N2mlqZ37SSfL8DvQlUWg1n4/BAAPmVRnK1mqcFj5xjRCpolS16FceoS/6YHdRVXjEg HJNTVJJT4iHiSaZ4p1EE/sUgzcOQ+UThvK+CfB8dag9PJocdCJ2J4sIUu3bOGfV7VvEZ Cx2GapTpvtVyL/nDLHa28hr+f8L/221l1fWaGBz1GsqneS+ei3+x/S9hZem1FbpHM9Aj 5M+XeyFzwMEcdE2nKF9C/e+A3lv1ohxJDdQ6Ka23y8r3QPQ0VWMBHUTl1ZkMOf1p/cbV wITymu06y+FasZba6/CcALNvijtUTeWPdr3o1dFHqIqpaUJw83UhKbJPFq62dtHDWFBl zu9A== 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:message-id:reply-to; bh=43yJcVbTIzRPiFdwiOz7pAS4lyfDXgLdaPUV9kvWN6k=; b=M8liE5volFKeo/JVjkYaIBET+6bdninv8SVE84QdUhAt+qsi4a/fteCcPHvyxU0/ed yzA3sR8bZGFfmKs32iwosX4gc35cz4Bz321UXqz3YprfnYOm7wBiKsMOpYIBo1nn+WRz UP+l2E3q0SZQSwcLGobB2/5nGaKTOBTk3OaNLg4LhUUXgcB7hx8BQJbIJTl/nMb0NdDV NSdL7rJ+0Uxfq+HuSxDctPkTqDSV+MDvF2+XolkHvW+65vNI9pa7sI7IcdKO5bSfbC5M MXEFm23XPAlPBKLuWfMFIQq2xrHlBkGPeHdcLSIpYrrzEPyIeYXkoLmhrpNIbVlYX7GU N7ew== X-Gm-Message-State: ACrzQf3jCbvX6rkz/uPETeRLkxmEMNsyEhTCzM5QupON+1r5pV/5GcPe ZGbGlA397ez1ZAeW5LKU9Y3Hzw== X-Received: by 2002:a05:600c:3585:b0:3b4:a308:1581 with SMTP id p5-20020a05600c358500b003b4a3081581mr18459913wmq.77.1667221818494; Mon, 31 Oct 2022 06:10:18 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m24-20020a7bca58000000b003cf47fdead5sm7156932wml.30.2022.10.31.06.10.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:10:15 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 79AFE1FFBD; Mon, 31 Oct 2022 13:10:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Anton Johansson , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 05/31] tests/docker: Add flex/bison to `debian-all-test` Date: Mon, 31 Oct 2022 13:09:44 +0000 Message-Id: <20221031131010.682984-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org From: Anton Johansson Adds flex/bison to the debian-all-test-cross container which was missed in the previous CI patch. These dependencies are required by the idef-parser patchset for target/hexagon. Signed-off-by: Anton Johansson Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20221011173229.57909-1-anjo@rev.ng> Message-Id: <20221027183637.2772968-4-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index 2beb077fb4..8dc5e1b5de 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -20,8 +20,10 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ # Add extra build tools and as many cross compilers as we can for testing RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ + bison \ ccache \ clang \ + flex \ git \ ninja-build \ gcc-aarch64-linux-gnu \ From patchwork Mon Oct 31 13:09: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: 620221 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2813684pvb; Mon, 31 Oct 2022 06:13:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6qjiHIuBOaGC/EOvnNP/qWTVXEslkMuYtECfAoTaZyyr1CnC0/DbqmQPRoi2UJV6b5HC3T X-Received: by 2002:a0c:e28a:0:b0:4b9:e578:1581 with SMTP id r10-20020a0ce28a000000b004b9e5781581mr10881071qvl.102.1667221994844; Mon, 31 Oct 2022 06:13:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667221994; cv=none; d=google.com; s=arc-20160816; b=xVMaB3ey8C1X4TFeGi7uA/0dfeFkPe11ToGAUu8HXPZOszLW/gfY3VK+ewtdr/c6xY HShnKVXOkjtez/mdkAjdE9kPBf7u8wyWNpXlpBOrEU3z13ypeXCpDopEReHdJJtswORF YXo+s6QkFXUyCXojp/7BHeuU7ptKnT9B5W5P9RlnEKEWX/rvIG/gB1IAea3Nn4QYymjY 0qGtuAegtmCGSzMLknDVswjJm47V5K2BcWEjnS3Q1EYSshKYrBERVjt3j3SxCif4wtMZ mjgrmuwkR5N9vyR1Qc7gPYqMu4ItIievSJOnuHQuBiXBeWx67w5WbIKZA3PnGkPZRhSw TTHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=OpyUaigpt9+MJRHvWG2J+xsZxMgYgcY076qEes67kmM=; b=Wolz0/Fmh8caXefsjruIgumHNfcHzEja9lKuLrMZH9iZK1rOnWucxpab35GRN4MZ08 2/n78nzxwWI5gDcTarMQOms+WAxF/7sX8Uq6WQK+yDltVMrUYrzYpYpKkbH7gxIr4X7w 6nYwGAFgQYY3ROBqAk/RwQwh42MuPDXzIlT5KjZV7jJEWFbR/hILnU2U+9pVhFY5F9WG ayhdzIT7fI7ycxBwJCusIJG/cPmiQsGMCQT5cg7H7odVrTyr+6eistPGHkRSKFt+4gtN N95j60d0K1y4zQykJe5ukc+juOvKc+LHdruy86VxPuC8Q08rkzFphZlZHt0070jcXLzs jjTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jLW7Ao/J"; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 o202-20020a3741d3000000b006ea03fa664bsi3720430qka.174.2022.10.31.06.13.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:13:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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="jLW7Ao/J"; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUYx-0000G9-2j; Mon, 31 Oct 2022 09:10:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUYd-0007uI-Ru for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:29 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUYT-0001EA-OG for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:27 -0400 Received: by mail-wm1-x329.google.com with SMTP id f16-20020a05600c491000b003cf66a2e7c0so3329535wmp.5 for ; Mon, 31 Oct 2022 06:10:16 -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 :message-id:reply-to; bh=OpyUaigpt9+MJRHvWG2J+xsZxMgYgcY076qEes67kmM=; b=jLW7Ao/JPXVrKJveO1x/QivvYR254WVvOl6Y8INAzmLeUbU3fKOXmocG0VEaTxjDVC sBdvXnkhhXpexte2MkGUIM8+rcU8HQtxCh+35TGjm7xNaUuWYKmJeV13f0dd9sZzLENC knMZ9tTUx5PNau0figkj50PHHebvAuUtITqymKoCpoBCR4AvcM3AfJng6w6dADx3gTrQ ktl4CCnC+EHksYaFoxi9T9prw0LQ3l9weHerCKlBsYdtwd/Fwi+D32TOkNNVhOIK1fgL q/+rA1J7nPi1MYlcZDbQI6nRVXDigvYCMEnottFHcexVcsY5YPMK5PSiCVZPaOA2PEwH KdKQ== 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:message-id:reply-to; bh=OpyUaigpt9+MJRHvWG2J+xsZxMgYgcY076qEes67kmM=; b=y1xsf9Vc81qIGFpgQZOzowgVtqKboC9D4NSUe/rtUS5cuCjnZNvOMyWr4gt6gxt5KH nGUzlmZkPXDqkPENTeKQYFW7bCaPP7A2prReAXbmEvA+cAWo5TPIMQCV1cMu3N3ToUHd 96t37GS95X8ohAYPkP+6I7WkDmuaZNOLuXac7ZBS4knIMdWnaR7Re2IYFlELsBAuoyz/ p1Cp/vzl3NdJ0dPzUHbbYBX3sj+/YJRvYg4D78EeAlyHYCaOTshVrOISH9CWfDPz0OYk qO7Us4VuKyGdvOT9iXRV2iL7vxcsBSWHzOHi3NVT3GX3k7VDlxq4bp5dNtMuQWFXHESG RO+g== X-Gm-Message-State: ACrzQf2fOviUw6PjvMBpMpjE+7x9Fm9q/72ErFXQFlXxJrbAHtIEFcCX 0uoIEyuAYgcNyUokcgTgI4Wm2rGa8QlgbA== X-Received: by 2002:a05:600c:3b1a:b0:3c7:132f:eb7f with SMTP id m26-20020a05600c3b1a00b003c7132feb7fmr17957906wms.49.1667221815844; Mon, 31 Oct 2022 06:10:15 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id s12-20020a5d6a8c000000b002364c77bcacsm7099549wru.38.2022.10.31.06.10.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:10:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8FB041FFBE; Mon, 31 Oct 2022 13:10:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Paolo Bonzini , Thomas Huth Subject: [PULL 06/31] configure: don't enable cross compilers unless in target_list Date: Mon, 31 Oct 2022 13:09:45 +0000 Message-Id: <20221031131010.682984-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org This avoids the unfortunate effect of always builds the pc-bios blobs for targets the user isn't interested in. Reviewed-by: Richard Henderson Suggested-by: Paolo Bonzini Signed-off-by: Alex Bennée Message-Id: <20221027183637.2772968-5-alex.bennee@linaro.org> diff --git a/configure b/configure index 81561be7c1..dd6f58dcde 100755 --- a/configure +++ b/configure @@ -1877,6 +1877,15 @@ probe_target_compiler() { container_cross_ranlib= container_cross_strip= + # We shall skip configuring the target compiler if the user didn't + # bother enabling an appropriate guest. This avoids building + # extraneous firmware images and tests. + if test "${target_list#*$1}" != "$1"; then + break; + else + return 1 + fi + target_arch=${1%%-*} case $target_arch in aarch64) container_hosts="x86_64 aarch64" ;; From patchwork Mon Oct 31 13:09: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: 620225 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2816059pvb; Mon, 31 Oct 2022 06:16:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5ayqRJ0WJdci1UWqy6mPI6ISpQh9Lq6ji4v2r41kTNLgdfRuVkP4BR/Vdty2qOI4+LZav+ X-Received: by 2002:a67:b008:0:b0:3ac:dd43:518f with SMTP id z8-20020a67b008000000b003acdd43518fmr759541vse.23.1667222204019; Mon, 31 Oct 2022 06:16:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222204; cv=none; d=google.com; s=arc-20160816; b=t64ibBrhnwCmSbZekEDXmw/nCQyKSQUK7Rq4Rpcmz3QQ7K8vIivVQ/V09XDHDIcaki kaJng56MQjMjcCeCGSOaJBZsGLzrUhYwh7DHAwEj6Y4noQqxn5skVl5V8+/n6QqbTnnA 2t557rGtBNgCBPR0x+l3q1hIYg4sn4tYTSqC192oyHICxuf2wHicx8S6upl10Sv9dgiQ LamF75okypOVJNVDbjEMD2emGIzRgKQGcrrXI0jQLbhQhBTUxSHpuI6Awghujf68n3Kb ZBM02aixDE0y5Af2BH3x4tKXNdkn/rESgl46TudWtLPb30dmwv5kIKReVEQkwO1CzWML pgeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=dBvi3VZceGTEMcPqjFN49HgzxZm4w6xNmyJ+VxQfgwg=; b=o3keMDY4RqOLlcUR2YdlqnYu791o5xKUDre2g4x6NsoPocBP+7LRpjI6zK0F95mSko pvPb9xSHH5Kdy6nIicJQ8r7NQGb07RUrHhlkdT4ojHbDV/4i6xKvAQrDxmAN13+fz05i wl5yHNTUrtl6BIUPs6KXP9lKRvxTIZ92JI4MRPlwzmHDiDQm5yKaArGAWmEiBiRcUMWM 1IbsZ7uv8NPl5zA1PYQD8HqkM4z9DPeyMws0TEwGb5gldEd/hSaIYcsiwwx8BBLI6sub UbdPDHJi6pZFC9MgxGoSEyKBA7h0Gl9KqQfonx7fya9mMdqdyag6eV8un6myRYa3oyg0 uczg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=whj1AdWj; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 bj3-20020a0561220e4300b003b7e5c5d77bsi1158498vkb.41.2022.10.31.06.16.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:16:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=whj1AdWj; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUYv-0008VO-Nf; Mon, 31 Oct 2022 09:10:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUYX-0007tj-Ue for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:26 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUYV-0001EC-13 for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:20 -0400 Received: by mail-wr1-x429.google.com with SMTP id l14so15932744wrw.2 for ; Mon, 31 Oct 2022 06:10:17 -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 :message-id:reply-to; bh=dBvi3VZceGTEMcPqjFN49HgzxZm4w6xNmyJ+VxQfgwg=; b=whj1AdWjcv0micpHvXuoKDB+G5bjLxVe3JUVgwURYSCx7Bko7HEaEA6+yUDGdQ8fcI SYhxsOr36KNu1bPAd+mgeRE1pAbT2DSsB+ruF6woQ2Acegyf4s2FkDgTKalsBzfMsbRy X2QvHz086Y49Bi1w7Ts40Q5569HRn+MWr2YBxYXPM/vO+JX9rJtJgPM0DB1PDE5EhqqC MzD/krl5WXI4gNY2MqJb8dcYIkViTcbUqGXZ5UuoHxmKmAwzzDu3qHZj1rFQMTgMBsmV NW9jKyuD81RRPRlctxZiyF/hvaNjmnNhot4kLqO3XjoFlxcCw/Z2Ahc39WdwviarELfw Zx6A== 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:message-id:reply-to; bh=dBvi3VZceGTEMcPqjFN49HgzxZm4w6xNmyJ+VxQfgwg=; b=5//eFp4zQkPwue0l2T7h8uEj+TIqWug657hTqi6/T7G6d/om3yiV71QUU6se3TDiMA fo3yf73qjeJlWCTU7/mv9+eRxxbmA5GwOJdcMYgDWDiSmyB5CqyG56MDV25kQCxX3HIx 34guNermNl9+m5XbvXifGBCpWTXNUMOHruUasQgyQo5ZvhXGcLApnbpt3DLS4Onxyocw 6K+7rREdgMIqJQfT0rEGsqAImnAwqgGQ1UUB5+sVEhqZ/cbSoq2LHx/GaZcHda37lL+M caaXYISm5HrtDcuA/xaN6GKCZugfyEaydbbZ0nCpaUKw/AigmStYQN3pitFIcsd21R90 Lp2Q== X-Gm-Message-State: ACrzQf1qt6th72Z0GlpxRX6KMVcc/XTPit4njtIVCxQG6Qxm0fxMRh+e ASVqq9ixiXa3thiQxNB81JkXzA== X-Received: by 2002:a5d:522f:0:b0:235:c877:5cdc with SMTP id i15-20020a5d522f000000b00235c8775cdcmr8172088wra.352.1667221816193; Mon, 31 Oct 2022 06:10:16 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h10-20020a05600c314a00b003a1980d55c4sm7435731wmo.47.2022.10.31.06.10.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:10:15 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A4CA31FFBF; Mon, 31 Oct 2022 13:10:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Paolo Bonzini , Thomas Huth Subject: [PULL 07/31] configure: fix the --enable-static --disable-pie case Date: Mon, 31 Oct 2022 13:09:46 +0000 Message-Id: <20221031131010.682984-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org The previous tweak was incomplete as it missed a leg. Fixes: abafb64b6d (configure: explicitly set cflags for --disable-pie) Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20221027183637.2772968-6-alex.bennee@linaro.org> diff --git a/configure b/configure index dd6f58dcde..8c2c4c1a04 100755 --- a/configure +++ b/configure @@ -1327,6 +1327,8 @@ static THREAD int tls_var; int main(void) { return tls_var; } EOF +# Meson currently only handles pie as a boolean for now so if we have +# explicitly disabled PIE we need to extend our cflags because it wont. if test "$static" = "yes"; then if test "$pie" != "no" && compile_prog "-Werror -fPIE -DPIE" "-static-pie"; then CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS" @@ -1335,13 +1337,12 @@ if test "$static" = "yes"; then error_exit "-static-pie not available due to missing toolchain support" else pie="no" + QEMU_CFLAGS="-fno-pie -no-pie $QEMU_CFLAGS" fi elif test "$pie" = "no"; then if compile_prog "-Werror -fno-pie" "-no-pie"; then CONFIGURE_CFLAGS="-fno-pie $CONFIGURE_CFLAGS" CONFIGURE_LDFLAGS="-no-pie $CONFIGURE_LDFLAGS" - # Meson currently only handles pie as a boolean for now so if we have - # explicitly disabled PIE we need to extend our cflags because it wont. QEMU_CFLAGS="-fno-pie -no-pie $QEMU_CFLAGS" fi elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then From patchwork Mon Oct 31 13:09: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: 620227 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2816802pvb; Mon, 31 Oct 2022 06:17:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7KFozqN8AaEjLgWjp2FRWOhCi5RI/H4xiycEYX6M+ysRP1qvJtE5GeHQ9KAu9dEpnf9hEe X-Received: by 2002:ac5:c3cb:0:b0:3aa:cb2f:8e3 with SMTP id t11-20020ac5c3cb000000b003aacb2f08e3mr4669461vkk.0.1667222264475; Mon, 31 Oct 2022 06:17:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222264; cv=none; d=google.com; s=arc-20160816; b=jNZyYHJnt3MvIWTS1syc+RGucokQNb/IlyhD1bEZGnW4bJOT5llWaMCnRnZN0nrCBB jFUTzZRjvFR4WqTmWxwx1ro31bGDs/ChLrVXgktv0A37ryXLw0xxjyxAC8bIZvns5JBq NUxbPcQ/uWpUHY8IrKSpVxt3Q8FnKgAHzQkav0TMlj7L5huwpK4IWinWlxpkGUMs2yO6 f9g08XGdOahkLIr8ft6g4bezP2aYmixPdfgdVHfNEw3z4m4PRrok9ydOcXAsEtGqHcSB /x2KoDaRRhvhg0kItr1PVkErJoLEtbmKXs+8IVLFYrdiUTEKUN/Jir/vl6bh5X+KUtg4 nK9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=PoltzJLghpoj0ev417tk1yzR9U9U1ZCmpckihK4pGOk=; b=u+l5Sk4Ew4WB6MpnaNEa58wxcos1CAYnhqoI1ZcnqzbE4QnBhK6EsEtmrksjJZorZ3 alWUcoIPf1xCM6uqRaTyTmLLiBFoQYjSQBXCWFJ/aKw2Kz6pUbpxETh5bm0s7ArnlAGH Dp7CKS+2HXqXuw+86FLQ0Jv5tLdlu/+FSCvZCtlD0L777ABIlI4l930DC0BEIW1EExB8 ldFqm8Ee215ZomCXgPUWdgCm38QbAf+l/cxPANHL4mo88+xf1r8P/4AuW0yx3+C0mJdI 7c28QNLAyp8Ne6CtIvYcTuCB865GEbns7d7198kDBY8kuWt/YZFfP7zPZzu4dxNdiHIc xfKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MqrN538S; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 f187-20020a676ac4000000b003aa3a3e95f7si1195498vsc.348.2022.10.31.06.17.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:17:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=MqrN538S; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUZS-0002or-4L; Mon, 31 Oct 2022 09:11:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUYf-0007wV-NY for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:38 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUYY-0001Ez-2g for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:27 -0400 Received: by mail-wr1-x42b.google.com with SMTP id cl5so4257069wrb.9 for ; Mon, 31 Oct 2022 06:10:21 -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 :message-id:reply-to; bh=PoltzJLghpoj0ev417tk1yzR9U9U1ZCmpckihK4pGOk=; b=MqrN538ShUaKX6Z1d4RlTz2L/bSOFllIAjGSi1akAIeVspnj7r3xcoPjwDpaqH6BQD VYymuw54Q3GEssXcXoMxZpp+a+oOYJIVk5n45/et8UijXLkfOenKqUDkQc5iijj70WwW MeuVwc93NEXiatuwVDTVJykgmv7wjP3iCvIZlUjtBy3Gp8Tk2Di235I6GyZn4q+4CtaY 9rg3wc4LEvABiqHhQdJNQQSzA1YevlIrM7igwMuDdsmaLV+JOlT+5DGL7W1dWAJWnfa6 1oudr0/tWrTKUZwasZU6hF2byI6JKd8HAEdgYAUOg4UhMPET7H+JHtKjefnHOwQ027Xa bfHQ== 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:message-id:reply-to; bh=PoltzJLghpoj0ev417tk1yzR9U9U1ZCmpckihK4pGOk=; b=Ty2TSO4EKislF/RSepkor3/Hqvkh5a0PmrApzCE6aPrD5NQn/dyHh6ZMnoFUGyoOaf f5POPFXyPHStY2SuRNGRLydDcb4wNXOBm19BqyW4WyppmZzpnE379O7+9k2pOcsWwnuB 7rpUArYJs33zzLgpOnlqDEPuM7aCbGJlVcDBvWTjXMgZmXpS4rLW74UBlHeuPWMR8ntZ FEFYLMw2PX4aKvKtzzoPStyUwQZ3Uljv2fxYRZ41t2sv91/eOvQEOcFmwS00p5cX8bZ6 HLN+5v3QvxRsKCYNMdEy9VAAzkI381koV1o65hx1AT3ilUk6D40sOgf+5vPcCg84NcXy poeg== X-Gm-Message-State: ACrzQf093yjTCjAb3p7R5qZ9fqb87ps7QmP0+7mevAjlyQXM6RWKz9ah nf/0Pf0HDGLvYWE9mkqPDmXqmQ== X-Received: by 2002:adf:e283:0:b0:236:b557:39e6 with SMTP id v3-20020adfe283000000b00236b55739e6mr6752344wri.642.1667221820815; Mon, 31 Oct 2022 06:10:20 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bg21-20020a05600c3c9500b003b49bd61b19sm7477266wmb.15.2022.10.31.06.10.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:10:15 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BA9231FFC0; Mon, 31 Oct 2022 13:10:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Thomas Huth , Cleber Rosa , =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 08/31] tests/avocado: extend the timeout for x86_64 tcg tests Date: Mon, 31 Oct 2022 13:09:47 +0000 Message-Id: <20221031131010.682984-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org These are timing out on gitlab. Acked-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20221027183637.2772968-7-alex.bennee@linaro.org> diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index b7522ad3a1..571d33882a 100644 --- a/tests/avocado/boot_linux.py +++ b/tests/avocado/boot_linux.py @@ -19,6 +19,7 @@ class BootLinuxX8664(LinuxTest): """ :avocado: tags=arch:x86_64 """ + timeout = 480 def test_pc_i440fx_tcg(self): """ From patchwork Mon Oct 31 13:09: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: 620224 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2815855pvb; Mon, 31 Oct 2022 06:16:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7bzSnWdlsoK0J4CVZUiA0ltVcNzxEqLeG6JpmnHL6hIEyIOgKrqt2yIHvc5hdZdz93naI5 X-Received: by 2002:ac8:59c8:0:b0:39c:fb43:45ea with SMTP id f8-20020ac859c8000000b0039cfb4345eamr10305777qtf.361.1667222183491; Mon, 31 Oct 2022 06:16:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222183; cv=none; d=google.com; s=arc-20160816; b=aOzdqpeIVhRwXJXxmcm9VqMqaayGrCIjkMUGiRUAGnlVYEV/zcjtMIOtnfuXkiUiI/ B2x8MOPkb5aMaB4zZQrTauzj+3T6g666vidQA3aIHRqbUjPfgWc+vz/50izdsDANwYIr lJKRzMW4FqwLL4lL2xDNZ6uMHi4oGTqfghw7xDX31ZcKSVMkmahncRb17xy+Ewt9mXFd G/gAoKjiXHPcb2ugbZeyRu0wJxzuhn3TAYUU05ZZhhoGaHYALkrSeHwgJF9brRSW77AS yY/zhCnLA0gtWcyzfCB4950WfIx1nX5gnscaBDxgNlOr268Ou3dQDOIrdGmP4xy9jpql Py9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=YcBzsU4yCgksFoUatww9DUnT0Mq4wvlWi4GB1ETyCpE=; b=cHmEuol67l0fqOnJtUpb4250XxO3/lhP5pUoCqu4QdXOHGHCivm9FeEppSQpxcexPd hbO5jEqnDQkI/iwpmJcBURr6QMGTUr4aA82RAmldakOEjow8DRTXq+NrURo5s/+rsjR6 yDPIdxhqdCGK+oJ9drL8MrNL8Mov/pqxm0eI/XyZ9iSHkyGqUGrxsz5r8BeIVGlMdU/U x/czMmLD5iNDPm7i1t3eKH1JVixhFS3waRfhQ7JI72xv94Af67VEdkkEM1/PQ0Vfey2R w7dEkdRont0AxBcCn8e+cqIKegiRJV43XdzCskxYv9EvBY893S1jxxtiK30lBZdTBfhJ omYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vttposVE; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 ke20-20020a056214301400b004b1881a7fb0si3830751qvb.348.2022.10.31.06.16.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:16:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=vttposVE; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUZI-00029S-7A; Mon, 31 Oct 2022 09:11:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUYh-0007wZ-JF for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:39 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUYX-0001Eo-MZ for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:30 -0400 Received: by mail-wr1-x42a.google.com with SMTP id g12so15892337wrs.10 for ; Mon, 31 Oct 2022 06:10:20 -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 :message-id:reply-to; bh=YcBzsU4yCgksFoUatww9DUnT0Mq4wvlWi4GB1ETyCpE=; b=vttposVEftxRPJf5zOOXfZJ/sYMiTIwKOrXnOLxGjtbTGLfsZKcHJq5xrr0RXOfC6E l62pIGkSLPXcl65xoRyejo23wX0yZhpRI9/N9wqfUjd6bcT0Itzt+hrN68ak5XDBoksi w/bQuOQXqdNsQt8cORMytbvKmlOHNMcEsTcOdz9WvvEEE5TQNG6UQ9faLQ8MWjUM7VUs iAsOL9k7a/5YdQ/UFAnKgTPtvCcdiZlqYltxmnz3DoNsjlt9gSM8X9OAFxXX/x2HXxcb KpAiKBdhEWEOsI+f7noPGoNAZtppw61T6GOfWWbI1XDOsSD0Kig5Bd4Ci18D50ZkyrSc zTtQ== 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:message-id:reply-to; bh=YcBzsU4yCgksFoUatww9DUnT0Mq4wvlWi4GB1ETyCpE=; b=A8nkp+2eVI3j+gs3l7QehsD6R0nFoK+9JRGqjlpuTaQ36SjyX0IUncltUHYhqYx/9Z yGsoCb06ZKoyL+DS3PKkbAqG+M6M1G64Jn7Ey3BcuL8kFo3poqsO3LcITcNA07WCyQ+B paYWKlyjCG/wZZaHTbJcAO/1qXdWTALgKlzhdJaxlXD+XSPtWMJs0yMNY6dmcRbhk33G CLV44B0uF0IUDGOxpS2xjH9PcGK8rPmlMon9B1IQrzSZCXHqz/+107zdXxbVyRQLlVkq oh2hYtRVqcZSX3HCJJw4aozOQhAOtKMoIQGAmTALYPbf4SKkXWb7IfbTJLnRiLWH4BSO f6Qw== X-Gm-Message-State: ACrzQf36wazo76DGMobl15LVlDbpzROlyJHnQ8GKxQf3ccLMncMNdVq4 L3wgVtBTFOCZFyqKMjMwPfjU8Q== X-Received: by 2002:a05:6000:c3:b0:236:a261:a2a5 with SMTP id q3-20020a05600000c300b00236a261a2a5mr8133856wrx.137.1667221819795; Mon, 31 Oct 2022 06:10:19 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id s12-20020a5d6a8c000000b002364c77bcacsm7099603wru.38.2022.10.31.06.10.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:10:15 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D26FE1FFC1; Mon, 31 Oct 2022 13:10:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Anton Johansson , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 09/31] tests/docker: Add flex/bison to `debian-hexagon-cross` Date: Mon, 31 Oct 2022 13:09:48 +0000 Message-Id: <20221031131010.682984-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org From: Anton Johansson debian-hexagon-cross contains two images, one to build the toolchain used for building the Hexagon tests themselves, and one image to build QEMU and run the tests. This commit adds flex/bison to the final image that builds QEMU so that it can also build idef-parser. Note: This container is not built by the CI and needs to be rebuilt and updated manually. Signed-off-by: Anton Johansson Reviewed-by: Thomas Huth Message-Id: <20221014223642.147845-1-anjo@rev.ng> Signed-off-by: Alex Bennée Message-Id: <20221027183637.2772968-8-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker index 8d219bb81d..c4238e893f 100644 --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -43,7 +43,7 @@ RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.lis # Install QEMU build deps for use in CI RUN apt update && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy git ninja-build && \ + DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy bison flex git ninja-build && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt build-dep -yy --arch-only qemu COPY --from=0 /usr/local /usr/local From patchwork Mon Oct 31 13:09: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: 620222 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2813696pvb; Mon, 31 Oct 2022 06:13:16 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7ckKdULVk3jMA8NPEP9S82ga1XkoywuhLLRawtCDxT0XIIkk+7P9q/NlDeJXNyVBaAY0fC X-Received: by 2002:a37:4145:0:b0:6fa:14fc:4fd0 with SMTP id o66-20020a374145000000b006fa14fc4fd0mr8020296qka.291.1667221996149; Mon, 31 Oct 2022 06:13:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667221996; cv=none; d=google.com; s=arc-20160816; b=CXlmv6EAH7Yr8hj3WAruZgsNxo0spQKFfUnmE+OrnJuOMlr8FIhTZCoKzSZ7VJCm+l a8yUVIGu9Q3tJOveTBXtXVe5o3w5LAepB1KGVUvQLn8gru/4BMcw/EPS5MgUQXrhy+8d unvRcDELqsmG1o0UnYeZ7U2LuloS/AExdow0t6YKS0BVvQRoe64rQ+1kXffGCCxkrNG8 58hgLuP2zbYrfIXBo1CGSUr8b/tRj046LT4Qbi97bhWlYVruNesYK9YrdO1I8n3fg3hb j8Qzjk1v28sJqyOONAPPRcLjbsM6n9mlPfiqzvB0IGeg5SFm6TN4TVUGkREP4N9DdM0d 19Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=1c2b7Q7q1SEFZIH8VI4BhrqJ/b4v64bPVNJSJmKD4M0=; b=bW8IskVEcmPndQYCIK95SOxt5HJFOcgAX81YEuBvzY/4b8+CsjqgPsyYpEwIGkWehd exjz0+Rl3q0qznoqmnPu+jkhtfx3qG+kgSILQm7nthgUhveBe41IG5Pya4Z5cc80cdJv i1VuUKlaOCngGFf3NNVa1o3MiKEw+t8blZ8rxLCCbOuteuGqb7ULc4CFqKg0M4YCV0Lg qJIetNXsgXXQ73B8vhZnAfW6rHthjClAbjxDrM4aAwZ4AeFPeR/S+cqe7Bi75CARsM18 45QErbVNPFYu9SZvOpuSCjCyMTzpSglJ2JEpMdNU3w/6Rdf5MZBWNWdSV6FjdShYOq93 RBdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ebeCKbno; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 t3-20020a0cde03000000b004bb58cb42d1si3525810qvk.408.2022.10.31.06.13.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:13:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=ebeCKbno; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUZ5-0000j9-VV; Mon, 31 Oct 2022 09:10:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUYh-0007wa-JU for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:39 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUYd-0001FL-BL for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:30 -0400 Received: by mail-wm1-x331.google.com with SMTP id ay14-20020a05600c1e0e00b003cf6ab34b61so1422266wmb.2 for ; Mon, 31 Oct 2022 06:10:23 -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 :message-id:reply-to; bh=1c2b7Q7q1SEFZIH8VI4BhrqJ/b4v64bPVNJSJmKD4M0=; b=ebeCKbnoJXyONIlkf10ntHNX1J0m9BH7UNmc5i4zeTW3to39gbOdsXixKShWbi9KWI laLQpBGugTZz57qy1oQvQkEMauDno5t2O8A3SBA1uAMmlTrsRLXA+NRHfIw7YRxJgNnS e2OOgqq8/l+Nj9aWYmIdB74Ld/jJo1PM0fjZsAdeC5fz3/G20bqJt6m/sGTJAuiqPLgq aIy8qkpGBhTPBDnC70PUdgtoz0CeoGF3Xe9WmpT8ahJWSO2+KG06F2wcPKqWvxtJSllU vrAbOmY2jSZwG7lR4a/S36S6RCDrU2iLklkpzByaZ3uOGtez5obEdm+QbqCmjJQl/gh1 Ziaw== 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:message-id:reply-to; bh=1c2b7Q7q1SEFZIH8VI4BhrqJ/b4v64bPVNJSJmKD4M0=; b=WaCacRTvUQVgfycLIff10huxHxPSzlz2PvBNrg782Sl2+9m5ngrNeCkD1e3fzaoq8X E6vZKrp/zTmd96LZlYR67/iXvQwq6L2yGiL+UL96yz5aoIZeTH3Eqf8c+G5GwVjgnmcp 5ECOJaoT9MaKtlP7wvkBmjvadPYzCzneZPGpKnu+edfURjXBcrj6cWhdkavTXBpS0hsV 4Unn+4SkzuOsVZeM7UUaBWfRMfHu2r2Y3Zre1DaBFsV/w/8nW3f8BXVqY5fw5YFDabZ+ CiEg1qtAMnMI+DyZleUNIV/6I1bplZfGcVw3h6eOhDu7paitV7HdQZcSPHvpJyGsB/CG oRRw== X-Gm-Message-State: ACrzQf1Twvb0j45FifIM9JtRuTePAXGbJgxPlJ0DFESp32DtguoAlQ+X c9OxNlIGNLL/nsyq8CHbE3SCNsq4q4Fj+Q== X-Received: by 2002:a1c:f008:0:b0:3b4:fd2e:3ede with SMTP id a8-20020a1cf008000000b003b4fd2e3edemr18449619wmb.133.1667221821793; Mon, 31 Oct 2022 06:10:21 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id p29-20020a05600c1d9d00b003c65c9a36dfsm7309084wms.48.2022.10.31.06.10.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:10:15 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E6E6C1FFC2; Mon, 31 Oct 2022 13:10:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Subject: [PULL 10/31] tests/tcg: use regular semihosting for nios2-softmmu Date: Mon, 31 Oct 2022 13:09:49 +0000 Message-Id: <20221031131010.682984-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org The nios2 code now plugs into the common semihosting code so we can use the same redirect invocation as the other boards. There is however a bug raised for the fact the tests don't seem to be completing properly and silently passing anyway: https://gitlab.com/qemu-project/qemu/-/issues/1258 Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20221027183637.2772968-9-alex.bennee@linaro.org> diff --git a/tests/tcg/nios2/Makefile.softmmu-target b/tests/tcg/nios2/Makefile.softmmu-target index c3d0594a39..bc7fd55060 100644 --- a/tests/tcg/nios2/Makefile.softmmu-target +++ b/tests/tcg/nios2/Makefile.softmmu-target @@ -25,8 +25,7 @@ LDFLAGS += -Wl,-T$(LINK_SCRIPT) -static -nostdlib $(CRT_OBJS) -lgcc %: %.o $(LINK_SCRIPT) $(CRT_OBJS) $(call quiet-command, $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS), LD, $@) -# FIXME: nios2 semihosting writes to stdout, not a chardev -QEMU_OPTS = -M 10m50-ghrd,vic=on -semihosting >$@.out -kernel +QEMU_OPTS = -M 10m50-ghrd,vic=on -semihosting-config enable=on,target=native,chardev=output -kernel memory: CFLAGS+=-DCHECK_UNALIGNED=0 TESTS += $(MULTIARCH_TESTS) From patchwork Mon Oct 31 13:09: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: 620232 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2817481pvb; Mon, 31 Oct 2022 06:18:36 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7601YBNuA41EmHJ+AKMUUQXgv4i6uniePmjOn27WVgadyDnTCUPz+uQ+xd04lphsgNPO63 X-Received: by 2002:ac8:7e82:0:b0:39c:f746:9250 with SMTP id w2-20020ac87e82000000b0039cf7469250mr10606520qtj.620.1667222316800; Mon, 31 Oct 2022 06:18:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222316; cv=none; d=google.com; s=arc-20160816; b=zKJ7D1O6ZcdKD5MRF0w6n9U3A9Q4IrONSOtB/IUy8GMfVQme2hA7bI4AOqm9evOMH8 4nc62e/aD2IopB6277yP/SbZMkZcKEyMS1pK7dlO98CwTCu26oXUgWcZktpdUdHUH+sW HFB7EPyZ4pvLvVX21dAVMQQ0eQFN/FN6k/RftX6YN4nQWyAazTDwbuALFLczXl2aruP1 HwF8QrpUC64+q2/eKCKv/X1Ns9sNYq+duujKsQll0xLwj35+ZG0fZViuy8zuHVCVDja5 xxbZ42F1v4FJUi9MZDPoZYuRX2+Q1SYP2LJ1U0daRBAe59Yj7Sw673Q44X0vL7t1N3tr NMiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=avCuxU0YK7dOwSpC6nhmi+sb9xnjSlD1u004mIyxDYo=; b=OCDzfl3L7dSMPkYz+r5vG7AmH1P6U6MLz519CGm2dtfiBaxKOPeHKsodOy7Vr2gKYK Dx9Vz3k9hoGC6K40s8b3wvxSUSR9E8z1SAuwAVeGqJaE/DIc7kw7BGle5zaE9O+Uc2TP 96LB9u+oDbtZAps9TGOuG/POis/dfbSJPnNRKZPbsKufOA6q3PduXyazuRSbY6pX5ih8 STya5gdunODdKNMb0agYPWmAM4r9LmFY5/v971foOs4eoN5b3k2L0R+mrRnOsaEhMrIX vLuUMC8hT5Z/F0qeCAi0zdzQX61eY/j8Wq6TbyUpQtM8BMU1wiZatqNI7TNBvlUgSISW 13QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mBEBS39c; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 f21-20020a05622a1a1500b0033c4405412csi1722324qtb.429.2022.10.31.06.18.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:18:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=mBEBS39c; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUZJ-0002HN-BR; Mon, 31 Oct 2022 09:11:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUYn-0007y0-Ct for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:40 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUYd-0001G6-M9 for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:33 -0400 Received: by mail-wr1-x433.google.com with SMTP id z14so15887508wrn.7 for ; Mon, 31 Oct 2022 06:10:27 -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 :message-id:reply-to; bh=avCuxU0YK7dOwSpC6nhmi+sb9xnjSlD1u004mIyxDYo=; b=mBEBS39cp+0RzYvjQ7+DEHBhtnDAN3r0TnpZd9t9dso44Ph9jpq1MpGbbIOhBwBHU0 qkawS3rPBU9CAVeMvDe4ESMGxEmPyBvlKatsLWQ6tHBN67u8TFvvOO34ZiD7hNJKFE3P IrR6U8O2R8a8W1Q8w2pCnl1iQQF/90jwvgOEj5Y6YDBaJOE6gSYHz1neq4iXTmK/pQHl RcvdA2ciss/uK02LAdBXCBHLwC7EfPbLgZi5gkH8/jAaASTMVmxME8yG9WwlEMpaTYdJ dNHhzcUQIZHqas/rxuhLWWtsauagO6NcFzAQmSNdmnKQ+BXcwlm1QyBKidfEd8TNNrCm dcgw== 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:message-id:reply-to; bh=avCuxU0YK7dOwSpC6nhmi+sb9xnjSlD1u004mIyxDYo=; b=oyGYpbKpNSV4oKkMv0QxTxbTe27yFfDmDvWaI3pIIf6j8EKsd/wdVIO1tBbSEwIEnn eJfLfpyrgmnF62otBs/ObFfmSZ7Auzfte7ZGN4n896RJmu9wOQIrlX8TBwsMpiu9QQVX rMbpH8b4Fjk0tu6tf+NgxKwuhf0bGBH/wA+lTxBQwGFVQyLJpCYWHBt2po1xZniyvzhc OOG0O0MLtjdGfcMlq7Lh4ZzDXtFFzYFxFHlCT/GwBZ/MJsdCQOuEDQCFkYUym5fJ0KDw /bs2mjb2McayyzqkoE9FXQExoayOmeSkV8+uQCzVzKtZP7rjj/A5ZYVqwenMWVOeaaSA x1Jg== X-Gm-Message-State: ACrzQf1Gt7bnvnceFon+NXIuYHfpPnRLEdCZAXwMmQaiDu2H/fFnvJmk CuUy+nliQl9bV5gI43CfNkiB2g== X-Received: by 2002:a05:6000:1f1a:b0:236:ce27:230a with SMTP id bv26-20020a0560001f1a00b00236ce27230amr2486038wrb.469.1667221826254; Mon, 31 Oct 2022 06:10:26 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bd26-20020a05600c1f1a00b003c6b70a4d69sm7222305wmb.42.2022.10.31.06.10.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:10:20 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 078A61FFB7; Mon, 31 Oct 2022 13:10:12 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 11/31] tests/tcg/nios2: Tweak 10m50-ghrd.ld Date: Mon, 31 Oct 2022 13:09:50 +0000 Message-Id: <20221031131010.682984-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org From: Richard Henderson More closely follow the default linker script for nios2. This magically fixes a problem resolving .got relocs from the toolchain's libgcc.a. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1258 Signed-off-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20221024035341.2971123-1-richard.henderson@linaro.org> Message-Id: <20221027183637.2772968-10-alex.bennee@linaro.org> diff --git a/tests/tcg/nios2/10m50-ghrd.ld b/tests/tcg/nios2/10m50-ghrd.ld index 7db0d59ad7..71cdda450c 100644 --- a/tests/tcg/nios2/10m50-ghrd.ld +++ b/tests/tcg/nios2/10m50-ghrd.ld @@ -44,11 +44,15 @@ SECTIONS .data : ALIGN(4) { *(.shdata) *(.data .data.* .gnu.linkonce.d.*) - . = ALIGN(4); - _gp = ABSOLUTE(. + 0x8000); - *(.got.plt) *(.got) - *(.lit8) - *(.lit4) + } >ram :RAM + + HIDDEN (_gp = ALIGN(16) + 0x7ff0); + PROVIDE_HIDDEN (gp = _gp); + .got : ALIGN(4) { + *(.got.plt) *(.igot.plt) *(.got) *(.igot) + } >ram :RAM + + .sdata : ALIGN(4) { *(.sdata .sdata.* .gnu.linkonce.s.*) } >ram :RAM From patchwork Mon Oct 31 13:09: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: 620223 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2815827pvb; Mon, 31 Oct 2022 06:16:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6jHTTWbbUMd3YEqRsxVKLkwxdRFubSWizo1j9fs71jNSTIlJAfWmUlG3GCrN0HnUsoKIng X-Received: by 2002:a05:6130:a9:b0:40a:9b31:929a with SMTP id x41-20020a05613000a900b0040a9b31929amr3345752uaf.89.1667222181972; Mon, 31 Oct 2022 06:16:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222181; cv=none; d=google.com; s=arc-20160816; b=iAslHCFvJRfpj9Q0lsowWzAYYzdBU01PMLV9KLw6oqLsJt5azzv890ZJCODpHqabT4 NomGZ4bCwGmV2LF7O9TW9Z18wtBtUrAFvaA1+n2W3YOOTLf3r8sx1lAQ5AGpPMgIKvNC 3j9nSsIMn790Xm1+++fLVKLai1ftgyejbbcxqVKDGwmFKGSNWcDP0RdIt5uJhykQNk/1 hKSFBFD3CsL087jLXEaY/qqdR5UjByAZsfdw5SSU8uTVWFcmds8pZjNzidTg+w5p29Fw 8cIKqh/GVWSU9TEgP7iCxKscAw5eV6MyXy5/HogCuGo5w/0tgS+mXHD/yRhBOirCyszj ZRuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=+bJIQoi/K9AwRlRvPmx2+d3fGZfR8Up7yVsMefwI7z0=; b=HqxeICHjvqZTJwASXSxDUUqJOXcrcJgbW160fKSprb+ktPos1NKnFRv9OGc153J+3H cUnE6BKxYblHpbdb8ycHyT3wK2YThh0N6Sep3/km06lAAGYRDYv41lTAEkz+OCdbmnk0 dajbY9rywceihHxejlkvhVHVHUewoKlGCfa51DSkxvH1Bfcc1t6JU+kZs/O39O5vRkiO 0BrbxjmnlCD2QYry4NNv1h3sZvnl/I9LPxzqBxM1s0Fcs8kx93YDPmMpjfgAkkf7QfMO /E/kaH1WQS9TIRZOW/0gtTTdTppkQUO1WYsSG1c6xMzHFql44QBbdmITCBxPhuwmun+T zZjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bQt8eVy3; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 h136-20020a1f218e000000b003a7ba112807si1118777vkh.255.2022.10.31.06.16.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:16:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=bQt8eVy3; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUZF-0001hD-BX; Mon, 31 Oct 2022 09:11:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUYj-0007wm-FW for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:39 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUYd-0001Fa-JH for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:31 -0400 Received: by mail-wr1-x436.google.com with SMTP id g12so15892569wrs.10 for ; Mon, 31 Oct 2022 06:10:25 -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 :message-id:reply-to; bh=+bJIQoi/K9AwRlRvPmx2+d3fGZfR8Up7yVsMefwI7z0=; b=bQt8eVy3EqAJ/NPr+YULLCGt+HxehY/+ODs1uT7leYoj8zFom/hcG6ANcH5Y4m3YjQ oStnttNKiQUdvgCpdf7bojBzB/BzmzUvLjrW2Sz0c33nyXE8fXw7yC3f2tvDTXGeUK/7 IrlcPpt9QCGLnVgqQ5Mp9Ut1lXhz8g80vcbHCxrvkr60oKO9FI1Baf7hDEn1Kgs5XV3/ g0RIfW1nvdK44QRjIGFWV9NIKQ6nQi+ShSbggRKBMIRSD3PfkSTzyLr/Mnh1BV89e04Z OPbey+29qTUCAFHpUlTlAnovvI3tGqv6wNbEibWFH7eA9oMt1kKASiVK31Ox0220sqx4 Hx5Q== 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:message-id:reply-to; bh=+bJIQoi/K9AwRlRvPmx2+d3fGZfR8Up7yVsMefwI7z0=; b=riqFk6inPF5XNnR3IElih1q4VohSRxHcn0Qo19kJw5Z8duGHArjN9yTOmN3qP6Aurf kqZiHMA3k8KLXr85mQr/t834MSgH2sFiEUfkQe7P2mB8RWq5fLE3V/gKcQSq8ro5Arph t+oaMGzHm0e37yLBOglbRBKwF7nOiLpGkXr8fcAj+zrdmmc5NlIPrN3d2j3TQrPPMrQD Qu8re9vS2BFHvx8XbMfRBYITpMF8Qz8PraurMHe/ZFvnvjHkflaHUGT9pjCk2iD73jVL fRnsnEXm5C49Fi3Wmr2ULglkq9SFODu/hgt9pQb5RqksaOMGCpY5xl7XlScuChmV5Ih2 BmzQ== X-Gm-Message-State: ACrzQf2dXN5AfEZm3WgQXXYNgR8bZAyH+CsdliyUva0Fm+aE2B+qouYa t36hZ6oCfBXCklt8GL+5pSmqNA== X-Received: by 2002:adf:e30f:0:b0:236:d8ef:9ede with SMTP id b15-20020adfe30f000000b00236d8ef9edemr1502869wrj.170.1667221823233; Mon, 31 Oct 2022 06:10:23 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q8-20020a5d5748000000b0023677081f3asm7118372wrw.42.2022.10.31.06.10.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:10:19 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1DD2A1FFC3; Mon, 31 Oct 2022 13:10:12 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Bin Meng , =?utf-8?q?Alex_B?= =?utf-8?q?enn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Richard Henderson Subject: [PULL 12/31] semihosting/arm-compat-semi: Avoid using hardcoded /tmp Date: Mon, 31 Oct 2022 13:09:51 +0000 Message-Id: <20221031131010.682984-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org From: Bin Meng Use g_get_tmp_dir() to get the directory to use for temporary files. Signed-off-by: Bin Meng Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20221006151927.2079583-2-bmeng.cn@gmail.com> Message-Id: <20221027183637.2772968-11-alex.bennee@linaro.org> diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c index bfea9e9337..62d8bae97f 100644 --- a/semihosting/arm-compat-semi.c +++ b/semihosting/arm-compat-semi.c @@ -503,7 +503,8 @@ void do_common_semihosting(CPUState *cs) GET_ARG(0); GET_ARG(1); GET_ARG(2); - len = asprintf(&s, "/tmp/qemu-%x%02x", getpid(), (int)arg1 & 0xff); + len = asprintf(&s, "%s/qemu-%x%02x", g_get_tmp_dir(), + getpid(), (int)arg1 & 0xff); if (len < 0) { common_semi_set_ret(cs, -1); break; From patchwork Mon Oct 31 13:09: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: 620231 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2817463pvb; Mon, 31 Oct 2022 06:18:35 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Z5FjAGe/26N6rjdWryIbD2nPlzM6GhADxrZEdYt9Kh6H8+Aytf7fKsNaAuj/jHi4Z1K2e X-Received: by 2002:a05:620a:490a:b0:6fa:28b1:6a84 with SMTP id ed10-20020a05620a490a00b006fa28b16a84mr4018697qkb.536.1667222315007; Mon, 31 Oct 2022 06:18:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222315; cv=none; d=google.com; s=arc-20160816; b=j6RP7foBV4GxX9BHYO6jZAonhL2JWtMYA3w96HJsPdfezLse3j9YQbEFcsTmAmjIFQ 2sGm2/h+0L08F067LiTtLOZQJFDzGMQ1AFeI0l2c6sqbS4/vVwp2T2cFIORXkaDn5u8H 7CH4MY/5CWWYuXzesXRUvEiZkZPIGnEJ+Xq+7Vf+PG4i8MQIiHaQvI02kxLsf242F7XD SIyrBSmLJuAYmBYjYFnxiD1WZa/Pkv6BfD8lobHgrwrcIrwQ30MA9neoTq9vEIBISywr ErwCDBhieOreBJNWjaf1eQTYt0VeUNM/hXwDRKCUwOA+lCrp1OnVUSbB/YOj8eJ17XuK o1cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=bDnHP6RNJg/cdbD39uW325f5OF55I16EB6PoypSgmcg=; b=W+Undf4H6Xx/tD5AphOnbWkxmvf/DJf9/ZToLyBjS1NLgxRfAFL0H9y4J+73QzOFao hq9TsnFvR6AHLd1p9C5+TfQM/+jx6CattHqafR7ZTymS0fcL9F2fsdJS0heSPl7Gvcx7 bnFFbS+5BDZrQ4DXSNOWU2Gn+Yj8PcLoSHkQ/T3Q+/SRcWlzVr2ej4xB5oTz/omJFMc4 vGq21Yw7iPvVoomMXoIBVRqdjJBOEInjSylNHiHVZvDy6M3qcMUFDekkPXnsqFUcpVtH 2z9HtzgZYBQ91PYQbsktHTetgrjt/G441k+gvazV4QPxMkwa/sFvVC7AnPFw9jOPAeEZ 37pQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UEfR5Zoy; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 ay10-20020a05622a228a00b003a4f3f79281si3824645qtb.172.2022.10.31.06.18.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:18:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=UEfR5Zoy; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUZD-0001Vf-7B; Mon, 31 Oct 2022 09:11:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUYj-0007wo-GW for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:39 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUYd-0001Fd-KN for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:32 -0400 Received: by mail-wm1-x329.google.com with SMTP id b20-20020a05600c4e1400b003cc28585e2fso7993555wmq.1 for ; Mon, 31 Oct 2022 06:10:24 -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 :message-id:reply-to; bh=bDnHP6RNJg/cdbD39uW325f5OF55I16EB6PoypSgmcg=; b=UEfR5ZoyZR/6oljZ9Tk/EsOnr4Q9LNUp2QCT+OudMEOV94qTOpoXIAw9aBB69LZpNZ uuez5ofUEV89Ma7a2O/9/nwWje3thyKoeSDeXdXZM86w9aMjxuZ6+YmrellFBcg8ko7B uGEZKPKr97CYNC42jQAEpkwYXikZ71NSc7Wca+ETmecbIwCJxqE/vLf6/FxIZ8ZooK1l E8XlE10QC+TDYrdmF2fpO7VWAAjlfkb3ZuI46aqe0COuwnyyd8GAfBAy7kHnKsmWT0Rd iVKFpfp6w8u7bA1piM+qcxp9pV90MaGubwSbBMgbzowUpjuZ5PDUPe5BFzTplWOfpKTq rdkA== 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:message-id:reply-to; bh=bDnHP6RNJg/cdbD39uW325f5OF55I16EB6PoypSgmcg=; b=a0Ou8/b57Lm7u4JeHFpuJh32kcW6p9J+K2Wz7hyVtP/aP803xK5G640byjia0CJqIK XKsFFuXv/pPW5UqLkZ81m5Ga5djhHOKvKsTIrrydH3jXXQmlbH47GvRprEMfIdouJbXa dbQCInu7bWiunm46tFXZSzoPLAoJFmjrnPC82aiWyPifSGmUNH16D0lNd54oDbSruoyi OLrGUX2LKw6DacGZ72OyGT3C4V47iQHiiOlUfp2VxJIdlBb+K+eqtaeRpb18xxj8jmNU 73bzG+0mdLLOiA5IKF6YtGZeB3bA3K6JRvennzKxlTVmuYKTzDB7y5iUsyreXW5M3FQt s+wA== X-Gm-Message-State: ACrzQf0NZvo8ldb/KadT9nTuvHWTCcqoAV9BkSu/Q+PVroIk7DtqWu6N c3ESgix7iP9yZbMW7551ICLSpw== X-Received: by 2002:a05:600c:538a:b0:3c6:c223:7ec5 with SMTP id hg10-20020a05600c538a00b003c6c2237ec5mr8202068wmb.37.1667221823692; Mon, 31 Oct 2022 06:10:23 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h3-20020a5d6e03000000b002365730eae8sm7018050wrz.55.2022.10.31.06.10.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:10:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3294A1FFC4; Mon, 31 Oct 2022 13:10:12 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Bin Meng , =?utf-8?q?Marc-A?= =?utf-8?q?ndr=C3=A9_Lureau?= , =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Richard Henderson Subject: [PULL 13/31] tcg: Avoid using hardcoded /tmp Date: Mon, 31 Oct 2022 13:09:52 +0000 Message-Id: <20221031131010.682984-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org From: Bin Meng Use g_get_tmp_dir() to get the directory to use for temporary files. Signed-off-by: Bin Meng Reviewed-by: Marc-André Lureau Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221006151927.2079583-3-bmeng.cn@gmail.com> Message-Id: <20221027183637.2772968-12-alex.bennee@linaro.org> diff --git a/tcg/tcg.c b/tcg/tcg.c index 612a12f58f..84921b64f7 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -4729,7 +4729,8 @@ static void tcg_register_jit_int(const void *buf_ptr, size_t buf_size, /* Enable this block to be able to debug the ELF image file creation. One can use readelf, objdump, or other inspection utilities. */ { - FILE *f = fopen("/tmp/qemu.jit", "w+b"); + g_autofree char *jit = g_strdup_printf("%s/qemu.jit", g_get_tmp_dir()); + FILE *f = fopen(jit, "w+b"); if (f) { if (fwrite(img, img_size, 1, f) != img_size) { /* Avoid stupid unused return value warning for fwrite. */ From patchwork Mon Oct 31 13:09: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: 620219 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2813444pvb; Mon, 31 Oct 2022 06:12:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5rsGv7+XGtGd/GZZLT6Uo+LIvnm57gJ71tFgHlZcSI9IAgYpIVjZNnZYtGhs7/1K6ggXWR X-Received: by 2002:a05:620a:51ca:b0:6f5:71e1:5ccf with SMTP id cx10-20020a05620a51ca00b006f571e15ccfmr8687981qkb.217.1667221975642; Mon, 31 Oct 2022 06:12:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667221975; cv=none; d=google.com; s=arc-20160816; b=IJOS0o2npR56DA3Gh53RCG3XCMTbb9Bd6f5PB4Q5N9Q3/7mP67oKNrkiqFZ6SDz6LA t91OrgSj1P048ycZXKuCOLVo+oF8Bin4xmJ8F5DUUwG6S5VpKAXEGY8eU3TzpRxiOsOW CesnKgGzqmOVRmLm8peUFs0FM8BvxcTx1Od3szP4TAzU0Dhm5nSL4S9ETnNZQ9YwQ456 /+s3Uyfqcw/o3rFAfGNW/7hIPh5PRX8wthV2jJ7BQX+GVktQXg8UAThV40tPWaTp+qHO d3Fkg0dMRLtMiXPi+thdlwmHgm67UtBjbEsJdcYrLG6Irqo/e+SxMluSoPsrk8HrGuFP thbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=VyZvGFNC4ORY7b96ucb5nmVpD+aksz6ZfUks+N0kj+8=; b=o+xQQMl+qAgJGqEyjRkKf5xVTqpEp+sOdVpJp5aLY9HZTicc0kfpa0nA/R7Kjlspu8 0fEdBfzH/4G0NOH4Ns6szWJKtuF5YaCOx8obvvxP7PMcPPByK6b4JCsR9U9yhaGc8y5x +FSenyRQ2gKuUgqVFWod9LF0avvBfdU8zOCukiVQyvqnumPdAcb/BooVN5enNz6MvEnM 4StEhcPiJpICiWyiwa5bd4BvqMt/uzyO922B8UfnPJc1jPD0fEFMwnMjygWKQYRW8TXa zPJC/46Up406YReqzq9M2rYdbW6oHTMvOe7GWSS1OIK0cwTkrY98Q6rt2LzrsoejqnqQ 88rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H85dux9L; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 i21-20020a05620a249500b006f9bc401e6dsi3903744qkn.70.2022.10.31.06.12.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:12:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=H85dux9L; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUZU-00030S-1f; Mon, 31 Oct 2022 09:11:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUYw-00009m-4R for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:46 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUYd-0001Fo-Jg for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:45 -0400 Received: by mail-wr1-x429.google.com with SMTP id h9so15962082wrt.0 for ; Mon, 31 Oct 2022 06:10:25 -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 :message-id:reply-to; bh=VyZvGFNC4ORY7b96ucb5nmVpD+aksz6ZfUks+N0kj+8=; b=H85dux9LKFT3wO2Jp3yrY+zOydAcGo88bZ8nT8YAcAwcil++GIo1ZKGIDZrh9cPXxb lVo6SMtIv/RoMEmxiBCqs/pKfsiIoZ+KcYsRH//LMwweVnLXrZ2w3nv727ENJLeztUtv O4pnjTwj0lUmSMxqI4R2qI35RnmNDW5pTJO+zPhoFwUVdSX8W3tEbA/aHiD3kXpXpeq+ 2/g8xr47M/0Zwxc6t5y7tK+pqYtqqVswF74Da28Z03VtjtYmpvPqgxWSSKFvtwMuAnrT 0ad4PMvj6ZQcHn5jgPxTCIW9k0+qR8V/8hJx1qpJYGolbC7+SGEM+N+AkQ3tuKxOHHJz 1SAQ== 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:message-id:reply-to; bh=VyZvGFNC4ORY7b96ucb5nmVpD+aksz6ZfUks+N0kj+8=; b=shpFkM31pMlXZ1q0mTWh5rmrSYmQYa6D8doxp+gnKC1c/rtQXNTmNaZFlrEmqb+Ggj e/lyZGKY4GmN/02hHNZ3F/eXJjxrQdmLW5bYgX/y1M+FiZ41Ru5Ugq0Vkua7ZmPDtBNb oC2KmxUq9pofppsuH7vMBG7BzAQ6PCARVMO14DSsi2Nvn0P8OFG7wNlvcPuzyQ4suKfS KijjutM3o3A+umxWjNfxMIhUxgTsC3LSwuPXgdNbvtK18a2Pc/sCkwkRyKoO2mJcRrTI QF9+NpqrJL7SSkXJIrrjxwLZ1cdOS2ptYz75yEmaejyU71u+ryq+GXQ+m/4q0QWRB4jo 0Bdg== X-Gm-Message-State: ACrzQf0w32dxoTvRDagqXh2SeIyuffcInvyxbFoOvTud7V/YhEC0aGKB nwzQ+l2wFjghOVRjuGBiHUPHQg== X-Received: by 2002:a05:6000:381:b0:232:2e1:48e9 with SMTP id u1-20020a056000038100b0023202e148e9mr7905737wrf.166.1667221824756; Mon, 31 Oct 2022 06:10:24 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n185-20020a1ca4c2000000b003cf66a2d433sm7153619wme.33.2022.10.31.06.10.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:10:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 494BE1FFB8; Mon, 31 Oct 2022 13:10:12 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Bin Meng , =?utf-8?q?Marc-A?= =?utf-8?q?ndr=C3=A9_Lureau?= , =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Hanna Reitz , qemu-block@nongnu.org (open list:vvfat) Subject: [PULL 14/31] block/vvfat: Unify the mkdir() call Date: Mon, 31 Oct 2022 13:09:53 +0000 Message-Id: <20221031131010.682984-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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, 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org From: Bin Meng There is a difference in the mkdir() call for win32 and non-win32 platforms, and currently is handled in the codes with #ifdefs. glib provides a portable g_mkdir() API and we can use it to unify the codes without #ifdefs. Signed-off-by: Bin Meng Reviewed-by: Marc-André Lureau Signed-off-by: Alex Bennée Reviewed-by: Kevin Wolf Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221006151927.2079583-6-bmeng.cn@gmail.com> Message-Id: <20221027183637.2772968-14-alex.bennee@linaro.org> diff --git a/block/vvfat.c b/block/vvfat.c index c5b1442145..723c91216e 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include +#include #include "qapi/error.h" #include "block/block_int.h" #include "block/qdict.h" @@ -2726,13 +2727,9 @@ static int handle_renames_and_mkdirs(BDRVVVFATState* s) mapping_t* mapping; int j, parent_path_len; -#ifdef __MINGW32__ - if (mkdir(commit->path)) + if (g_mkdir(commit->path, 0755)) { return -5; -#else - if (mkdir(commit->path, 0755)) - return -5; -#endif + } mapping = insert_mapping(s, commit->param.mkdir.cluster, commit->param.mkdir.cluster + 1); From patchwork Mon Oct 31 13:09: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: 620220 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2813632pvb; Mon, 31 Oct 2022 06:13:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7sAJSmMvm8SlCwJ848b1APDRJ+SCloLXXL14wtLNQ2Vt4ChMqIdSKPmq+w5s1sSyrcA8HI X-Received: by 2002:a05:622a:19a2:b0:39c:ba6d:5d6d with SMTP id u34-20020a05622a19a200b0039cba6d5d6dmr10349788qtc.358.1667221990696; Mon, 31 Oct 2022 06:13:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667221990; cv=none; d=google.com; s=arc-20160816; b=a51VfZr+zHEUFdDVcAkQHwC0UGD1+v0SSwbmQtkYh4e15dEE1ZUsMDGiESujvKU5mS hbX71ekpxs230lDZe0jCrOE7WJEwNl6qHVL9R6PZ0DmC8uVb9z5KU2NuvNflWOOAH8iq jw9N4AFm2jH0DjenDYmjzCFWuohG+nVpHIoBAntZq11LkrWHddSkYv739YuDJL+SWq72 J4efrdeTlwlIsxgYWpIj4H6mRAjKkl3x+4NPSNOGDqg2ak9OuPhYW9lLQCstdxeKxqPx oGjarIw94kabLjoIxUV6c/nKhkjPcsQxkvACY41kOiSIqDgC4Am9xd4suIKrTENrIZje 2mTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=eQ3mqyvV0NL98udsiVwGa1NOdzcIa4/RtP/2vDX4TN8=; b=tLkCqGZyz/T8oHpZowhmGmOQ8Rqq1+1TR/cpyFPDRXMPH55w3ifvvGhwF6n7XHaC8p DlnNqQaNzqDSW2a36guENzTEVMokBpTl8GXk3ljHE6dQ6/7nKv4Gnyj2RhwfpvminJIo abbQy7/M0EeIRo5xK2wkvDYAAD/H11c9r35Tsy0XZgIRXoF7Im+7gqoW/K6wqGc7pTW7 S0rjJbHOdVC1AqA0TBJryAFsymyYNnh+hGrzLjUHNmYf0arMfRG9nrHzWPryxnZ2SGFc 1JMoGP2VOIDiBKs25sef+6EI9W8Iphca1h9lmV69OAdsoliYNOA2DmLBQdwCJeNXm6jG bmvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=p3W8Bxp6; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 gh12-20020a05621429cc00b004bba808449bsi3690484qvb.81.2022.10.31.06.13.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:13:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=p3W8Bxp6; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUZK-0002Nh-DI; Mon, 31 Oct 2022 09:11:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUYv-00006x-Pv for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:45 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUYd-0001Ft-Jq for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:45 -0400 Received: by mail-wr1-x433.google.com with SMTP id v1so15890037wrt.11 for ; Mon, 31 Oct 2022 06:10:26 -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 :message-id:reply-to; bh=eQ3mqyvV0NL98udsiVwGa1NOdzcIa4/RtP/2vDX4TN8=; b=p3W8Bxp6EX7kj5KEmlytD2jyvUu5eiuJbEYUErcXczx9gQp5qpBLSSC5AmAgqDuqbI 0fmbwf9+VcCqrzGGbXWLNY7zAIIpo6wrvUTFOrUrlPvvbBxCf0aEaSc9TMsW6OY3wYif IJsYUTHvpfrkAwiD4n0EL1loEMIKuY7vEpAs7c87bx3lB8BfWlNdSBJdV6iPzJgfJyWh Y9SpkleopFf9vuYvmjc0YyESVgSpWhwO2XovCcIK5arSw5NjOfpRq9C0GQqHejOrz9wC Hr35eQ/EIHORledSIY5pmcF138O4zX/sMpImK75GrtOAJiz3aY11h0ZgQZ5gWoXZmVpZ Kerg== 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:message-id:reply-to; bh=eQ3mqyvV0NL98udsiVwGa1NOdzcIa4/RtP/2vDX4TN8=; b=Z3iEt0+l4WRGdht9z0kwJ7F+dXmWNZHMr23yzhw+/Tnd6QDAArIFIo3yDPePsHl8tx anfrOmalJz+e4m7xANSLnCHwjzG61IP+u4fsbRDEMGYDuvxN/1q3Nrh+SWZEsMv+46Yj fanSOrtrbOz5s6Qk6OYdkj9Ir0VJNY3+DyFRINjVjILqFtawphPIVX/Eu4cPJI2WtO2n ZqYg7LHe7h6BrfCrYOG6OSodj6+LjRvvsjWgrBIsJaG8vDQv79YyBC4/J4zYncUy4ACz bTWj0Z89VkPWdXpKC2ej2CLEh7qloFIsdFx7Y86VCSM6fUZztCzzaJrpN32pPY6E1CJx Hk+Q== X-Gm-Message-State: ACrzQf0Mzz1TLAFJ1AmNjynOoxJOwtT2AVz11viptk8TamJhuQU7lsDB Izp9Zt/3zRyGcw/MMhLtyNzhjA== X-Received: by 2002:a5d:5386:0:b0:236:bec0:d935 with SMTP id d6-20020a5d5386000000b00236bec0d935mr4002413wrv.547.1667221825193; Mon, 31 Oct 2022 06:10:25 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m17-20020a5d56d1000000b0022cc6b8df5esm7133803wrw.7.2022.10.31.06.10.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:10:22 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5E9481FFC5; Mon, 31 Oct 2022 13:10:12 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Bin Meng , Gerd Hoffmann , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [PULL 15/31] hw/usb: dev-mtp: Use g_mkdir() Date: Mon, 31 Oct 2022 13:09:54 +0000 Message-Id: <20221031131010.682984-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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, 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org From: Bin Meng Use g_mkdir() to create a directory on all platforms. Signed-off-by: Bin Meng Acked-by: Gerd Hoffmann Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221006151927.2079583-8-bmeng.cn@gmail.com> Message-Id: <20221027183637.2772968-15-alex.bennee@linaro.org> diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 5831395cef..1cac1cd435 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -14,7 +14,7 @@ #include "qemu/error-report.h" #include #include - +#include #include @@ -1622,7 +1622,7 @@ static void usb_mtp_write_data(MTPState *s, uint32_t handle) if (s->dataset.filename) { path = g_strdup_printf("%s/%s", parent->path, s->dataset.filename); if (s->dataset.format == FMT_ASSOCIATION) { - ret = mkdir(path, mask); + ret = g_mkdir(path, mask); if (!ret) { usb_mtp_queue_result(s, RES_OK, d->trans, 3, QEMU_STORAGE_ID, From patchwork Mon Oct 31 13:09: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: 620249 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2825090pvb; Mon, 31 Oct 2022 06:30:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7S2qh19apNBAEqP5yNsmfm70fU4z7d09QT85csFsidr00WRK3uWmuVaOWA9vds29kpscTw X-Received: by 2002:a05:6214:2aa6:b0:4bb:b2e9:4f1c with SMTP id js6-20020a0562142aa600b004bbb2e94f1cmr10700102qvb.29.1667223042648; Mon, 31 Oct 2022 06:30:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667223042; cv=none; d=google.com; s=arc-20160816; b=w5XZG2zINgC06GlX2+/NWFWuq2empwWd5wWDzsUWqtVxloYhqge/cq/9nRvYk5fQEr ZzGVGrEjkQklvsasmMcHPgyaoC+AJy+aXCTrgqf5uGH59+T4Km12HvWsQfoybgekS3sb dqEYCurFyZZva6xb7SHm03FqtiyEZm/HH/xXzapLK+5ogL6bl0ZUWjirjpBFlsW8F7tH OK/KYR/bAHsIkTmKSZsyNTy53Xu72RdvtLWB1FhtX0AUmHCdUlLczukrudYFKw4eqeRy nhuLnCv6KetENIhs/fM7aLr75nWV9I58xxBJkGLfCuyZ5JFJT7vYp/GN9wFaPKMQVvvh MEZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=wN4sgq5AZPoexBZZqiq11ALBDmUmR8A1dFt4GgZFE2I=; b=tx+24ykDTEstCspTmkwNEXEPHWc7gy0LHW/5GMeGNi+bkCEetc5A2KIDvLIpoICXRu A0ULlJWjtgv4k4GoS1rF4CgjLRE6IIDum/q5Opgt0425az63jNaaYUl8D6tLKcDTvRNM vkR64H780Ls3DcMXRCAvfZ89dlwKQmyv8w3Qisy8INh7xpUdtjXRdERDOYF8C5lyGfMQ 6VOgIRjOcdzYfvzXjzQnuLhmSJnYYQJ4uHxJGrAWsBUpzGmDtGxADcBZToCWe2Xj6C1R xU4AiURAavI0XofdelWdAXXrRtDZ1YWWRffWe/eFYsnKNwP7LJlOlEZQduZNfsjT7Mb7 oaXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=y6MU4Ggg; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 j12-20020ac8664c000000b0039ce2d6ba0fsi3760472qtp.321.2022.10.31.06.30.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:30:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=y6MU4Ggg; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUrU-0003eE-Dn; Mon, 31 Oct 2022 09:29:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUrT-0003bc-1B for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:29:55 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUrR-0000qJ-Cf for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:29:54 -0400 Received: by mail-wr1-x42c.google.com with SMTP id g12so15970468wrs.10 for ; Mon, 31 Oct 2022 06:29: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 :message-id:reply-to; bh=wN4sgq5AZPoexBZZqiq11ALBDmUmR8A1dFt4GgZFE2I=; b=y6MU4GggfhszKUnpUl2sMB2GLX5BECNey1uSin+B2bccdDsmb7AJ479la7JdN8VA+3 90N9jT7UN9f5OP7UUHA0IinRV3PUmRw6PeFAYct1DNbN+myyE6qs5PuyDsIrYdF3teab M6w+6Tdf/9TXvaL5DgNDxlq1/iEj9SEp/O1snd/2pXYoHM7c2wl7rysh7eRCJmCIR3gu CgR83fc9DpT1ENg4sYURmUYNFwVgAXOmWaWqY21KRbYYpSXx6Zy0NvQuK88tLehhOLfk 2OgDk7Lxyj4u6I+mnLaNr2amO1p9943gCFmuLnlBqRDv/On00B1RybGdpfNI6SMRu/Qe qWcQ== 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:message-id:reply-to; bh=wN4sgq5AZPoexBZZqiq11ALBDmUmR8A1dFt4GgZFE2I=; b=Jx7BFWJpiPKDWANo2TukpqkY0xKtw4zM8H2ATxH36w24qi2CZSoAO0Po5KSI61VB5e EBtdYcuOcPLyGPp5PPL+g2Ck7bguLtJzfYhy4fE5pA+Js7L33vTLwhBOkqOjIuJ9sMnW L3EwuF7u0sAPKKt6Dxpcro/1H6H2zstTOPQ0zJLi3MNQui2oDOalnN+7ueSeaxUBzett A/Np88JZ1GiaR0ajRYfW+lWr/84X8WooHaCOT/9x2h0DX3aKLJTANgx3mr4SYgykc2bu 2ZSEBfZrU1ROylEYCnd118ddbWxbGIxKaiIX65d6noF8JRGgniOX+xMuXoClPMxy9Qf1 sf1A== X-Gm-Message-State: ACrzQf1KND5WeV9jI8HaWNhXKqH9CbQ1G0E3Mwh3pB14jXGhA89Gmxz6 aIj++uCf7Gsyis+pSK7MWkhOnQ== X-Received: by 2002:a05:6000:18d:b0:236:8f9d:6d41 with SMTP id p13-20020a056000018d00b002368f9d6d41mr8511372wrx.658.1667222992023; Mon, 31 Oct 2022 06:29:52 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j17-20020a05600c489100b003cf6c2f9513sm4615698wmp.2.2022.10.31.06.29.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:29:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 749771FFC6; Mon, 31 Oct 2022 13:10:12 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Paolo Bonzini Subject: [PULL 16/31] MAINTAINERS: add entries for the key build bits Date: Mon, 31 Oct 2022 13:09:55 +0000 Message-Id: <20221031131010.682984-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org Changes to the build files are a bit special in that they usually go through other maintainer trees. However considering the build system is the root of everything a developer is likely to do we should at least set it out in MAINTAINERS. I'm going to nominate Paolo for meson stuff given the conversion was his passion project. I'm happy to cast an eye over configure stuff considering a lot of the cross compile logic is in there anyway. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Acked-by: Thomas Huth Cc: Paolo Bonzini Message-Id: <20221027183637.2772968-16-alex.bennee@linaro.org> diff --git a/MAINTAINERS b/MAINTAINERS index 1706a08a79..ada84db23b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -548,12 +548,14 @@ F: */*win32* F: include/*/*win32* X: qga/*win32* F: qemu.nsi +F: scripts/nsis.py Darwin (macOS, iOS) M: Philippe Mathieu-Daudé S: Odd Fixes F: .gitlab-ci.d/cirrus/macos-* F: */*.m +F: scripts/entitlement.sh Alpha Machines -------------- @@ -3763,6 +3765,29 @@ F: docs/about/deprecated.rst Build System ------------ +Meson +M: Paolo Bonzini +R: Marc-André Lureau +R: Daniel P. Berrange +R: Thomas Huth +R: Philippe Mathieu-Daudé +S: Maintained +F: meson.build +F: meson_options.txt +F: scripts/meson-buildoptions.* +F: scripts/check_sparse.py +F: scripts/symlink-install-tree.py + +Top Level Makefile and configure +M: Paolo Bonzini +R: Alex Bennée +R: Thomas Huth +S: Maintained +F: Makefile +F: configure +F: scripts/mtest2make.py +F: tests/Makefile.include + GIT submodules M: Daniel P. Berrange S: Odd Fixes From patchwork Mon Oct 31 13:09: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: 620246 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2821288pvb; Mon, 31 Oct 2022 06:24:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7x6fIx9mXpqTtjp2k2C8QbtrosArpvIkbrzdCXhkhyMsf9T/RnCOFafTQsymC2OI2HeCce X-Received: by 2002:ae9:f301:0:b0:6e2:73ae:1258 with SMTP id p1-20020ae9f301000000b006e273ae1258mr9057170qkg.353.1667222680756; Mon, 31 Oct 2022 06:24:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222680; cv=none; d=google.com; s=arc-20160816; b=v92WiFz2cEgulq8gC77evGPRKX4yxiu4RaObK+9i9T/ZoyhKw0SLTAgljFrcpq80Xq rAF6FW99BYFzNU225FwUdyO9XAwgIi8/p4ktDO904uPhbTK44sXlOjxjAaDXyb+tMEb+ 4Es4wwWv9FpAME/Cq0CYW6BHKik+jl1Av4yuDNldadqEqd2XEiKhKp72bzGO+7umJ2px 1xzKld1YhNyU0tSQAOs4NUJR3av590QEdDjLwodTmtb9RhI7iu9u9pLdtrq5ZiEh7MjO UXd9FSXS/L6gEs6JPDxm1wVkp0VZlcJo13TYkYVx+MPgQkpNd2qXLI8Ml6hXHS2cOzLH 8XGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=LBlBANGd2986+xA+nmjS5WqlGNgbx4DKb9YGO5x31Ds=; b=cFUmd/OUNAtvw4WwJrZHrtIewUsHP0zFna7ybS7Nfl/HkbUhU9dsUe501fKWRd2t0R 3T35fH1eIZ3/jtncJEI6r6Te/WM9VayraOqpcO9lTjbSKE4KSYFptxgeYO4PqA5+qmdO cReSIGViRa9tIg7hWjiu56FsKZNGFAlmFaloQltFwz5BDCcfCbyZGhagRszWVcDHGMGS VKaZtySXwD+g7IFh/iSUGsqf5mGEkSIplBbuMxCGXc5jyxNbrRPtju0oPje1QaeDpT06 kBeqj1ELaL0svPG0JCuYvCh8NF3n+gKUjS/EsprNnyy3NH/JSv4n79+R9lbSQlNlrm3a 2c1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="oXCdy/8j"; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 c12-20020a05622a024c00b00397a47f88e4si4561874qtx.783.2022.10.31.06.24.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:24:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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="oXCdy/8j"; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUiU-0005GG-7q; Mon, 31 Oct 2022 09:20:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUhz-00034v-Oz for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:07 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUhu-0005Sr-7e for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:06 -0400 Received: by mail-wm1-x335.google.com with SMTP id b20-20020a05600c4e1400b003cc28585e2fso8010464wmq.1 for ; Mon, 31 Oct 2022 06:20: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 :message-id:reply-to; bh=LBlBANGd2986+xA+nmjS5WqlGNgbx4DKb9YGO5x31Ds=; b=oXCdy/8j5p2qFpqmzgt5/Yjf18zpFdrzibs1a6mtNruLjR9bE/f2gAgnvlC/KIB+HZ EAUF08Av14BRxRzqQzmOQuwwHc56BT/WO6Lpwqe8T1HlPzfZ2X4sNxBzHu1Tjky5lxGf /KS9PKcN7xDEQpU7BZLH3h9KxRl2elSadVMSld+0oINUOZDNejIAvDr6O5y3QOabiugW MvZYWD2NGxv+ihvgT3ABXk/3V/YUZvR8n3lTfJW9+J1frh3ZLBwxXlREieebFJ1er3jY DfbJWsvCm/I4pz8wF0HRQ8hm9gyjcGy2ZTCCJh9na3gVwmatIwecFBcPXobcGpUHI8k4 Ktaw== 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:message-id:reply-to; bh=LBlBANGd2986+xA+nmjS5WqlGNgbx4DKb9YGO5x31Ds=; b=C9gAehwbviGI90UzU1FivkRgQ/2ZFDF+4mY0dftPz69UkJGPwSN/OGQuNAVC7ctyeR 9EtCnQQk3gQDiWnnhU4jitu8qDXyEXcrjS7quxvZKmFSaND+EcqmfwLF9Ha+lCMHrSPU peq2l95G9J+YWAppX9T8+1Flvk/jKLKRxl7/PTe/HN6AgHZSMJWbUmgL2zBrSRUDRVTe LHO3610yKLnvr9jVMiseaAovRINfJlcZEe+0e5Ce4CIeMiTroSWHeGpyLlqgiHj1nwq8 3Tn9DfKykuVgIDw0pWJbGlVRliV4XgJPVPWMDY9rIanH+iHLGM/1rQr1RSEhx+GFgUkF nPJg== X-Gm-Message-State: ACrzQf1G6RCPe00x7npykEZ/3BI/S+bMhpMMeEgKcx+mt6AIIfMU8Nqk Kr8jvd/0qJ6WERuRaf4ft9Brxw== X-Received: by 2002:a05:600c:3b87:b0:3cf:59ea:ea26 with SMTP id n7-20020a05600c3b8700b003cf59eaea26mr12219508wms.159.1667222400386; Mon, 31 Oct 2022 06:20:00 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id f31-20020a05600c491f00b003a6125562e1sm7078467wmp.46.2022.10.31.06.19.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:19:59 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 892361FFC7; Mon, 31 Oct 2022 13:10:12 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 17/31] MAINTAINERS: add features_to_c.sh to gdbstub files Date: Mon, 31 Oct 2022 13:09:56 +0000 Message-Id: <20221031131010.682984-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20221027183637.2772968-17-alex.bennee@linaro.org> diff --git a/MAINTAINERS b/MAINTAINERS index ada84db23b..85ddef2d75 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2688,6 +2688,7 @@ F: gdbstub/* F: include/exec/gdbstub.h F: gdb-xml/ F: tests/tcg/multiarch/gdbstub/ +F: scripts/feature_to_c.sh Memory API M: Paolo Bonzini From patchwork Mon Oct 31 13:09: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: 620240 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2820479pvb; Mon, 31 Oct 2022 06:23:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7/nTOXqkClYNMEo8M5WFuTktCH1r7JiNkQSyjsPcNGfIxDb3Qm60uUJh1tfUGx4iOhIoGM X-Received: by 2002:a05:620a:440a:b0:6ed:3484:ec8 with SMTP id v10-20020a05620a440a00b006ed34840ec8mr8954711qkp.27.1667222593180; Mon, 31 Oct 2022 06:23:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222593; cv=none; d=google.com; s=arc-20160816; b=jXZJUaQCpzHqx7y+A2x+qKh+gNC57CgAKSxIbJg2SF01UqzWw2pCpzZCHnTxruDgEr Qy/JqdtJBhSjZxllj2bdNIKd1UM+1cnFXqq4JUEolI3ao2iQvtbdcJKHhkELwCiCHSTS 8eQciSN9mfJJDubUHVLrzx0FPjN7ZUup/2eGnFubIBHfEXutpLGdTJJTsMjk6dcukQkh oZVpNz0675G+Rz1oRAtORko8OJs39klINpY5EvZEOmgBWQCKORVJP2KcHH2rTsiIGj87 XczVLUmzRBd7n5VCqt9ElrCkTA1a49x57t8bkugNw1Sf9WyeCgYvsFZs1j7KzpvnjFYM 7mGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=bWizrSDAAuieyHecJY/J//X+NUZUwcSMeXyXWnSwMmk=; b=Q8+chsw1enFzgfFu+so7QlOY1GQX299+O4eFlvw1YX4J8AhkcTFK224NMpjLcQowlR 22lWCoiHkY5sRe0Wo1x2h5ieHP+xHVYl8cF8m1DB53vMsQPEzRCuHEqTAEkHxDq1UBeA BCFVDogdnjDu8NcbLbjw8WWLXUXs0oPFuo+Ab5oVVRGMdHUY4UV9MZ2s/j6kE+1e8Ug2 7UhaPLXYeRROiPrSNyTQvHZzdi1d48NolnlzyQKbmpF52rk6BGgzsvOldDXJIZHNcxTE Y6xvJtNE1lWbUh/KN8lz5iUm5OKsl0jV0owtiapU/YsfQnyZcs/1qV/QB1o3ROk+o++X DU0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BiE9YgXl; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 w27-20020a05620a0e9b00b006ed2f5fce24si3731661qkm.59.2022.10.31.06.23.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:23:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=BiE9YgXl; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUie-0005wf-Tl; Mon, 31 Oct 2022 09:20:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUhu-00030m-NN for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:04 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUhn-0005Qh-Ut for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:01 -0400 Received: by mail-wm1-x336.google.com with SMTP id f16-20020a05600c491000b003cf66a2e7c0so3346614wmp.5 for ; Mon, 31 Oct 2022 06:19: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 :message-id:reply-to; bh=bWizrSDAAuieyHecJY/J//X+NUZUwcSMeXyXWnSwMmk=; b=BiE9YgXlbuE9MiU3oRhrQl0RmKNoERJ4ZUz2E8+dxF76rIfDU/2QbuAnXabxA70qQ2 0XH7uuHGH2ltJn8C4yAEq7dT0/mI/5+9p1JIB/Oiyah+NxO8cqUT/4qL68zxtoDHhW/T qoAlhr78Adzkn1/6Qhk0Iy0tSCd0suIcESfBfZCj+62XHRY927j0e3oQXzii7svbCl9J K9pNq5L/uNiN+SKX0cC17l/KWjnaqH4HfEyoU5c1t1Kpx8Pxcj/awM4JcZmKjZoSYXN0 LAKtXgOjIzf/1p2FSvlvoUBfapSyM05LOfz7/57/gHKJddGCnt52j6UgTcOsjKqWOGPk r+vw== 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:message-id:reply-to; bh=bWizrSDAAuieyHecJY/J//X+NUZUwcSMeXyXWnSwMmk=; b=Eq/OaBcnmdSgjm684wCe4Jd6+odMZJFLQawT4Fy3S8R8fUU72W9/D+wcpRsOpyFEyP N7sv+Hcoz8r5Kk0ToTHNoc7TQSc3sZvkhckukFyeeGKjofhoDOI4bO485QzlTXqolpQc JM3qRX8z0W+QvxgXoP/48Evtbba2WioGYYhgTLyRU7JNCLQRm8rBEzRkQ+bpMgFPTUq7 oH48SEnvsRNqWY5FHD5kdJJSFBYsRHkkQ/m4kY1AxLiCcbJRpe/XIyY1qAZWG0zISyOV hdnzeDh1DGJrHgu8Rfc1l+SH6hmug23dOYyYK/rMNzCGP23FQME6JvK1xilji9vh4h5D Qv0Q== X-Gm-Message-State: ACrzQf2PX3Z6LrcYcAH+kXg4oMUO4T7w5SIZjzXIqKIZWtdC5ZVxlXhm tjgc+HgfYtup64kG7ZuzYN4RAw== X-Received: by 2002:a05:600c:818:b0:3cf:7385:7609 with SMTP id k24-20020a05600c081800b003cf73857609mr2275477wmp.186.1667222394495; Mon, 31 Oct 2022 06:19:54 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id r22-20020a05600c425600b003b4ac05a8a4sm7614271wmm.27.2022.10.31.06.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:19:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9F5F41FFC8; Mon, 31 Oct 2022 13:10:12 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Subject: [PULL 18/31] MAINTAINERS: fix-up for check-tcg Makefile changes Date: Mon, 31 Oct 2022 13:09:57 +0000 Message-Id: <20221031131010.682984-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org Fixes: fc76c56d3f ("tests/tcg: cleanup Makefile inclusions") Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20221027183637.2772968-18-alex.bennee@linaro.org> diff --git a/MAINTAINERS b/MAINTAINERS index 85ddef2d75..a582b1cd0b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3728,8 +3728,7 @@ Guest Test Compilation Support M: Alex Bennée R: Philippe Mathieu-Daudé S: Maintained -F: tests/tcg/Makefile -F: tests/tcg/Makefile.include +F: tests/tcg/Makefile.target Integration Testing with the Avocado framework W: https://trello.com/b/6Qi1pxVn/avocado-qemu From patchwork Mon Oct 31 13:09: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: 620234 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2818922pvb; Mon, 31 Oct 2022 06:20:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5tFYyR9YBjEpsoe+EGuBK1qt3pOXzfhl+C9hhUE345UnW+Iqce87jVizmWJiHMK9k4bM7f X-Received: by 2002:ad4:528f:0:b0:4bb:65f1:4c83 with SMTP id v15-20020ad4528f000000b004bb65f14c83mr10657128qvr.107.1667222438553; Mon, 31 Oct 2022 06:20:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222438; cv=none; d=google.com; s=arc-20160816; b=rN/kE64y1PWzJWO5RiaH1gKPNsyFRH9/RHHFR/2YeEu4D6rmytJTmqzXABigJN+kqd HRHGKAl3wSKEfPCQM7RtMH0UcvMUUDL3t1sY+jq4A6TzkfTUlD2gq2LylNopCdciis8s h1dcbEbKswZXXsfL4NTQHqOArkg7OjE2R6pcXs8CwzDffOHxq0+bv1vcYynsqKTvKDWu Ky8qTUqtOLMg8rP0fiLNHjBmnTMwtoEc3MCTO8xI4BgAQYIRWDXTE5TfWTiMmfhd3FAG MkcjQ5vMLr78wRgII3wMW5MJ0HUJuDcv6cJtVfRyGiBjwq+m4C23c0Hol+FdMkGWRXYF T3kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=mKTEqJtJjvsi5KAt2A7ZyFQqY7ElpNUOSG6GvGxA/Ho=; b=PFh494WRdZtDlCvQhPx+Aw8AI+uJsaOzYD0QoH4nJMxf0PC0hdxBub8V+yoA2O670o faUgEuaggfkyznHGzG9yH1h5tK3JuKkGFqRNlRC9R+EHgR/rN4aPn5AiU890aKI0iyY9 ptArtZWMQyN5iCd14d2vFilEmNrMA4C2qpWAiesfhApfCMSm3HhMNvoEFzynsgL/pxRm aOAOXVenK6RyRXXUsM5n+dvuzS2u2XDvqeLlviD8uggpVS9fSXfmuvV5f7Ke106l42xR csKnB57Qohoe/mEsGR7ViQN+lfJ3Yay1C3OOFyXbNGuQj5Y0EjZMSZDmQKlD5XoUU1O8 94OQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZUBKT5AC; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 fx3-20020a05622a4ac300b0039d0b7ce2c0si4053930qtb.258.2022.10.31.06.20.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:20:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=ZUBKT5AC; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUiE-0004V9-CC; Mon, 31 Oct 2022 09:20:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUhx-00034X-U9 for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:07 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUhr-0005SK-Nx for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:05 -0400 Received: by mail-wr1-x42e.google.com with SMTP id o4so15947737wrq.6 for ; Mon, 31 Oct 2022 06:19: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 :message-id:reply-to; bh=mKTEqJtJjvsi5KAt2A7ZyFQqY7ElpNUOSG6GvGxA/Ho=; b=ZUBKT5ACoO4iOvXeofsS5lg3oEQdm9nZLv/7r0WXD81/aPHvpdrM0rqb5fa1vV3DNt uh22O/pfu6dH41KRO/OGv+FJwfHHxw04PW6yP7DGeJkyMu9HlrZKcp05iILI99f41bt7 v8ivf1/k3k6LPlKCx5QpBmVj6FFW/v/eD3p0a116yC/pUrnRdKx/Vu7uWXr5GvCwpR8w lLE+1s/+XFM4qyofaKqCNZsexChzngDveYh+iAGQjlRNtkMKirbgHVhOHtayiA+OKeAQ cuKfAkWy7SiLkCIdSxkn4n6VWVq+LddMPEqbAm2lbiVo1lj9A27FA4C5uUTXlAg/n1R6 Z3ww== 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:message-id:reply-to; bh=mKTEqJtJjvsi5KAt2A7ZyFQqY7ElpNUOSG6GvGxA/Ho=; b=1FTYlE1KWmQckDR6rcUQ+qM5VD+eiiWBo2ynZZA5TaxZmPnhvWy/cKqUArjyx3RH2D uEbopytgX946fdDM2uG5yRpUaAp7dK3VOMIHL8n/39Cij+T3z4bO+Z0qB/Gyq3+rCOfT RnJKRxvIVH5ET1ABE5VW21bFVvpXCkqIVwWGatg7pPD0wHETQIIG7co3cxwfYM26Gy9M f+XeCrFCX9ZAZKU4YVJn3DIhDNO4BFBz72/dm86OguFg1Ugu1QPcE6OAiln6Aj+t94HY df7qaQgxDV2pavrvXjxftw0b6Fk74lU+kwWpAp0PUCkVVD58kuP+xWX5vhZQJjqArv6u d9rg== X-Gm-Message-State: ACrzQf3wz/tEOzy4UTj1duJRDeXSK7/no7Fz1X79qgCbXrtxyxTGAY1/ IHueKUorcRTKXmJm2V8vgRUEJg== X-Received: by 2002:a5d:5f04:0:b0:236:cae9:2991 with SMTP id cl4-20020a5d5f04000000b00236cae92991mr3471979wrb.120.1667222398397; Mon, 31 Oct 2022 06:19:58 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id e15-20020adfe7cf000000b0022cc0a2cbecsm7330589wrn.15.2022.10.31.06.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:19:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B8C6A1FFC9; Mon, 31 Oct 2022 13:10:12 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Cleber Rosa , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 19/31] tests/avocado: set -machine none for userfwd and vnc tests Date: Mon, 31 Oct 2022 13:09:58 +0000 Message-Id: <20221031131010.682984-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org These are exercising core QEMU features and don't actually run code. Not specifying a machine will fail when avocado chooses the native arch binary to run. Be explicit. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20221027183637.2772968-19-alex.bennee@linaro.org> diff --git a/tests/avocado/info_usernet.py b/tests/avocado/info_usernet.py index b862a47dba..fdc4d90c42 100644 --- a/tests/avocado/info_usernet.py +++ b/tests/avocado/info_usernet.py @@ -14,6 +14,9 @@ class InfoUsernet(QemuSystemTest): + """ + :avocado: tags=machine:none + """ def test_hostfwd(self): self.require_netdev('user') diff --git a/tests/avocado/vnc.py b/tests/avocado/vnc.py index 187fd3febc..aeeefc70be 100644 --- a/tests/avocado/vnc.py +++ b/tests/avocado/vnc.py @@ -53,6 +53,7 @@ def find_free_ports(count: int) -> List[int]: class Vnc(QemuSystemTest): """ :avocado: tags=vnc,quick + :avocado: tags=machine:none """ def test_no_vnc(self): self.vm.add_args('-nodefaults', '-S') From patchwork Mon Oct 31 13:09: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: 620238 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2820022pvb; Mon, 31 Oct 2022 06:22:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM66OOgFC6IVAUAxv6BMDbK/btEB7sD0CTUe/c57O9B7ahnPFUcl/pbAfrEC+TINab2AW4q6 X-Received: by 2002:a37:696:0:b0:6f9:78f9:fac2 with SMTP id 144-20020a370696000000b006f978f9fac2mr8807781qkg.255.1667222546242; Mon, 31 Oct 2022 06:22:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222546; cv=none; d=google.com; s=arc-20160816; b=m1k5BA0k1BwQEi+EltpFTkkTCVtP3tLIeOyu5ddDnoJKizkeSEgIYoNTZen/YyJmSs JK7tXIQtxHLKiN9JAdsulw28gEivFDbM2Bla9MJzOaYOn8G6HvWFCYYGD5NWHWhBvu00 SWBmnUk3Kyk5vU2nwHBp9YXQWs1qrKHljEK8XLn/VvWeSakZZ0hdjqhjJ/gzlC2fIXGZ 1QHVnGSJCzMHh3ka1Sdfub/deYltcWjGDAgUyZDcWeRlQ1aGZwdQ4XRbGsgugxMflv+n YgExyfGlH2zyp4ANAQWVE9pSLBzL61+UvpbYSgmGeuBZrDQcOUkGl56ZfQB5Hyfrth1F VcGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=BNTO1oPO10qcAY9aWmNU3TzyVHXmp7R/Qudvzcnb1Ls=; b=akwLE/QvYFLmmnO8v0YGpSSPXqyA9+tbTwCP//nl+6ag7f0locB88pIlcCgv4ngWxZ 4neyGQS/DfyU5uGZQ+r09GFn6NJTDSLnAGWPYPyLsczxcGRHRqYkdh7Kap2xz4CQSHYo vlcWYyqerzzC6pvnIWcQVAEygSJgEbybBkuUueKvb1QrEuGZnp/t1kumZ/ZFSgIBu06R PD9l2fA5lOBs54vE9k+dR/8kP/HgyDhT71f+ov8TC5Ud7VkFV1idDgKgATGxVSxS9kX0 jA4RY3J8JSVk6XIBb+KttD2bSYzaXhZ7IYDDVxTTBzn1VvUPy8n1FMVmzweq/Pave/Ne 8vrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EniinSF7; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 m5-20020a0562141bc500b004afa9a702f3si3918113qvc.177.2022.10.31.06.22.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:22:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=EniinSF7; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUiR-0004yz-LO; Mon, 31 Oct 2022 09:20:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUhx-00034H-NE for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:07 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUhp-0005RD-4o for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:03 -0400 Received: by mail-wr1-x42f.google.com with SMTP id j15so15953361wrq.3 for ; Mon, 31 Oct 2022 06:19: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 :message-id:reply-to; bh=BNTO1oPO10qcAY9aWmNU3TzyVHXmp7R/Qudvzcnb1Ls=; b=EniinSF7WjOkM2VhkvMK8mlh9flKj6JWvuO1RMaSD+Y01/bxBw4AgzQ47BfavTR1lx 3QA5H72AzMFrVdwX0T5du7zqd/TggUzZnkCeAhJGwE3St4mIeYzhQi+XZ5rok16zH3ZG sNoZOmQnhAcTnMPbGNXDliXbMvDFBhk2yXtjsnrkOJ+FHcsNtWnJSgIiAm5pVVuE1WEz DOFa5cMO8Ysj9Yf0Xzh/I+WAZKJRGjr1KIA1jiJLegqi9bmLVAUhkRB3Fem5CkVl7MOi 5Alk7dwLgcZfqn1dz1wj0gd5wfGQc77q1kmZop0s0PO5EfPfoZjkaDQtrrJliU4/kkMD 622Q== 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:message-id:reply-to; bh=BNTO1oPO10qcAY9aWmNU3TzyVHXmp7R/Qudvzcnb1Ls=; b=ndt7Jx9uYHOHtfPMB9hf1vhFlQuvDHgiVqfXVmr/u/5rMItpZzg8I1GSFZ9qgXJ0vk 0KWe1CEeSIIo5zDzFn0zKaWM8YyoByMQykns4onYLs8El0shJ1RMpdWjLPs44BvDVAwm nlSYc30rLvMY2Iuk/KzddDPXV+NXc8YB0P6VsvHxPEvcuzuzA7Oh5iqL/75lcT9MPIDH AmY6j+AkFJeou0dcRrFRwlwH77KBQbey2I9Nrhteq1fN7x/5Nzera7PYf4yby4eg3gPS qVb5mhrs6FD6EGNrJl9bb9MeIuRdkdmpXkcuxFAic7I2/x73o51qB/xoG4hpQ2Ac8ddv z5nw== X-Gm-Message-State: ACrzQf13lrcChbamzVB8n0s0m+NozimT+MSqMleVQr7xm5zWq/mllWik yQLlXmNfjT91FLAtOfyfFVnwGQ== X-Received: by 2002:adf:d1c9:0:b0:225:f98:d602 with SMTP id b9-20020adfd1c9000000b002250f98d602mr8180576wrd.419.1667222395791; Mon, 31 Oct 2022 06:19:55 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l7-20020a05600c1d0700b003b505d26776sm2182038wms.5.2022.10.31.06.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:19:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CEFFF1FFCA; Mon, 31 Oct 2022 13:10:12 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Peter Maydell , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Cleber Rosa , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 20/31] tests/avocado: raspi2_initrd: Wait for guest shutdown message before stopping Date: Mon, 31 Oct 2022 13:09:59 +0000 Message-Id: <20221031131010.682984-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org From: Peter Maydell The avocado test tests/avocado/boot_linux_console.py:BootLinuxConsole.test_arm_raspi2_initrd finishes with exec_command(self, 'halt') # Wait for VM to shut down gracefully self.vm.wait() In theory this should be fine. In practice it runs into two bugs: * when the test calls self.vm.wait() Avocado closes the socket connection to the guest serial console immediately, so the avocado logs don't have the last part of the guest output: https://gitlab.com/qemu-project/qemu/-/issues/1265 * when the socket is closed, a bug in the QEMU socket chardev means that it loses any data that the guest UART has not yet consumed. This means that the guest doesn't always read the full 'halt' command string, so the test intermittently fails with a timeout: https://gitlab.com/qemu-project/qemu/-/issues/1264 Work around both of these by waiting for the guest to print the string that means it has completed the shutdown process. This fixes a very long standing intermittent failure in this test. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/636 Signed-off-by: Peter Maydell Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20221020102012.3015662-1-peter.maydell@linaro.org> Message-Id: <20221027183637.2772968-20-alex.bennee@linaro.org> diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py index ca9d09b0d7..eed4b49e6e 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -489,7 +489,7 @@ def test_arm_raspi2_initrd(self): 'BCM2835') exec_command_and_wait_for_pattern(self, 'cat /proc/iomem', '/soc/cprman@7e101000') - exec_command(self, 'halt') + exec_command_and_wait_for_pattern(self, 'halt', 'reboot: System halted') # Wait for VM to shut down gracefully self.vm.wait() From patchwork Mon Oct 31 13:10: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: 620242 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2820979pvb; Mon, 31 Oct 2022 06:24:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5dSjFGHqshTZmxuo9kZFKA/1VmHhd3WbZ7HVR8VAW8S4dD+Xc1mCZeOR69gLJGPntXu17o X-Received: by 2002:a05:620a:f04:b0:6cf:c030:a1c2 with SMTP id v4-20020a05620a0f0400b006cfc030a1c2mr8922042qkl.312.1667222649532; Mon, 31 Oct 2022 06:24:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222649; cv=none; d=google.com; s=arc-20160816; b=imqZLfZcE7ULk9zfwjpqe/3MwaRqY5hyNn3fiVkuD4MRCyXeu3y5GqIMJf0eGZxGws G8BxVtiJOl/mXOS1xrd288l/rNDuS21Z2RDC7xf8VM60SpQW18QDeqM4/XqY3u/jxHoz Of2hP/fYOB3E05+RJotw6GvTRuhefNC0FYkX6cX+6O0Ndr1tGl8aRG2vnEk8iRglqmzx C0GLsbQBIKjpvup9m5SddvK80cgcdTJz7VF/ij5RszTuFq/dklE+Gy95naGakcAwynoi 1wACBdJ6gZyuGw12j70vnM+FO1BIgz6JUdKzqFibYHZxxYjqT6cDo4QiVRGz1S9kGMVk WufQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=JbYpYlCRpuLNEiOsilZB4ylHATLxZmTnkB//H2Jyq78=; b=blDztqj1Yq+BTAzydtJZLhFT7pD4YFXmi+qK5He4mkbNeNS5zP/uVhg0CFurnxjhWf 2pSss30hfzW1tuIWpKb5iU3cVLnZsQ5mskUYmiPytQBC4Mw7DAUHbvNoaNPF76n6iuaw js48rLT4nWr49WJUAlr0UaeQEsFDk82Gn4E5RUuI3IzegcTVXC58fJqJVckmAhVDLB1q 46nHn3Q9j1GzJaVS2yip0wCqgt2fJ9luk+FfylyoaS8jHQ0d6MJpkonxcZoP/ETnccso /qDAqt5y2fxVMEnUV68se34QatjXngQs1qDjhvy4QUB+iWhrjtHw+PSelJUeNRmpbzPg sh/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HLim6mGN; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 kc6-20020a056214410600b004bb6b99598dsi3520167qvb.464.2022.10.31.06.24.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:24:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=HLim6mGN; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUii-0006Hr-Ul; Mon, 31 Oct 2022 09:20:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUi1-0003Fo-AV for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:09 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUht-0005Sk-I7 for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:08 -0400 Received: by mail-wr1-x433.google.com with SMTP id o4so15947805wrq.6 for ; Mon, 31 Oct 2022 06:20: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 :message-id:reply-to; bh=JbYpYlCRpuLNEiOsilZB4ylHATLxZmTnkB//H2Jyq78=; b=HLim6mGNyK/xYlrVd1lnXAIe2BQg5FJnNDaIZXa1pbV6I9C0dskToFoeHb+9TbUX4b E+WvOSh1jEVVl3qxdB9sXGDgkelUyVJHBAaWfozkKTKpOK+73GfXV8BTAxObO2OXBTcw u3NCYdpSPvBozFQjMBwiE0GzRyRVGuzqjnQP9Hz6CtygiZJwsiN4gLbPOZxYlPg8zPhi pu7qWgblzAml3U+o+ju8kWWUjobcHjw866wz83sl5d+oTder+B5WAIHTIU4hbf5OZS6n ZBYcydU3hDfimK14UxY9Ly46Wvivx2pFtjfmbLsfvMtYg6uG2kxp42pjQYCkRY2Gt9fD Jhfw== 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:message-id:reply-to; bh=JbYpYlCRpuLNEiOsilZB4ylHATLxZmTnkB//H2Jyq78=; b=p3VVm2kfVz3DqoaqYdZod3X7CqifLabHUh2oI1FgwAsfsmGayqvnsGeF0n8/v82Gfj rip8hn6ZtzdSWnvNCfNoIrWMFJbLSJVpeSqflAx8hePfg7Voki2jiKC50HJ6Izd3ieci ziCqdTZnKA9InU8bITUVEccsckQAFUd7TREQi+4lOKJ4m1OAiQucrMfTTT8nkPhw92rD +qv5AXb0fU0U+JhSbyYzuDUtgq6ccpxdq+8LXe0SIDLzJ+nPxPQl9sAOSHVYi3dhXsCY qJzKQhhIHMXBsdgYmf/yCQWrcVJ9515EsNWwTWu4TdQCiaysqmz9F4415ZhgtmTd3D2e kZtA== X-Gm-Message-State: ACrzQf3blCo81hvJMauxL9JIGaf8FAta6toP9vWDChxK9vSCSXRox0kR u2tqCjftYSvJvbs40Ld8k5E3NQ== X-Received: by 2002:a5d:49d0:0:b0:236:ba53:ec39 with SMTP id t16-20020a5d49d0000000b00236ba53ec39mr6224136wrs.412.1667222399529; Mon, 31 Oct 2022 06:19:59 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id k18-20020a05600c081200b003b4935f04a4sm7772851wmp.5.2022.10.31.06.19.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:19:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E51071FFCB; Mon, 31 Oct 2022 13:10:12 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Yoshinori Sato , Magnus Damm , Cleber Rosa , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 21/31] tests/avocado: disable sh4 rd2 tests on Gitlab Date: Mon, 31 Oct 2022 13:10:00 +0000 Message-Id: <20221031131010.682984-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org Running repeated invocations on a number of test boxes show a fairly high error rate: $ retry.py -n 100 -c -- ./tests/venv/bin/avocado run tests/avocado/boot_linux_console.py:BootLinuxConsole.test_sh4_r2d retry.py called with ['./tests/venv/bin/avocado', 'run', 'tests/avocado/boot_linux_console.py:BootLinuxConsole.test_sh4_r2d'] Results: Run, Ret, Pass/Fail, Time, Total Pass, Total Run ... Results summary: 0: 94 times (94.00%), avg time 2.254 (0.00 varience/0.04 deviation) 1: 3 times (3.00%), avg time 1.837 (0.02 varience/0.14 deviation) 8: 3 times (3.00%), avg time 91.288 (0.02 varience/0.15 deviation) Examining the logs they fall into various categories of un-handled unaligned access by user space and unexpected FPU usage by the kernel which ultimately lead to the failure to reach the login prompt. This could be bugs in the translator that only get hit occasionally or just a flaky kernel - its hard to tell. To avoid these failures gating CI lets skip on GitLab. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Cc: Thomas Huth Cc: Yoshinori Sato Cc: Magnus Damm Message-Id: <20221027183637.2772968-21-alex.bennee@linaro.org> diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py index eed4b49e6e..4c9d551f47 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -15,6 +15,7 @@ from avocado import skip from avocado import skipUnless +from avocado import skipIf from avocado_qemu import QemuSystemTest from avocado_qemu import exec_command from avocado_qemu import exec_command_and_wait_for_pattern @@ -1175,6 +1176,10 @@ def test_ppc_mac99(self): self.vm.add_args('-M', 'graphics=off') self.do_test_advcal_2018('15', tar_hash, 'invaders.elf') + # This test has a 6-10% failure rate on various hosts that look + # like issues with a buggy kernel. As a result we don't want it + # gating releases on Gitlab. + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_sh4_r2d(self): """ :avocado: tags=arch:sh4 From patchwork Mon Oct 31 13:10: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: 620243 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2820996pvb; Mon, 31 Oct 2022 06:24:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7sAswi1j5ggDvee3sKESNLxWFVWnf3pq4gDrPD4dabr6MtxvaQTvUirtvT/wBS+MxUVX5C X-Received: by 2002:a05:620a:d86:b0:6ce:bca6:9db3 with SMTP id q6-20020a05620a0d8600b006cebca69db3mr9172663qkl.76.1667222651429; Mon, 31 Oct 2022 06:24:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222651; cv=none; d=google.com; s=arc-20160816; b=OJVtUKTyuPztEaiMllZGYfGQtAeZqcJH0uGoy/cN7DK2NUYhVrHk6MRzYJGvsj/l5h rTRuWdBrqkqzxC4EFWtC8F8dBuPAVvXmmi+IBiVWQTTaWRzLfl46FxB/587X9zl97Qms 4IEQ2Vdf7iuYfECkc87rWZHqG+tsJkJh66ExFR80MFDGx7OovM4spdNTe1W0iDZcn5Hb 0uYianHENm1l0dPihcdpTqFoeKDKrbUZ9wk3uiVSG2hhTuxagLvCmfb8rQWBcgTGZO3H 4HeT4JjOc1RR6o69YziUv5oPyTkKGVfZo5tdDThI1umpzcDWQv6eIidINHcV3stkmO/N Rk8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=FuI+2RfMwlKN97j1s8Agb9GCuSAKdGwFGMgYag+90ro=; b=HazUutfZOgfUK4RFGTtMaost8h5VSrcpRqqzMa/mqPCKxwfUd65pd+uM1QgWNQpRtm g93Urr4JzZwFTIHwCtpvuvDGGxSFpIsOtTQgmaSCIMZfobdaaXL3mjl5b4/nyhRD9cJG s6TytFFL9OdZnKWLLMNwPKwfRLVSYypieXDSfbX/oM47CAQe+uEjSzf6B1bEPaz28RCh R079XpEkRVrGiVv+Qx0gD5HeV92QdEL2rtk7EFFtHPIl89Pj6dQbfxU4UdXCyqtSfm75 UIJNL/bVUP1/njUPY6mMIibmc8CJRPiHS0KhZRDsoK7xSvPzpg25O9JL0sJMNT7FMjXQ m8lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oRBweYIB; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 e2-20020ac845c2000000b0035d420c4ba6si3727032qto.14.2022.10.31.06.24.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:24:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=oRBweYIB; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUia-0005W7-Dy; Mon, 31 Oct 2022 09:20:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUhx-00034O-Ru for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:07 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUhq-0005RQ-H5 for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:04 -0400 Received: by mail-wr1-x42c.google.com with SMTP id bs21so15954723wrb.4 for ; Mon, 31 Oct 2022 06:19: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 :message-id:reply-to; bh=FuI+2RfMwlKN97j1s8Agb9GCuSAKdGwFGMgYag+90ro=; b=oRBweYIB42c/1k4+NFtNtKZq85R7bWD6TMphX/yzEK/o03NiIwzh8RVzXRSbXImQvN +iuCgh9xE7ZlJ8qRorxBuVN3oOWV7KBVK2j876/dYcST8SsnNLKd8OM9JDymXtTCzWOQ gkof77pvAMC9d8wPN5UYYX5lB54NRp4T7zk5oRxaOxFfEAiLC3Jo9NdnJKuyFxICCZnx VAiwwD9Wb/LyvGqLzzkUO+AIHWKLirdYmQEpddrubiwZtIKYLk+b3T5Pz85FFnL9I65x 8Fqw21n1yJjPFZ7vkaE2VH/U0YVKWCCEScHOxkwoU6BzRdVcV+lbQXYiB2UpV+iehCcK kePw== 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:message-id:reply-to; bh=FuI+2RfMwlKN97j1s8Agb9GCuSAKdGwFGMgYag+90ro=; b=jKem8Xi2Yv/WKo2FWdAPh2IyXdejRddrsGPYRuDD3EEEbqtOuCJ8O7Gw5r1TBG25WP c3Aup8SamUXauDw9g75XOeBy4AYdmdVwHo2kwjCqyVBzSewTwHk9EAWgfSSJsGHqeuD2 ixgb3nvMyHo5BW8zWXeIMg2tqjZ1aV0wxPcH2OuPXtBoDCdixOZVg8/FSNfn3dsE1aBP VMoXj0wPu+YzQwtQHGAzruIS33myJr7CUGQS2x03VX+BlWe1poWJi3P8jTcd0st2P77W 4NpoMNNo9tPDCodJw4kluascvTccqI8az0UJxriffse2TLN3os3w8lg89GspgegUtyPe yPEg== X-Gm-Message-State: ACrzQf3opR9gPEsnplpp+eYmdUVUd/zWA1reC9QcKiZ6GSAsEnhZn3FS UbRt8RJemJ2CZWR1HhrePgor7w== X-Received: by 2002:a5d:4889:0:b0:22b:214:38dd with SMTP id g9-20020a5d4889000000b0022b021438ddmr8546102wrq.32.1667222396271; Mon, 31 Oct 2022 06:19:56 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id e9-20020a05600c4e4900b003c452678025sm7211718wmq.4.2022.10.31.06.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:19:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 068B21FFCC; Mon, 31 Oct 2022 13:10:13 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Yoshinori Sato Subject: [PULL 22/31] tests/tcg: re-enable linux-test for sh4 Date: Mon, 31 Oct 2022 13:10:01 +0000 Message-Id: <20221031131010.682984-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org This test was marked as broken due to bug #704 which was fixed by aee14c77f4 (linux-user: Rewrite do_getdents, do_getdents64). Local testing shows this is solid now so lets re-enable the test. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Cc: Yoshinori Sato Message-Id: <20221027183637.2772968-22-alex.bennee@linaro.org> diff --git a/tests/tcg/sh4/Makefile.target b/tests/tcg/sh4/Makefile.target index 35ebe6b4e3..32b019bdf1 100644 --- a/tests/tcg/sh4/Makefile.target +++ b/tests/tcg/sh4/Makefile.target @@ -13,12 +13,6 @@ run-signals: signals run-plugin-signals-with-%: $(call skip-test, $<, "BROKEN") -# This test is currently broken: https://gitlab.com/qemu-project/qemu/-/issues/704 -run-linux-test: linux-test - $(call skip-test, $<, "BROKEN") -run-plugin-linux-test-with-%: - $(call skip-test, $<, "BROKEN") - # This test is currently unreliable: https://gitlab.com/qemu-project/qemu/-/issues/856 run-threadcount: $(call skip-test, $<, "BROKEN") From patchwork Mon Oct 31 13:10: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: 620233 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2818921pvb; Mon, 31 Oct 2022 06:20:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7OXFF+XY1Ij59knY4XxpXhbxTltQPq7eckHkHwo9MzW+3HeOPdV5br1oiS7xVhGEw5exTv X-Received: by 2002:ad4:594e:0:b0:4bb:d696:4a80 with SMTP id eo14-20020ad4594e000000b004bbd6964a80mr8073525qvb.2.1667222438532; Mon, 31 Oct 2022 06:20:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222438; cv=none; d=google.com; s=arc-20160816; b=xzVDnNxSG3cesAPFaTmkzcfQoTyTvr6GEovQSMjvrVE1j7mBcDEWXXVpqjQp11a8us 0atLTa3/26khphs5J/9UiKuFS/kyvmp9xu1QYRd/zviOZgP1n63YAFECNJ6qWUtBLKO9 PEIgnYZPwJWK9A5hgctRivYKGLRjzERrSTCh2Kwag0n27RHxz/qWI0tL7A6Aa4eQfdwV zmtQcvXcJL7fYCz5z4R9lUJpkAuEXyj/0el7bi0LqbqkJG0wGONj9onC9nMwf8ah5R4v SkTkqMmDPV4BdD8FoRkeE2ZfDoCP+LemqzfTwv508oaojaLEbW7pZ7K3T2YXeaRNiV6n 8+5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=baZobELH2M8taPkObe/3HF/fRCV7/Gji1EVnzYPj3qQ=; b=orIKnz8OsHQLJBkCj53tg/d7HageHdjQLomU50/V67t9CZmXlmpxMxa//aPNAWu0h+ Wa6qac1htUhEjW+aTHLURhNIC9SB836iqO/N5L5Cp1MxnfSNch8SLGJ/rkwRQMhwMTdw Dv4qwN0NAif68NgYS3thhvGCt3RxIVu9zktNHIMVZvK4lr8lMx018fU1neSmhpsxGoAH pXvENrd7d6wd+tx3yNYSTx7bRMPrjlkLZ9j082s++Vq7EzYVf1YNsuXEg+E6MMDQqZ5t inzGqBOkflyea9o97+0mW5FF3i8G0QAg8EgsrLq8yoB/CAK3qFCKcbkbzosvQbFXMNv9 xAcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xqkvW1Dk; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 jp6-20020ad45f86000000b004bb782a2ffcsi3937117qvb.242.2022.10.31.06.20.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:20:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=xqkvW1Dk; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUiA-0004LJ-KJ; Mon, 31 Oct 2022 09:20:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUhu-00030k-Lv for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:03 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUhn-0005OT-4f for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:01 -0400 Received: by mail-wr1-x42a.google.com with SMTP id h9so15999331wrt.0 for ; Mon, 31 Oct 2022 06:19: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 :message-id:reply-to; bh=baZobELH2M8taPkObe/3HF/fRCV7/Gji1EVnzYPj3qQ=; b=xqkvW1DkAVeeqXaODqDx+46P0xzXrzw7o1zKGeZGT7dvHObCwMPR++69hxzS2unzCk rbWRmf4e1HNCmMKw8YQUnEWs6wVoiF3BepnYKuIk9NyMZkAvSf61XFgnJtbM5+YmyWkC wfspvD649OZWlITCaU6lTdzeXrYAzaj+pJqMMfr8C7YK30bozBhLSTwWRZr3wH2fdJht SY7QNnYQtEG2HW3ZiBz1wz+pezWChU6ManfUSvV5EmrMku3RqGd9QkBd0g5nTtNPyPDj 5WEeTUfYRbNqkXy26QorlB1M0Of3JeQq2cYvBaiIbYGnIiWbwDDUXciAKoaQG228Cy21 g7eA== 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:message-id:reply-to; bh=baZobELH2M8taPkObe/3HF/fRCV7/Gji1EVnzYPj3qQ=; b=LM5kxduM89i41KRD1vq0JYqag6pwkAa+TJ7Y0sBqAKHsvyo6acHS1+hdkO/EsXOnMB gkKByxQjsAk3LPzMK4XOugyXGcc7TB7IsyzNspM7RxESKvApHaMDDQBLpZ/5SPXZy51B vS4+uffYpknXBNC/5k8QU2mpnujw2o3Pskot/5naMqur22HPyRLhO0bi0Sb0Smd2Ch42 9S7qIBBh356mmGWyoacE11Vcs+O0oeDUX619WsFKFJsIwHXqvI/HAMggcD20jbS7E+7a CI/ltLwPxWXUnrbvIqALV8jfuWJSU4Ki4peAqzsUJHjDze7M4LHIAew1xED7o2xG5wLf gC6w== X-Gm-Message-State: ACrzQf3VKM7oSoJBqCCk1ZVWHemXjp3xMLwxQaccpm5ZTj7pqQRaXNTn TtIWG+tQ+4QjNueeZV6BGt0LIw== X-Received: by 2002:a5d:51cb:0:b0:236:6a62:4bc8 with SMTP id n11-20020a5d51cb000000b002366a624bc8mr8064730wrv.583.1667222391868; Mon, 31 Oct 2022 06:19:51 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n4-20020adfe344000000b002365f326037sm8592334wrj.63.2022.10.31.06.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:19:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1BC0A1FFCD; Mon, 31 Oct 2022 13:10:13 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Yoshinori Sato Subject: [PULL 23/31] tests/tcg: re-enable threadcount for sh4 Date: Mon, 31 Oct 2022 13:10:02 +0000 Message-Id: <20221031131010.682984-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.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=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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org This test was marked as broken due to bug #856 which was fixed by ab419fd8a0 (target/sh4: Fix TB_FLAG_UNALIGN). Local testing shows this is solid now so lets re-enable the test. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Cc: Yoshinori Sato Message-Id: <20221027183637.2772968-23-alex.bennee@linaro.org> diff --git a/tests/tcg/sh4/Makefile.target b/tests/tcg/sh4/Makefile.target index 32b019bdf1..47c39a44b6 100644 --- a/tests/tcg/sh4/Makefile.target +++ b/tests/tcg/sh4/Makefile.target @@ -12,9 +12,3 @@ run-signals: signals $(call skip-test, $<, "BROKEN") run-plugin-signals-with-%: $(call skip-test, $<, "BROKEN") - -# This test is currently unreliable: https://gitlab.com/qemu-project/qemu/-/issues/856 -run-threadcount: - $(call skip-test, $<, "BROKEN") -run-plugin-threadcount-with-%: - $(call skip-test, $<, "BROKEN") From patchwork Mon Oct 31 13:10: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: 620244 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2821065pvb; Mon, 31 Oct 2022 06:24:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6D1fV4mXqnFrkuqGt0fWs5IPX92WdwM9RL2cb+5pAotJlxUoSRHg2ZLZZ8oPc5IDf1wg8J X-Received: by 2002:a05:622a:14ce:b0:39e:55d0:3adb with SMTP id u14-20020a05622a14ce00b0039e55d03adbmr10474013qtx.173.1667222657715; Mon, 31 Oct 2022 06:24:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222657; cv=none; d=google.com; s=arc-20160816; b=mQfh4ewTz7lmgfpnqad+aJenFGQ4VXhC4Lp5fiY6JKQcNIyB+n30rvityxJW8+2DAj XI9LqMq1PKzRWGl4bSMnJn3nmBLfvkORVdBfrbbq1IXT0/KX5jq9EzSgYHkeWoLfhqgL gOTFKvWsUNS8fQh9Ad4jDKjvZZt4TaxYBgkBaGtjFN3366bscYOLlii7NY4UEp4D587e P4720V4N70nXTsEgKexzH0W9QqLY53GKCVbJcabe2kvl3dCIVS5EZF9pVGOPu9+QO5NO 2CATyw1FqDIdvEUk4bSWGr2sVtv6mIQZXw/3OERmm73dl7F/Wz7jOND8PWz0BdPdWCVb mojQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=VU5VTL8pBDhAlFZZ+ljlcQ9WYows6GqqoHE20CLByr8=; b=kDd4hYWkUolM0dyFi74b3K686sPYFBPKaj7U6rWIJUof1I3VDPSEKT0DBYabMnBjZc ogbYqpPOYWQ2E4KFQK4GKHBE7dGc+AAKeUcXp9WZ2JV4jFM+3/q81QqaMrIArmZ8KO8r 4BizVI+76uwrTTm4rvb4H67MIWsQ35cV/TtuP4pLJJ+5QaB9/03ti2HwfE66gPtViZWs JZsExNZmkD24W2tQEpBDyiqfSqUePRcGE21fD3jZogfE7IGYV0pOyD5KVRJMOYcB2BGK z+8Q5mwkG1SNrxJiHWlMcDGDRYHvBHqG/2vAeAO93jNrMtHybUFSDemTTPxKzo6+D8IN 7CZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HWuCWI5m; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 f6-20020a05622a114600b003a530e21296si287025qty.620.2022.10.31.06.24.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:24:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=HWuCWI5m; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUiI-0004nb-Pd; Mon, 31 Oct 2022 09:20:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUhx-00034L-QX for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:07 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUhn-0005Pv-Ml for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:03 -0400 Received: by mail-wr1-x429.google.com with SMTP id l14so15972092wrw.2 for ; Mon, 31 Oct 2022 06:19: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 :message-id:reply-to; bh=VU5VTL8pBDhAlFZZ+ljlcQ9WYows6GqqoHE20CLByr8=; b=HWuCWI5mXe76Fyu4Rr0X24j8lszhBcR7qc7r6PRr8nEYpRTHqKORvXiTALV7Z7mttB eTuo/i/jRA2jrE+2Jkb4vxPH7FXY5zQlC/zTdWqNXUVKcMXFyVCWqDHVz/21FMghFpCx EFSJQmnipOz+9dX56TzsivKD725GLBCcdTN1Ba4t/sRxKBEYBXSivZsBWBhh9CiZCLXO +2ZWIroiYRxAFe/lHkohzaU+KLiScAjNjNeOiJjQ2p9wGp1tG57+A9ewVwTcPB4PZCQ4 QjOsM5dfelETNczB6xExKcsinRRlb4i3DOEJDcxKPaf36yx9V4mwgVJ+ueDvxYOBMFr5 62Zw== 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:message-id:reply-to; bh=VU5VTL8pBDhAlFZZ+ljlcQ9WYows6GqqoHE20CLByr8=; b=6xLb6Ve/lJE46eA8+uhB1s5ypALlrP0YsKQDtxKMxjBoJVZUAmR7PrKKd2ZF1Rf1Jp RgHsAjHZpAEYeG0FTrE+WEYw1BdMhJi9qkQgcshGhzJzX11gonPTMRKT60nlRFTH093y QGUH6Wxq/rlURluFzPwxqAQJy71EqTwDPWMPjrLBPcQwtepMypybIjAWmIw1vm+RYCCy x8UZrWv3YCmhPxzlQW0zUT3y335HiK74BbMdwG7sBbMy5sPPcR8+4XEVESKS6tUzlH23 Zi8HmEGQmhGS5Rm3K/cr5N5AWiR9+2IWOH7Epirfsr8VblHHCduJktDILFDlVNWZKlPg wBLQ== X-Gm-Message-State: ACrzQf2vV9g08DmY0mHL33APITN2iioTu1tuEd9dYnb7Xhxme1Ia72c7 RJ7M06gi5MjbJ2/II3BY3hIzPA== X-Received: by 2002:a05:6000:1b0e:b0:236:5c9e:7110 with SMTP id f14-20020a0560001b0e00b002365c9e7110mr8326452wrz.650.1667222393497; Mon, 31 Oct 2022 06:19:53 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bd26-20020a05600c1f1a00b003c6b70a4d69sm7247840wmb.42.2022.10.31.06.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:19:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 31FC11FFCE; Mon, 31 Oct 2022 13:10:13 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , David Hildenbrand , Richard Henderson , Ilya Leoshkevich , Cornelia Huck , Thomas Huth , qemu-s390x@nongnu.org (open list:S390 TCG CPUs) Subject: [PULL 24/31] target/s390x: don't use ld_code2 to probe next pc Date: Mon, 31 Oct 2022 13:10:03 +0000 Message-Id: <20221031131010.682984-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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, 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org This isn't an translator picking up an instruction so we shouldn't use the translator_lduw function which has side effects for plugins. Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson Acked-by: Ilya Leoshkevich Signed-off-by: Alex Bennée Message-Id: <20221027183637.2772968-24-alex.bennee@linaro.org> diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 5798928473..9df7f9e693 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -6612,7 +6612,7 @@ static void s390x_tr_insn_start(DisasContextBase *dcbase, CPUState *cs) static target_ulong get_next_pc(CPUS390XState *env, DisasContext *s, uint64_t pc) { - uint64_t insn = ld_code2(env, s, pc); + uint64_t insn = cpu_lduw_code(env, pc); return pc + get_ilen((insn >> 8) & 0xff); } From patchwork Mon Oct 31 13:10: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: 620237 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2819981pvb; Mon, 31 Oct 2022 06:22:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM71Zzhw5ac57bcNJ6XDEI7PF6BrhqwcRGTOI2JT1UhNJcf33Jgc+r/Y5u1hkK6mrbk7Nk9M X-Received: by 2002:a05:620a:51ca:b0:6f5:71e1:5ccf with SMTP id cx10-20020a05620a51ca00b006f571e15ccfmr8728754qkb.217.1667222541832; Mon, 31 Oct 2022 06:22:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222541; cv=none; d=google.com; s=arc-20160816; b=wsszTcsXWHP3DeAGuEkOvPEd+WpQWwAy/uxVa7G2+nNrBiVlma+fDdnrRX7QcAbjd3 /OHkQt2r/LxMmLbYsPOQwiKZzjLq6kQ3vELU3MT/8DGiCgdHQYSwx+gfRIQpF+jzbtvO xiwd6MwTTx9emaTSeHbjydmxWDpPhlKWu0fD/RaqvxgbwDudcKlX/thdiTtMt3mke02t 2yqQ4tUQ0PiNl/xiCWCN//jkWOMXRRbsPLYS4TMLdD+jgvQjLhDjMjndKW5ePNTDGBZe MfHPs+kViwsBvQVSRbU3fcUTUud1oDaViw431WbRU4Wl8EMjcSaQg+/U1naPnYJJws/+ xScA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=0EBDvZ+RnJ5HvMeb/y4i+e3DUIkgxVD1VYY/3oYu2EI=; b=GmxXXFYzmnTCB03euuadRrzCdzoMvTwMDNcxk3PeD5HJIL0+Bp40OsOyXrKOjvXFNO +EFE3KL/Q3mTGfWjnHoaoHsgBSTE+9f9hEVIwy6+3Dwfpycefn5Y0VKNUWLLJTuMaQxu O9tO5f7W4XHXbxPINfvGi1o85FEo9jn2dZNQ28tqQ2ma/p6xFVI1YMOG+vEkld0t0p9+ qHIZo2p/F63p42yREqmjbgVt566tk+pZ932v/4dXeubAJY0q5laRGBX/WJnccRl+BfDh cJXbt/QD6k5RJXVeMTR2Af5rEhnqvjLn76zHClY1/e5y4zyD/NI269FjDaMCN/7jtbCZ oS7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vuzkvuW2; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 u10-20020a37ab0a000000b006bb710878d6si3479260qke.47.2022.10.31.06.22.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:22:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=vuzkvuW2; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUi8-00044Q-7V; Mon, 31 Oct 2022 09:20:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUhr-0002tq-Rm for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:01 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUhn-0005Pb-NR for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:19:59 -0400 Received: by mail-wr1-x42f.google.com with SMTP id z14so15924866wrn.7 for ; Mon, 31 Oct 2022 06:19: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 :message-id:reply-to; bh=0EBDvZ+RnJ5HvMeb/y4i+e3DUIkgxVD1VYY/3oYu2EI=; b=vuzkvuW2f8JNqWUeSfHoM7clI/Me281dTiTGmF+nRRiNycyB1KFYY48JXVebarvp6w rJg91NPtAw4LBhfcGFxkyXTn2lSsVF64o7ztfE4QcXAJRACoRZj+TmVRjQQn/cf9j6Sq EjWyjxakBFwZMlcdPN7wHvu7XKic4HrN0h4RcSElowjBC8dPmhv6Iofme1okmb86MGpU 46ejZqirg8UmyAMzovkYFn82CZ+z/RG7KXLbmXXCWtjRcUSu0cOx65IrlEMCv8VyyuTW drYNAswOmdVLrin0nHU6Koc11/sZtFCjcCOA8EKT6AdSZLSrbb2Cj7+Ywlw3gCcI4swB EPuA== 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:message-id:reply-to; bh=0EBDvZ+RnJ5HvMeb/y4i+e3DUIkgxVD1VYY/3oYu2EI=; b=VCQnEE/J6TbpqgdzkIwvCY1qWj87pQIEnX9xYZ0i7+A2jIIhOYX3DKAOLso94b0fSG beiUdOnVMgvsX124vdd7l+0vfCfxGdNk1VnvlbEtyKcEulgUYwQD5KbOmIll1ODD8Vd/ hzRT3ssY0RaJgl6r+qNdH5TgwdSQp//oLEVkVRTPiUUMvBMOf5lvSYlhczIW8Ul2GzCp BtL9VrzY/jyEJGKfSO1fA1Dum9yJObB2uNqFi2G8hrVrgwOBATzCnKQT2layzU6oraDu Wodc5e7jE6D/2+YxZ7TX6FJMtiT2W8eHdnWZEPotyztVF5nqlFwI7LIOyFUVbaXHF5dl WW9w== X-Gm-Message-State: ACrzQf0WuRi1EQ7q8ryJ3+l7ovPC9FErdh+60S4pLpKZ+udDSMRIk/CM VG2SZ8YBZLgpxIcURMzJ1Kb6evne3nPcnA== X-Received: by 2002:adf:e5c3:0:b0:236:5092:7cfc with SMTP id a3-20020adfe5c3000000b0023650927cfcmr7910815wrn.285.1667222393111; Mon, 31 Oct 2022 06:19:53 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n2-20020a7bc5c2000000b003c6c5a5a651sm7169997wmk.28.2022.10.31.06.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:19:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 502311FFBB; Mon, 31 Oct 2022 13:10:13 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , David Hildenbrand , Richard Henderson , Ilya Leoshkevich , Cornelia Huck , Thomas Huth , qemu-s390x@nongnu.org (open list:S390 TCG CPUs) Subject: [PULL 25/31] target/s390x: don't probe next pc for EXecuted insns Date: Mon, 31 Oct 2022 13:10:04 +0000 Message-Id: <20221031131010.682984-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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=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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org We have finished the TB anyway so we can shortcut the other tests by checking dc->ex_value first. Reviewed-by: David Hildenbrand Reviewed-by: Richard Henderson Acked-by: Ilya Leoshkevich Signed-off-by: Alex Bennée Message-Id: <20221027183637.2772968-25-alex.bennee@linaro.org> diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 9df7f9e693..f4122db434 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -6624,9 +6624,9 @@ static void s390x_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) dc->base.is_jmp = translate_one(env, dc); if (dc->base.is_jmp == DISAS_NEXT) { - if (!is_same_page(dcbase, dc->base.pc_next) || - !is_same_page(dcbase, get_next_pc(env, dc, dc->base.pc_next)) || - dc->ex_value) { + if (dc->ex_value || + !is_same_page(dcbase, dc->base.pc_next) || + !is_same_page(dcbase, get_next_pc(env, dc, dc->base.pc_next))) { dc->base.is_jmp = DISAS_TOO_MANY; } } From patchwork Mon Oct 31 13:10: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: 620218 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2813173pvb; Mon, 31 Oct 2022 06:12:35 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Kdx4CLQQyvblpkUg7hZzK0VGZBHyAM8k996XuTRprib8gF6FL3ahjl2Vjln8Fy1Hrzvm7 X-Received: by 2002:a05:6214:2389:b0:4b4:9f66:7bed with SMTP id fw9-20020a056214238900b004b49f667bedmr10652269qvb.83.1667221955390; Mon, 31 Oct 2022 06:12:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667221955; cv=none; d=google.com; s=arc-20160816; b=we+AbDyKxDNVzVYZ7wkjEg/zkglOhlI3CMO2u1flbX995OvnkPtvzaqfG1AJF5jteg bUZjEKSLbHXIZTpycgUnkQAwQfn548msDU3e9y1Jxb8dJhXBUaYrjmSxWPy2h7mGV5DW kNv+DUh+WDVDbFIRwyZgCC1n87K3XIsMrZUUqiQxs4sJGDTrltyo8DD/46apHudAiTM0 XlSlqBq0e5/dTxsfKXdU/8y+TjW+AzP/Jd1Tf5xgZiAGA4rPfzFhiRsg7sRmqxH97ivF sTgg0pltfchrNE5w71MSR76bkRw4WUz91hQRZkR7xzSBmrRV4weQRZEMJM1uy1AnfRFT Oodw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=regKgimCFjr2lALH9EduWaStKp/E41H9lSPqMQbdVv4=; b=hVaguOdsln3Z+SqxNQ3olpoecOiFW4lroMvqiBGJNv0O5VJj9YR8kYsPcOEppb6MuP OIeh//uYkHBSVx/7P70FyKImq4ZdliTHZJV8YFGUp/ChpES4qXo/Tbq0pCE9HJGe9BJM NXsC/HoYPSKer2XR8fgiiAt8Sn8Jc+3kgquODdNdxfRQVFL1sOLeOJcvlUMCoKrZrNTJ QiiQySBt4eMlvnLW2FTHLHN9nVO78ulag2ZJGKxV0eAuu1v3+/o16Xrycf4DVgwx7JMz /4iLc/U89xHLlNih99SGVOcOnzbEhg8NPoT1BtMOWBX4cotrPtBT3P/Jx0MgXOZcoLwf KuNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a+YVDI5t; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 kd30-20020a056214401e00b004bb59ea592esi3747485qvb.121.2022.10.31.06.12.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:12:35 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=a+YVDI5t; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUZT-0002va-8n; Mon, 31 Oct 2022 09:11:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUYn-0007xz-Cd for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:40 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUYf-0001GR-G7 for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:10:34 -0400 Received: by mail-wr1-x429.google.com with SMTP id v1so15890206wrt.11 for ; Mon, 31 Oct 2022 06:10:28 -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 :message-id:reply-to; bh=regKgimCFjr2lALH9EduWaStKp/E41H9lSPqMQbdVv4=; b=a+YVDI5tBN815q+4FXrEcwtjbJKTj1jwJ3qYVu0R2vh9GCj7xK964l/h6THiVhgthB +7ir+xv0mZV1gBMCahMmfKJd/JYvk3rkjK9U5zhxqDYyLldcVp4LZXliBqHLy82T5PA2 83yR7uSTl4vUnGkaTg6gI8/awiHKg/t4Sp586wW8XleaaM2worEoU45xXtjYrO+e3QR3 Scp+jcnoXd0WcW77ltKvmS9QhgWfC+HFC58jkJMGJvZcBUaPEzhG8wvJeRdsFxbMXU5d EL3eyl9Wl0qsajhsN+iOc4qKrMOjVzVrbGHlHDcv1/dsmRRf2hRxV2P1k2g8JKyUvfZ0 xIhw== 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:message-id:reply-to; bh=regKgimCFjr2lALH9EduWaStKp/E41H9lSPqMQbdVv4=; b=Rj8/mKrRTPWu9IOTanNQXjogBcV1V2gffpCozxWzOCYBITYL8kFfL20ES150kOMN3Q zkkaxJgyhNCS0pxHlfhZ5cQ3yJvvlDO3d/LX8k59Z3uaDwt20iiuYVf2BateXEEn7CPQ 8ZVO/IHvJieQjCUjmIgggacIMqoKuYrVtqnxdl2332Ta8DHNsikzAGGhldKAB4k/ou3v 3cH7f2P8TTnQqlKuV6tOxiyq+VygOd7a6Xd71t8CQKhAGJNMancSHXXIqe9uKTcu1e8+ dkClW5feaxDzMDkKBt5i4sx2zpQyt4FYw47Yp4yhusxK2Hdlkq8HUp8xDAzfn0jGnTiw hPJQ== X-Gm-Message-State: ACrzQf2LR2ng1NtJOUpNnj6IWpVOFXJf/246vgn98S73Ey+hlNGpgXp2 1G18z2gIN5cU9m6/XrLP+U0fk5RvzylIjw== X-Received: by 2002:adf:f781:0:b0:236:5559:215b with SMTP id q1-20020adff781000000b002365559215bmr8133593wrp.16.1667221827460; Mon, 31 Oct 2022 06:10:27 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bg14-20020a05600c3c8e00b003b497138093sm7782115wmb.47.2022.10.31.06.10.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:10:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6DAF11FFCF; Mon, 31 Oct 2022 13:10:13 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , David Hildenbrand , Ilya Leoshkevich , Richard Henderson , Cornelia Huck , Thomas Huth , qemu-s390x@nongnu.org (open list:S390 TCG CPUs) Subject: [PULL 26/31] target/s390x: fake instruction loading when handling 'ex' Date: Mon, 31 Oct 2022 13:10:05 +0000 Message-Id: <20221031131010.682984-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org The s390x EXecute instruction is a bit weird as we synthesis the executed instruction from what we have stored in memory. This missed the plugin instrumentation. Work around this with a special helper to inform the rest of the translator about the instruction so things stay consistent. Reviewed-by: David Hildenbrand Acked-by: Ilya Leoshkevich Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Cc: Richard Henderson Message-Id: <20221027183637.2772968-26-alex.bennee@linaro.org> diff --git a/include/exec/translator.h b/include/exec/translator.h index 3b77f5f4aa..af2ff95cd5 100644 --- a/include/exec/translator.h +++ b/include/exec/translator.h @@ -211,6 +211,23 @@ translator_ldq_swap(CPUArchState *env, DisasContextBase *db, return ret; } +/** + * translator_fake_ldb - fake instruction load + * @insn8: byte of instruction + * @pc: program counter of instruction + * + * This is a special case helper used where the instruction we are + * about to translate comes from somewhere else (e.g. being + * re-synthesised for s390x "ex"). It ensures we update other areas of + * the translator with details of the executed instruction. + */ + +static inline void translator_fake_ldb(uint8_t insn8, abi_ptr pc) +{ + plugin_insn_append(pc, &insn8, sizeof(insn8)); +} + + /* * Return whether addr is on the same page as where disassembly started. * Translators can use this to enforce the rule that only single-insn diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index f4122db434..03efccdf9f 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -6317,12 +6317,18 @@ static const DisasInsn *extract_insn(CPUS390XState *env, DisasContext *s) if (unlikely(s->ex_value)) { /* Drop the EX data now, so that it's clear on exception paths. */ TCGv_i64 zero = tcg_const_i64(0); + int i; tcg_gen_st_i64(zero, cpu_env, offsetof(CPUS390XState, ex_value)); tcg_temp_free_i64(zero); /* Extract the values saved by EXECUTE. */ insn = s->ex_value & 0xffffffffffff0000ull; ilen = s->ex_value & 0xf; + /* register insn bytes with translator so plugins work */ + for (i = 0; i < ilen; i++) { + uint8_t byte = extract64(insn, 56 - (i * 8), 8); + translator_fake_ldb(byte, pc + i); + } op = insn >> 56; } else { insn = ld_code2(env, s, pc); From patchwork Mon Oct 31 13:10: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: 620248 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2824755pvb; Mon, 31 Oct 2022 06:30:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4mcYzwCU/YJYWTW3dSrxOY52vbD4FAxea1ATyt8g87gyWqW1yGduJFFqA5DERn4yy0RSad X-Received: by 2002:a05:6214:19e4:b0:4bb:602d:484 with SMTP id q4-20020a05621419e400b004bb602d0484mr10789442qvc.31.1667223017223; Mon, 31 Oct 2022 06:30:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667223017; cv=none; d=google.com; s=arc-20160816; b=CY/dXsvLtvlKGkryxMMVurg6jGDeD1ZE3hkt7incCqAl83CI4cIBc+73Zt+5qNaKVG irMGONPfd3qde/b9deFKEyNvzOK2AP9bEIUs7F5qSQxpBNxmy08RLYNhKF2Sj27W8HNy V+2/k+xzusPkdtM3Tw9jgxlpGnwAHZgc0VHosD2HLr9mw/eMAaNFGluv3lp+Dp9f6G+x eqMnBRXVo34oUSzsJ3kNAvRbLO3rq77ODU8ya5qOxFWcsPpv3yTW/FscOk6yfpcLJImq htTkH8sdE/KmoP9ECy/wx0/ztZgaXwxF+8lxEHwnTSyVrH/5/tfZqi/hSUaeivuvhEOJ aEnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=uw9FgH/8Yr/0vBRC68ZiUMTaAo2A59rV6wgtMRPFk1k=; b=sfDdHbDQujhMipTW/pksgRr2nBFnAIBbMhegdGkpfYkT9tAuJyC6/S0VYVnPe5O6wh gzSqI3Va2lA4QgEsYNtJPTSLbbn5aBQh9HPM2gmY2sBb9zXHzcYpGUj7d4h7CkwbsnU/ pxqB8sZYSIvCyTUInvUYDDT1DKG38qnUsxPfP9ZB64shPwtwmPJC9X0mhOLfltTLK9+7 b+GQey+2OEr5pOv6jtCr1E7k4VoP7FcUoWA3ILI6xr7nXbdLZ5YktGqfgR/gaLOs6+6u 67SSyvqjmvYkBzLB0OMmgOFbY+oSmcPjRxotf8CBnwT14yQqzHy965yI6aend0B5Cozb beLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BTtHkEaN; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 k11-20020a05620a0b8b00b006f4d08a0399si3511608qkh.506.2022.10.31.06.30.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:30:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=BTtHkEaN; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUrT-0003dw-RA; Mon, 31 Oct 2022 09:29:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUrS-0003aN-Ij for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:29:54 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUrR-0000qH-1t for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:29:54 -0400 Received: by mail-wr1-x430.google.com with SMTP id j15so15992702wrq.3 for ; Mon, 31 Oct 2022 06:29: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 :message-id:reply-to; bh=uw9FgH/8Yr/0vBRC68ZiUMTaAo2A59rV6wgtMRPFk1k=; b=BTtHkEaNG1mQj75Kqg+vuoE7jN+uMTJhMp5355CJQ+XOnnyG/A1K1WFXS6Qiug5yNW kr2flXZjllEmt2GZ6clEu7/8b30HsTKzLQXC/t8+loql61r1PDm4mJjGn2qF29Q2cuT+ qCh3dKM8mgGfi+5Ke8N6/tKbSfvtozs/WWayt7ussmoUrIgzpiky8/gFFzn2QalrOaYS hLDzw5q8gzIriMAy3zxLldIOpONGqIGHo06XNE08IjusyOcJedy030IZ8jUraRfvnjv9 uFKSnyQNZl4SBv5yv/1p1pqubeeGNpMoGENA1fFcRWTlJ3v+AHnzY4In4rFPJGcsYKHo cBBQ== 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:message-id:reply-to; bh=uw9FgH/8Yr/0vBRC68ZiUMTaAo2A59rV6wgtMRPFk1k=; b=EgU4arEZo1wfcd3wH/uAvNTs0bA1cWgsfdbTm7mVPAnrLAF5FvfzVuadRanpkV83j5 X2vEncw3AWW/t0qFmngLPn3NSG1ARiAYEsP2Rcr1Nx009BnW9XnnS9CJxy8Y9AjPw5Nn JaB4pHmC7m92CKNqIezUazdrUsTLd+nsE/J17UG+Wp6Qgc4Md9Sb+Cb83sJ5xe2IcrqZ DRT82f7SXpT3ilzltWm11336V5EJ1hF4GHf6XJdc0hvNj4KvMmP/gnECFn/2HSpMXRPA 37StOdZXc4kRN6q9zFw+ns7sfdBlpQBbRMnizfYaL1lluAlv8cJn8HG0bf78T3FYaWXd t6Eg== X-Gm-Message-State: ACrzQf1WuspKjNae3CQjLTi5zEB8+UU6Cj3ZFzfwFULxfzlT+JzNxktM 3FtOEzvh9kTSjM1orPhfdd5YVQ== X-Received: by 2002:a5d:45ce:0:b0:236:78cb:b6e4 with SMTP id b14-20020a5d45ce000000b0023678cbb6e4mr7856303wrs.225.1667222991705; Mon, 31 Oct 2022 06:29:51 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id p11-20020a05600c468b00b003cf75213bb9sm1804582wmo.8.2022.10.31.06.29.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:29:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 82E4B1FFD0; Mon, 31 Oct 2022 13:10:13 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Paolo Bonzini , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Thomas Huth Subject: [PULL 27/31] tests/tcg: include CONFIG_PLUGIN in config-host.mak Date: Mon, 31 Oct 2022 13:10:06 +0000 Message-Id: <20221031131010.682984-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org From: Paolo Bonzini Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20221013131304.623740-1-pbonzini@redhat.com> Message-Id: <20221027183637.2772968-27-alex.bennee@linaro.org> diff --git a/configure b/configure index 8c2c4c1a04..4275f5419f 100755 --- a/configure +++ b/configure @@ -2486,6 +2486,9 @@ echo "HOST_CC=$host_cc" >> $config_host_mak if test -n "$gdb_bin"; then echo "HAVE_GDB_BIN=$gdb_bin" >> $config_host_mak fi +if test "$plugins" = "yes" ; then + echo "CONFIG_PLUGIN=y" >> $config_host_mak +fi tcg_tests_targets= for target in $target_list; do From patchwork Mon Oct 31 13:10: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: 620241 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2820590pvb; Mon, 31 Oct 2022 06:23:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6ywYS5qzgDLG6LFm2Go7ZvRDTfXnNB9D4QsOAbTsDYSoIovDrXB/ph9E8qN0RV/7Qnx1sj X-Received: by 2002:ae9:e30c:0:b0:6fa:dc:dd4c with SMTP id v12-20020ae9e30c000000b006fa00dcdd4cmr2401768qkf.232.1667222603816; Mon, 31 Oct 2022 06:23:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222603; cv=none; d=google.com; s=arc-20160816; b=pWXK43+BOgGQqxK4gbOt2VnXOaLTNtAvtl662GkS8jF2rhFVPot6yAW164EP3FoZ02 7y4+95q2dCcoiZbaN5l4DHCeip2HqmA85qECKrROTWWrHByqSKtXItoy3s2s4hDtJGJv iH7eTxRZI9EC0TtDnJVrjh2smow6ujpo+kvRK9e5Q74PSDvNxNPeK0dI7xxlwDtDNp+a GVpIJ0CVVbz5mBsYxxgy9Guw201QicvyYm/4jc0s22+X3N8sXKtLl8sl24Gc3aaZXMfl 6G165J1F3qMtq35znOHF5y+GHnYMB4shWon987L9fRyPoI7gT5PCw9U2r8abIFpoy/Ny fNHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=bA91MP2QN6W9BeOl6D0Gz9Ie0TrwUCWVor1t5nK6BWg=; b=XP5lujcAGPUg8zFstkYbLKdS592/BFXATK61HS5V6OtEBuOgGONQuzi1RWJ71TfIV9 glXJsyRlPutraPCYcrOraESOHAi5/OhAVCR7NZiXqum9pN93Omc9PDGLxaBvbQ/E45Mf Ssf/hxTolt+8DLo1rSb9y4pg+boU+216YxJ0b5/Czp949VZoen/UH1zr52vMIYXeX+Wc O/e4UrSk1l/W3LcVLbhINRdUZO2cN/5WcMHH+TosidRYnXkW9fTnr9i+ZzI4QwQuzIeP KryOQSjfeZJeZW0MXhQxysIUgIlzwNkXHYYMtvErt+y7Hn+jBiqcpqin3UVZ5AhzU6SH pFKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z2uEeEU4; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 x6-20020a05620a258600b006ee7ab1ecd6si4123094qko.194.2022.10.31.06.23.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:23:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=Z2uEeEU4; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUi9-0004DA-G3; Mon, 31 Oct 2022 09:20:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUhu-00030n-QJ for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:03 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUhn-0005On-5Q for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:01 -0400 Received: by mail-wr1-x42c.google.com with SMTP id a14so15946447wru.5 for ; Mon, 31 Oct 2022 06:19: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 :message-id:reply-to; bh=bA91MP2QN6W9BeOl6D0Gz9Ie0TrwUCWVor1t5nK6BWg=; b=Z2uEeEU4XxhShk7WVRDTOKQ5Kxtw74uJ1a0IqkzE8fYpsKPMOmR45sZmpp9OnaEKv1 f5XjRX0PsuHhMX+AKtXTp4O3l7TjtgbYNiDvuahfjV0jNzlFSRReFD4La3NgQktrNAFq C0zxv4i8JgW4EGxztarEjyo6v4CESjz3uPVbfBV4N8/zVRkn24TnqCGcmgWEaj0n/9g+ Z9W0VLa9tOBy1quuBDJjXqCLQjdo8Hpi3u41ZB7N7DuumI5+6CXc39g+1gw24VJtiT49 dUBcnmSeOneyU+v5Fg0j2aBtgEB+m7RgKLEasxOVHEeYIDG2NRRW6bTnDeYJfm5mb6hE BjEA== 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:message-id:reply-to; bh=bA91MP2QN6W9BeOl6D0Gz9Ie0TrwUCWVor1t5nK6BWg=; b=EO8qxVy3vnKGISUXgAqvgJUiUBQQEoy4Zmw0dG29bAN+ANMRURASJMxa/BecsjwB6o pLn687FiT6lH1ouYGaT3LGvsxFgUmJVFScyTM3MME4Am6yVCO2qRb4rlIM0mpGyL/rEt zaH5u4P/NJTaR036LqLrQFlvrGpmofIB+0md3LTl66LjfCd3Dq1WfZYBG1/tEtRKeiRa 5VHXQXEsSNLcNxR4mA5qOtnH9XYn1yy9f1+GmZlxWzJtKyf5GlItxp7gF6rlWVgcY4ZT CUf6tvw8UM7OWsy2chqjF/xd3DcnOJ21eJkQQAERg9WruBnDYLqHXipUuygAzJXbGLBF IKgg== X-Gm-Message-State: ACrzQf2huemWW1/J3N9zyN5GxFpUSh4g9vZ0ndjpQm9/Lfrk5MQecbF2 drbRyRO8DAl+4HixTfUEMob3Gw== X-Received: by 2002:a5d:64c3:0:b0:236:695d:39f7 with SMTP id f3-20020a5d64c3000000b00236695d39f7mr8365840wri.614.1667222392187; Mon, 31 Oct 2022 06:19:52 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bv19-20020a0560001f1300b00236627c078esm7230338wrb.110.2022.10.31.06.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:19:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 98FE11FFD1; Mon, 31 Oct 2022 13:10:13 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Paolo Bonzini , Alexandre Iooss , Mahmoud Mandour Subject: [PULL 28/31] contrib/plugins: enable debug on CONFIG_DEBUG_TCG Date: Mon, 31 Oct 2022 13:10:07 +0000 Message-Id: <20221031131010.682984-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-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, T_SPF_TEMPERROR=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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org We used to rely on QEMU_CFLAGS to expose the debug flags but now this is synthesised by meson and only available to the main build. Add our own flags if we detect the build has been enabled with CONFIG_DEBUG_TCG (which is the default for --enable-debug anyway). Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Cc: Paolo Bonzini Message-Id: <20221027183637.2772968-28-alex.bennee@linaro.org> diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index df3499f4f2..23e0396687 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -29,6 +29,7 @@ SONAMES := $(addsuffix .so,$(addprefix lib,$(NAMES))) CFLAGS = $(GLIB_CFLAGS) CFLAGS += -fPIC -Wall $(filter -W%, $(QEMU_CFLAGS)) CFLAGS += $(if $(findstring no-psabi,$(QEMU_CFLAGS)),-Wpsabi) +CFLAGS += $(if $(CONFIG_DEBUG_TCG), -ggdb -O0) CFLAGS += -I$(SRC_PATH)/include/qemu all: $(SONAMES) From patchwork Mon Oct 31 13:10: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: 620245 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2821150pvb; Mon, 31 Oct 2022 06:24:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6589r/ogKtFTnjZOgKyO3qe9pPEaPJtiTMfktkW1r07dPit4231eSkgYguJ52wqS6njRS6 X-Received: by 2002:a05:6214:21a6:b0:4bb:85b4:fd96 with SMTP id t6-20020a05621421a600b004bb85b4fd96mr10750202qvc.28.1667222666187; Mon, 31 Oct 2022 06:24:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222666; cv=none; d=google.com; s=arc-20160816; b=jh0yMNRDacHkpuGxWrs3C302KUz4EYv6DZ+LZ4kRDDciiBaawE3+Kvu28b9yGR47SW m6P2LZFbre+qMKDdRSUG3ufviE+m4asFAE1DOXYFgsMOZ+hA7iDOi0yL783q52chBUrY dbcy0ZwQk4kAYW3Ld07DKwdYSHq1dmAQEsRiIO6RjSuYwXv0X0BFPf12bt64uA2XSFwn ccg87feXEpXX2baUU1oycmgaFlSThHENDBGM4CSMNK3ivmC127IBtUZ1qNpwYKdeKrFI zANHDf8K0aJy7Q5rrcQJR6pdjfSND8LB69jczWoIFrmm66SUmz2nwlPD/3LFCRZwhO3F ImZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=tPlORCDUhIdMTxSbY9+3ApJt0vgPiTHe09LMHvFMmc4=; b=bwp3NoJHuh+NALmsHsQdjG+DNOxnUnRQ7DwLgB6MorKbymQrv4i2IRR5ek9Xkt637w 129v36R8CFtE82Z6ML4cUURVUHzLFXl58dYxelnw7uICSNnolibEvb2+Sq+1Kjac34oq hSuFxfq96ajQG+4ag0EyUanY6wQMJ2IgYEBgBb+7AfnciyTzJ9PNrlkd3PXMT+irXUDC xLEowmdtaMpOW1DExrtROSxf2XsiK8GGF5hElWbmb1AJPqLtgn6THUufrxU5G91Lc9T1 X3ekLTD0GT2VKvNWEGwK0CAfgzRd8PCPs37SOqP6fUaYUt9029uNSGFOZqfyvfDW9buD PXBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zr61yoZp; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 fy25-20020a05622a5a1900b003a528caa9cdsi1041591qtb.581.2022.10.31.06.24.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:24:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=Zr61yoZp; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUib-0005dP-Mm; Mon, 31 Oct 2022 09:20:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUhx-00034T-Sm for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:07 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUhr-0005Rv-I6 for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:05 -0400 Received: by mail-wm1-x32b.google.com with SMTP id l32so7125305wms.2 for ; Mon, 31 Oct 2022 06:19: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 :message-id:reply-to; bh=tPlORCDUhIdMTxSbY9+3ApJt0vgPiTHe09LMHvFMmc4=; b=Zr61yoZpcMQ0OzWDriDszfVjLXAStSVhy1OlxW/sBrnorIeaLuEKJ1nJgPZH/Cfhwb 0Gg3iSCgffRf7MKqTnZ5Zp6j3rg+OgEqT/TsXjWNlaBsC1M3odYv9FuuB+/6c+52pc6q j2RbYk09eUsdTYWRwn3+zzToOAXHtB9BNv2NK4E2IUW3xhW084ilnEiOTTpeiZHAJ5cf dlHjNLpemPNHtnCKynxt1uDIyPBAsh1QNmPNmF5JbO3MFI+jF43h2uR9yj7879BDj52k as2eYcvzGU4zm3O/FLQHnKrWOVVAprA9VSUJvMVk7sxnpoKCkXUwVDwvG3POpZUdkTi+ KVsw== 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:message-id:reply-to; bh=tPlORCDUhIdMTxSbY9+3ApJt0vgPiTHe09LMHvFMmc4=; b=Ry1cwny66/xUf1hdWfQrZNpAHXUac6qTeyE0DKlUDA8Dq1dZk/Pwe2Dk+laZSsWlVb 7gDqKDelb5pKzjmoBTfxNx7syQd+rwnCv4H+DWmEE587lXPvIpLMsTZFANloZaLpbjwg xwNfPjnMKlwFEk4iszGkTHGgqQgg9OG2zBDxydhDCQ5LKRIhn/RtNdcHod3huQiFRVqi LqWMVSWDf6/08vOhfft/V24m6gY1Crjfhq7Fv3mdmKAdnWfjFOh9S/yrtR3xzYIdFWPW 7+5vnEPsk0aj9XhHt4jdKpB7POGiqDyQ2NJK/XiMlLUOtJrPyP7jk+CPS2YqlE/mN5lh CEJg== X-Gm-Message-State: ACrzQf3b046aWM2d7aM+nyfApEb7Bgh5sXeQDdmWQegN2Dc3oVS3nSlr 7kf28uz25Fm2QrrJmrhnTa/fAg== X-Received: by 2002:a05:600c:3ac9:b0:3cf:6be9:e69a with SMTP id d9-20020a05600c3ac900b003cf6be9e69amr4879331wms.130.1667222397191; Mon, 31 Oct 2022 06:19:57 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q8-20020a05600c46c800b003b4868eb71bsm6908905wmo.25.2022.10.31.06.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:19:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B08ED1FFD2; Mon, 31 Oct 2022 13:10:13 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Alexandre Iooss , Richard Henderson , Mahmoud Mandour Subject: [PULL 29/31] contrib/plugins: protect execlog's last_exec expansion Date: Mon, 31 Oct 2022 13:10:08 +0000 Message-Id: <20221031131010.682984-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org We originally naively treated expansion as safe because we expected each new CPU/thread to appear in order. However the -M raspi2 model triggered a case where a new high cpu_index thread started executing just before a smaller one. Clean this up by converting the GArray into the simpler GPtrArray and then holding a lock for the expansion. Signed-off-by: Alex Bennée Cc: Alexandre Iooss Reviewed-by: Richard Henderson Message-Id: <20221027183637.2772968-29-alex.bennee@linaro.org> diff --git a/contrib/plugins/execlog.c b/contrib/plugins/execlog.c index 1b3bb7ebba..e255bd21fd 100644 --- a/contrib/plugins/execlog.c +++ b/contrib/plugins/execlog.c @@ -18,11 +18,30 @@ 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 *last_exec; +static GMutex expand_array_lock; static GPtrArray *imatches; static GArray *amatches; +/* + * Expand last_exec array. + * + * As we could have multiple threads trying to do this we need to + * serialise the expansion under a lock. Threads accessing already + * created entries can continue without issue even if the ptr array + * gets reallocated during resize. + */ +static void expand_last_exec(int cpu_index) +{ + g_mutex_lock(&expand_array_lock); + while (cpu_index >= last_exec->len) { + GString *s = g_string_new(NULL); + g_ptr_array_add(last_exec, s); + } + g_mutex_unlock(&expand_array_lock); +} + /** * Add memory read or write information to current instruction log */ @@ -33,7 +52,7 @@ static void vcpu_mem(unsigned int cpu_index, qemu_plugin_meminfo_t info, /* Find vCPU in array */ g_assert(cpu_index < last_exec->len); - s = g_array_index(last_exec, GString *, cpu_index); + s = g_ptr_array_index(last_exec, cpu_index); /* Indicate type of memory access */ if (qemu_plugin_mem_is_store(info)) { @@ -61,11 +80,10 @@ static void vcpu_insn_exec(unsigned int cpu_index, void *udata) GString *s; /* Find or create vCPU in array */ - while (cpu_index >= last_exec->len) { - s = g_string_new(NULL); - g_array_append_val(last_exec, s); + if (cpu_index >= last_exec->len) { + expand_last_exec(cpu_index); } - s = g_array_index(last_exec, GString *, cpu_index); + s = g_ptr_array_index(last_exec, cpu_index); /* Print previous instruction in cache */ if (s->len) { @@ -163,7 +181,7 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) guint i; GString *s; for (i = 0; i < last_exec->len; i++) { - s = g_array_index(last_exec, GString *, i); + s = g_ptr_array_index(last_exec, i); if (s->str) { qemu_plugin_outs(s->str); qemu_plugin_outs("\n"); @@ -201,7 +219,11 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, * Initialize dynamic array to cache vCPU instruction. In user mode * we don't know the size before emulation. */ - last_exec = g_array_new(FALSE, FALSE, sizeof(GString *)); + if (info->system_emulation) { + last_exec = g_ptr_array_sized_new(info->system.max_vcpus); + } else { + last_exec = g_ptr_array_new(); + } for (int i = 0; i < argc; i++) { char *opt = argv[i]; From patchwork Mon Oct 31 13:10: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: 620235 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2819109pvb; Mon, 31 Oct 2022 06:20:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM41R7yE6k7YENrrWtIEX7Ktkt7j3/YT358HFZvKZdU90xEFMk0eaYoWWOm9pYfe1dNauEur X-Received: by 2002:a05:622a:44b:b0:39c:f5bf:694d with SMTP id o11-20020a05622a044b00b0039cf5bf694dmr10429587qtx.531.1667222454152; Mon, 31 Oct 2022 06:20:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222454; cv=none; d=google.com; s=arc-20160816; b=cvH0gsFhiHyFneOKvzvKuMeh+GTRbxShsDu2TBAckx3NoglWmxLyuSzjf6jGZpOaK3 urrqOJb4Lv/W32RDuMvVCkdzAcK+NZw75cZ4tc5f2cq6W1DRoqDqtoHajrCzMxjTpx4w FWFvyhHQCRv4X0E9tvi0gbJs/SSU4xCAWsfrEUHGsMwdVhulXYrXP/vvM0FC5s/6qAor mkq1UUxWol2kZ9gejCQZtlMCVF2Jsm2RnE8uHaZGY6alhT5XFUzdjWaESM8Kl9LquoOO E7QnRTAbFt7aa+AjVvyhSYhnR91/S+D31GqSoNFqrAarNHDSP7KKH0zH1KiUb6+HtZLv 6xtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=38CIqeK6tAYrMp96yOEjbU4GfBGml0abO/Zm0V1JKyw=; b=A/gjqtbdWlU8k/C60fbpgolbT88saaRbFVgL9uhLEMbNEpOYEM/qCPMkxKPDx9GgVT IjrC2041UXxqpEEVAxqFRXioLMyXHOLnDk1lt+ehNqHe0+575oMq26aRf3vr/yg5tbP/ WF2Pqp9LWIw/oV8hMpz9CO+bw9mp2g52LEwdwP0xSCAujii32C0T+Rm51IXGsDVPWqlo cYfQ1myRnsmzu3ndfjU2iqb3AOfTMLVrYjsbBgrLsbWkwGxyB7ftd3RTTBzf7awkjROp K25ibUEzg6stauXM7CbGKXtgZxIBJ61B864kF5SLz2mXYE1MB0f6gH257a3Pmgl0OYQ7 tn7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i3yUo005; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 br14-20020a05620a460e00b006ce4c19d1aasi4007353qkb.35.2022.10.31.06.20.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:20:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=i3yUo005; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUiZ-0005Mj-8g; Mon, 31 Oct 2022 09:20:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUi1-0003JZ-Hx for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:09 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUhr-0005S7-JQ for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:09 -0400 Received: by mail-wr1-x435.google.com with SMTP id k8so15976332wrh.1 for ; Mon, 31 Oct 2022 06:19: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 :message-id:reply-to; bh=38CIqeK6tAYrMp96yOEjbU4GfBGml0abO/Zm0V1JKyw=; b=i3yUo005Q9AZdYSkRkt2ilYEugHuZPjzLyaP5L7wRCcGJMGQAdXeOt9Ez63H84afO7 YM6EsEdDMQT+DRLUf6U1ZfLdio1lSup5bsmR07mDrJqQotJkyco+lW74ApGBsKFsG/Sh kko3fRWWK1wn6LdE4aTgupilZiJfQej7MEKbIdCQ4fyR6X4dps2TBFZhQNSo62YSJhfJ GeUdM64cY/5/UrO3/nGzbdZWZ/F58o51wJb/L/zjZMnaDCrBd1c0kmx/MCBMrChnb4E9 LiUfsCPPD97UMm3F632IYAUbLQEKwdmqf9y5J3C1N0/b+rvH5rwHCHaIuD/dFfPmr6PD +dlA== 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:message-id:reply-to; bh=38CIqeK6tAYrMp96yOEjbU4GfBGml0abO/Zm0V1JKyw=; b=GsizgXpPH0HSFi5ZkmUSNnZSrnSSpGaRCz97N/nquCrimtzJrHFkCeLArCrb9FlVAN 3SJghHJm9twLKg5R1p9u/y73Uapz6xDuvAgvjOMQC/ppwFcsicJLGCQB6wLDCfmQoJMD cXliBBrAPaH0DtpSLdyrqbDdxGrNqXUPz10M1VeVjLSrozQ1yM+04v/WZEZKAfVlxZPR 54cmR7rHpE5aOo8DEkNRZZ4SuNMXpkQP+i+ESs4aihzzmCNhTUF0ctbZhO7lr/TXNjTx wO6I7ljJygMirt7W1xerOPv/oEs6RfpcZffAGsbrue6xHq0ssL/lrITcmFXdxIrikIJs WJ4w== X-Gm-Message-State: ACrzQf0rnGq2+3EUWu8bHx40Bv7wg5E5F08e7FBXJISDPLXGfbceqSvB R6y4VK3JqOQz+ZBV1tFdfR2WJg== X-Received: by 2002:a5d:588f:0:b0:231:c661:5cee with SMTP id n15-20020a5d588f000000b00231c6615ceemr8386955wrf.18.1667222397585; Mon, 31 Oct 2022 06:19:57 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id p11-20020a05600c468b00b003cf75213bb9sm1771353wmo.8.2022.10.31.06.19.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:19:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C95731FFD3; Mon, 31 Oct 2022 13:10:13 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Juan Quintela Subject: [PULL 30/31] tests/unit: cleanups for test-io-channel-command Date: Mon, 31 Oct 2022 13:10:09 +0000 Message-Id: <20221031131010.682984-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org This test is hanging under heavy load when the two socats race while trying to create the socket. I've tried various approaches to avoid the race but it seems "creat=0" won't stop socat trying to create a pipe if it executes first. In the end I just use a small sleep which seems to be reliable enough on the load situations I've tried. While I was there I also properly created a tmpdir for the socket to live in which is cleaned up at the end of the test. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Cc: Thomas Huth Cc: Marc-André Lureau Cc: Juan Quintela Message-Id: <20221027183637.2772968-30-alex.bennee@linaro.org> diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-channel-command.c index 7eee939c07..43e29c8cfb 100644 --- a/tests/unit/test-io-channel-command.c +++ b/tests/unit/test-io-channel-command.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include #include "io/channel-command.h" #include "io-channel-helpers.h" #include "qapi/error.h" @@ -26,32 +27,32 @@ #define TEST_FIFO "test-io-channel-command.fifo" -#define SOCAT_SRC "PIPE:" TEST_FIFO ",wronly" -#define SOCAT_DST "PIPE:" TEST_FIFO ",rdonly" - static char *socat = NULL; static void test_io_channel_command_fifo(bool async) { + g_autofree gchar *tmpdir = g_dir_make_tmp("qemu-test-io-channel.XXXXXX", NULL); + g_autofree gchar *fifo = g_strdup_printf("%s/%s", tmpdir, TEST_FIFO); + g_autoptr(GString) srcargs = g_string_new(socat); + g_autoptr(GString) dstargs = g_string_new(socat); + g_auto(GStrv) srcargv; + g_auto(GStrv) dstargv; QIOChannel *src, *dst; QIOChannelTest *test; - const char *srcargv[] = { - socat, "-", SOCAT_SRC, NULL, - }; - const char *dstargv[] = { - socat, SOCAT_DST, "-", NULL, - }; - if (!socat) { - g_test_skip("socat is not found in PATH"); - return; - } + g_string_append_printf(srcargs, " - PIPE:%s,wronly", fifo); + g_string_append_printf(dstargs, " PIPE:%s,rdonly -", fifo); + + srcargv = g_strsplit(srcargs->str, " ", -1); + dstargv = g_strsplit(dstargs->str, " ", -1); - unlink(TEST_FIFO); - src = QIO_CHANNEL(qio_channel_command_new_spawn(srcargv, + src = QIO_CHANNEL(qio_channel_command_new_spawn((const char **) srcargv, O_WRONLY, &error_abort)); - dst = QIO_CHANNEL(qio_channel_command_new_spawn(dstargv, + /* try to avoid a race to create the socket */ + g_usleep(1000); + + dst = QIO_CHANNEL(qio_channel_command_new_spawn((const char **) dstargv, O_RDONLY, &error_abort)); @@ -62,17 +63,27 @@ static void test_io_channel_command_fifo(bool async) object_unref(OBJECT(src)); object_unref(OBJECT(dst)); - unlink(TEST_FIFO); + g_rmdir(tmpdir); } static void test_io_channel_command_fifo_async(void) { + if (!socat) { + g_test_skip("socat is not found in PATH"); + return; + } + test_io_channel_command_fifo(true); } static void test_io_channel_command_fifo_sync(void) { + if (!socat) { + g_test_skip("socat is not found in PATH"); + return; + } + test_io_channel_command_fifo(false); } From patchwork Mon Oct 31 13:10: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: 620239 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2820137pvb; Mon, 31 Oct 2022 06:22:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6AYXsr7JuVeIcqppgSCnA7Tfv8puCFmzHw2HxFtznCiOrAiss7ZcPO6LgY/fYAftE9Zkdn X-Received: by 2002:a05:6214:2688:b0:4bb:61a2:e7db with SMTP id gm8-20020a056214268800b004bb61a2e7dbmr10883908qvb.100.1667222558412; Mon, 31 Oct 2022 06:22:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667222558; cv=none; d=google.com; s=arc-20160816; b=WwEBfhTnR7F81bDUcXTSN80g3zL3mmyfp7/ZZfZFVJLdUnrBj7cEMSg+6/tzvk9apS D8XUB1YttCIPPxzRPj5Uhb6RMQKl/dOLcJoGMEPjDqDTYTXONg4PTlXeHlR3nDy73her Ax0OlqZnSQSSoeo04yzUdfKgXcqqte6bEwxsZ+XBwJO/3fHGCfV2FVrhqj4bRxMbcka5 E7sd/3DNOsOJmvH+/DdsLh383JnUxlscFspiOsmTqIUwEla4HXDnH12Gb3QHTlx3jlI9 NG1pRqlJcME1SdzNPCEL+j7S0lBMmIClmHZr9TT07iCqcWJ5L7gts72MHHWIpa+OMLVm blMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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=BP29Ki6yP/DZbhV0oFjwlgXIaAyAE9rA1CMCqvoccmU=; b=TLVN+Tu+SyfoOxakCUHxaRn/ccJP47hHhzeCiGrB57pCiLRNxbpQyTWqueDLEeAtaR I9WxD7Tn0x+LLaY/34ctAsHMVgVyP1NDFuce2QoWx7rCqUSPRVy0MQ4TnYYEi5XdfKNu tWEJguzoXtFqQCM1f4477blWqV+maSN9FFscfUklXhb1nH1FLPw5f5lJC49WjZoQrOxE bpt7wlyQDmTJw0Jucx5i469U1lVP4g39bgqSSzFNCF8QU06d0GkL541VT11S5mE2L6vt aNvttjGft2S4bxVl7LIvMbiblR4OAgk8LElAcn0rxnYribGsB4sGVEZvERerHoI+F6ww bexg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SUpnCi7P; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+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 dv3-20020ad44ee3000000b004bbfa7d5ca9si1367091qvb.205.2022.10.31.06.22.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Oct 2022 06:22:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+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=SUpnCi7P; spf=pass (google.com: domain of qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opUie-0005pu-08; Mon, 31 Oct 2022 09:20:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opUhy-00034Y-82 for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:07 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opUht-0005SO-GM for qemu-devel@nongnu.org; Mon, 31 Oct 2022 09:20:05 -0400 Received: by mail-wr1-x42a.google.com with SMTP id cl5so4296164wrb.9 for ; Mon, 31 Oct 2022 06:19: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 :message-id:reply-to; bh=BP29Ki6yP/DZbhV0oFjwlgXIaAyAE9rA1CMCqvoccmU=; b=SUpnCi7P9kK8mOJofejpJGpzuyxNtA361HmcTdMiAiXfsm+HTFfpvl30fYoGFzeHAH 5aVThoc2sVsPNhcw/i1Ry9myY6zl2V6tDmHHJJtepSPAWt60BKpwPvPifEjGP88oNB7U oD62w0AxUYkXhNQQRIaHdhcG+brSyuClHCS7dHmMTa+4YC1qvGzNAj99nCR33neGQiBc QnOfcWqqqcvjX/sQqJdPkp369a96hWrrD7k9AFCvLAh4OSJpVccp5AATD1hhoIMTkDu+ SHY1C9DBlKyPmdH0kkz8/az2G65OI/HfMMU6l2G+/opOiyvqbPEqc42fuPJZPrxj1RmL zlQQ== 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:message-id:reply-to; bh=BP29Ki6yP/DZbhV0oFjwlgXIaAyAE9rA1CMCqvoccmU=; b=wDWd8w+eczb8fSc2X75qRWU21wv+7hvVnVTz7tddUZJ//MENN2r0Ir6yGNerg+h07s fdcv9RThXfqIfzNSAZQU8G7Do18Aw7cPwk1tz0lBN5Ud7wXk8PQPXa0lY81Tic6pCTdk Vj5OCjIjCTSTqigbCItn1kUH56/8ieSgbYDfJf5CHPoESLiau+9ApHY4bkhr9Orp7R3M 3SsNvyjpPqtKTGka5eefD29mgAN/uXFj9bOoXKQ/9Hc12oAEW26fr1q+yJ8DCZdAxA1l q9HpZwmLizy3XVSStekTBUrBgkQUcAiSoaEkX6I6iUy9/zlJw8PjtmLZSdR6vZizm9QW HEaw== X-Gm-Message-State: ACrzQf1zAOGZHkPBINXcFNhQxWPA6vEGveAZI9TbpPc7FGyW2xjkexKH f1wqjYiAseDEHVFSgN1hrk7y3A== X-Received: by 2002:adf:e8cb:0:b0:236:7ae2:918e with SMTP id k11-20020adfe8cb000000b002367ae2918emr8214680wrn.613.1667222398726; Mon, 31 Oct 2022 06:19:58 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id d8-20020a5d5388000000b0023672104c24sm7260775wrv.74.2022.10.31.06.19.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 06:19:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E03331FFD4; Mon, 31 Oct 2022 13:10:13 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Ilya Leoshkevich , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 31/31] tests/vm: use -o IdentitiesOnly=yes for ssh Date: Mon, 31 Oct 2022 13:10:10 +0000 Message-Id: <20221031131010.682984-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031131010.682984-1-alex.bennee@linaro.org> References: <20221031131010.682984-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+peter.griffin=linaro.org+patch=linaro.org@nongnu.org From: Ilya Leoshkevich When one has a lot of keys in ~/.ssh directory, the ssh command will try all of them before the one specified on the command line, and this may cause the remote ssh server to reject the connection due to too many failed authentication attempts. Fix by adding -o IdentitiesOnly=yes, which makes the ssh client consider only the keys specified on the command line. Signed-off-by: Ilya Leoshkevich Reviewed-by: Thomas Huth Message-Id: <20221027113026.2280863-1-iii@linux.ibm.com> Signed-off-by: Alex Bennée Message-Id: <20221027183637.2772968-31-alex.bennee@linaro.org> diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 4fd9af10b7..2276364c42 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -233,7 +233,8 @@ def _ssh_do(self, user, cmd, check): "-o", "UserKnownHostsFile=" + os.devnull, "-o", "ConnectTimeout={}".format(self._config["ssh_timeout"]), - "-p", str(self.ssh_port), "-i", self._ssh_tmp_key_file] + "-p", str(self.ssh_port), "-i", self._ssh_tmp_key_file, + "-o", "IdentitiesOnly=yes"] # If not in debug mode, set ssh to quiet mode to # avoid printing the results of commands. if not self.debug: