From patchwork Tue Jun 27 16:06:25 2023 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: 696843 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3862190wrm; Tue, 27 Jun 2023 09:07:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7vAoRJAFqCzJ0km9JpXPURe+m5TGn6hZF8DSU4SYZNnjBLGGqscUDkc0YjEdsLAwxhocL4 X-Received: by 2002:a05:622a:1047:b0:3f4:fa49:a33c with SMTP id f7-20020a05622a104700b003f4fa49a33cmr44070084qte.53.1687882073574; Tue, 27 Jun 2023 09:07:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882073; cv=none; d=google.com; s=arc-20160816; b=pFLSv/Z87X94K7MQaLWTS5Jc7+UjGFDGm971pCTzQMn+4rYPOvc6ZteccIZMyoUiLE IvJWClM4cruiZyybx4AMzAWf2lKQHs+Z71G6399xHgTmvCVe2jHcpmiZoCvjwBZeLX62 xcDaaW3i9QzskzlraR71mB3R+d9JAzimXsITUbGByxmNBxmir8M6hnLx7Q0sF0WQzzIk ThE8SuB8VJNT9NUEyyWhNgSsZaGD4UtQjGkdjyTx6oiRoa6+QwvXXmLFQ4FzdNe1VpRO Furqun+/rdRalsTpLKJZt4CyvA5vwvwRNOpOAbQTZxYuKXh7HT1QouUBdAxiDJ8jpXCn 635w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=lp6KR88j71QtkzhoL0VNQhU+0wKLrKZSfG0XhX5V00g=; fh=UYmazdnd7dWeaUl9zzIqQyuUvQUcVQKeyrKAe+85WNA=; b=bTAcrVMzkvE2ONhNLaQAW/k4gtx4lBn40NyUeN/75VPhbAtKJvBs9jR0Pjio+T5F7M D1gCcl1XjBvrG8IuPBFhDPS3rvRZv7T2gEnqQ43lspL6Fc+eCDlf1bGqGkCNhDLqy7q/ DRqfUGT+gRMi1uYAeFV+BeGraTy2KVzvAckgf34Fsl04Rd4tXrJHOK56nHwLvBLwWhOA zzJh5mNoYlzunyDzq5w99ftf1x5U52vB6OBu8gzN8frgiP5411IXH3GPTTJtnj8K5kkd Oqoe52tERE2hpZ/e4j7L76O40AWc4bNxInjn6dE6Mfd2FQojVAJkfLtY1DIDKjzMrhK1 Cddw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TL4fwOU9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v6-20020a05622a144600b0040080bca125si3321373qtx.200.2023.06.27.09.07.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:07:53 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TL4fwOU9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBDh-00009X-Rs; Tue, 27 Jun 2023 12:07: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 1qEBDd-00008l-LU for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:05 -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 1qEBDb-00055s-FQ for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:05 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3112f5ab0b1so4335080f8f.0 for ; Tue, 27 Jun 2023 09:07:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882022; x=1690474022; 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=lp6KR88j71QtkzhoL0VNQhU+0wKLrKZSfG0XhX5V00g=; b=TL4fwOU9qai380+Gto+fDFtzIZmPaE+5kxVy0ZwNj5Y9vcsAtDz5nBwclDPSCh/mqd NPNjGoCIAyfYaq3kzPYS/gY3P3M3MVoL5GfZvraQWhXtSvWnNs+JGJ5dsYP/MBefHMs3 K1AyvzoVofNC4EpSrngkmDLoehVbi/U4H8bX25LILTQG8CjV8iCb3yvpv8dla3xLgLBr R0zW4DoCUzA/f1+fpQ3zI7SifQzurKUjwBYjYxezAKWhQNfNk2myniJktzcfYkRTNatS jiaQx0waCfK/GPzQSl81sIqIerXnXi3z1SBju+BWzivVj/crNBGdIzcxdmbWhbkLraK3 wnKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882022; x=1690474022; 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=lp6KR88j71QtkzhoL0VNQhU+0wKLrKZSfG0XhX5V00g=; b=ddsvHeLod2tlCrxIVIO2UOPEBV2OTkzvbfRZbHviS9mJ7a7/rpPdvtxmOMULr5n478 DE4GXZM+I6i2RUM2BJQ4wCqfmGy3mcCJnUwWyr6Ej0Js8Bu3m/Wpi0epZZ2OyAsXTvqG B0MDzq4DXN18RjCzAewWTQxyCr61DCOa2Hdfn32bEnG/3W7qVznb1qdSjHlJb8P1unjX 8rfmeq15pdMe+Nv5yqMem0QwwPtdnnXQO26EaqXky45lqsNQP1BcGLkfRNWYWHfxWIa6 Yx8dJtK6SJJWmUQ1xOMIY0qcPUG2PviuWxThXzQoPDRRFNVwaFqRmtOmU1kEDbnCmsYm g4pA== X-Gm-Message-State: AC+VfDyMAUcmCk9DzZxrnT+dMMqmpnv445z2A7oegEZrQ8sCU+ino8vW LZN3SBEnomrzrzC2umfrsy5JPQ== X-Received: by 2002:adf:fa83:0:b0:30e:56ae:ccb7 with SMTP id h3-20020adffa83000000b0030e56aeccb7mr22878192wrr.52.1687882021792; Tue, 27 Jun 2023 09:07:01 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 7-20020a05600c230700b003fa968e9c27sm6482295wmo.9.2023.06.27.09.07.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:07:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EB3FA1FFBC; Tue, 27 Jun 2023 17:07:00 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PATCH v3 01/36] gitlab: explicit set artifacts publishing criteria Date: Tue, 27 Jun 2023 17:06:25 +0100 Message-Id: <20230627160700.2955547-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Daniel P. Berrangé If not set explicitly, gitlab assumes 'when: on_success" as the publishing criteria for artifacts. This is reasonable if the artifact is an output deliverable of the job. This is useless if the artifact is a log file to be used for debugging job failures. This change makes the desired criteria explicit for every job that publishes artifacts. Signed-off-by: Daniel P. Berrangé Reviewed-by: Richard Henderson Message-Id: <20230623122100.1640995-2-alex.bennee@linaro.org> Message-Id: <20230503145535.91325-2-berrange@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/buildtest-template.yml | 4 +++- .gitlab-ci.d/buildtest.yml | 2 ++ .gitlab-ci.d/crossbuild-template.yml | 1 + .gitlab-ci.d/crossbuilds.yml | 2 ++ .gitlab-ci.d/opensbi.yml | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml index 5da61f4277..f3e39b7eb1 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -25,6 +25,7 @@ # rebuilding all the object files we skip in the artifacts .native_build_artifact_template: artifacts: + when: on_success expire_in: 2 days paths: - build @@ -53,6 +54,7 @@ extends: .common_test_job_template artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" + when: always expire_in: 7 days paths: - build/meson-logs/testlog.txt @@ -68,7 +70,7 @@ policy: pull-push artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" - when: on_failure + when: always expire_in: 7 days paths: - build/tests/results/latest/results.xml diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index aa833b62ca..24bba061cd 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -462,6 +462,7 @@ gcov: coverage: /^\s*lines:\s*\d+.\d+\%/ artifacts: name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA} + when: on_success expire_in: 2 days reports: coverage_report: @@ -587,6 +588,7 @@ pages: - make -C build install DESTDIR=$(pwd)/temp-install - mv temp-install/usr/local/share/doc/qemu/* public/ artifacts: + when: on_success paths: - public variables: diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild-template.yml index 6efb0d2a54..d97611053b 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -55,6 +55,7 @@ .cross_test_artifacts: artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" + when: always expire_in: 7 days paths: - build/meson-logs/testlog.txt diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 1e0e6c7f2c..34f9df2be9 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -169,6 +169,7 @@ cross-win32-system: CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu microblazeel-softmmu mips64el-softmmu nios2-softmmu artifacts: + when: on_success paths: - build/qemu-setup*.exe @@ -184,6 +185,7 @@ cross-win64-system: or1k-softmmu rx-softmmu sh4eb-softmmu sparc64-softmmu tricore-softmmu xtensaeb-softmmu artifacts: + when: on_success paths: - build/qemu-setup*.exe diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index b4d7eef688..fd293e6c31 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -63,6 +63,7 @@ build-opensbi: stage: build needs: ['docker-opensbi'] artifacts: + when: on_success paths: # 'artifacts.zip' will contains the following files: - pc-bios/opensbi-riscv32-generic-fw_dynamic.bin - pc-bios/opensbi-riscv64-generic-fw_dynamic.bin From patchwork Tue Jun 27 16:06:26 2023 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: 696858 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3864156wrm; Tue, 27 Jun 2023 09:10:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4NmqxltI2me/a5sF9BxsRBPROzN0JzodSboLw2XBQs0iBK2ZMDR+InA7WXare39KOlhP7Q X-Received: by 2002:ac8:7f44:0:b0:400:9a75:d868 with SMTP id g4-20020ac87f44000000b004009a75d868mr12011376qtk.53.1687882237356; Tue, 27 Jun 2023 09:10:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882237; cv=none; d=google.com; s=arc-20160816; b=IJAjo/wuXe8yRokoN+ybSABnhsT9q8GYBau4D9qeJRQXLPmSkfBfepuBnedTurjCe3 1z4CWMiXm2mDzL+BwA3XyUhffLsSRagnEY9JA5McOWQbGD4/uh/sRYkSJfQSab7frsTQ GtCwAZ2H6kbyOF0JAI8Usctzn4SRw08bykCmAJk33qGPXaFiPde5PxRqE0Qf6acoC/1W EtRh8/LYRmTkn4km9ViJVrK3uCvxYzOXfObHqt03xbe7INqzMMROXcpDjVxbZBtK17Qr AaQQSgPUyHl9oIuM6o7pgi+8Ji/mm+dQz0uH6nNkbRuawgQz+8h3Z7rybrS1/3nzyXqB Y93g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PkkwaC5weGbOgI6TyHV8oGFM7+1AeUMfWTRfSlmxtvc=; fh=UYmazdnd7dWeaUl9zzIqQyuUvQUcVQKeyrKAe+85WNA=; b=DPdKW/YyNrfmG37N7x7CObKbtZzVVw1FW7DCjpG+A2Iijfy+INdwu2hluTCJRtoAlk 8N6wDlANeWVcUqHi8McBYEt/Gf9dknu7LuG3pgyqmMr4x1Ub8cT13l6jeqlQ8N6WZy/n jOaj3Sb/17b4RcVJAoSbpHSAlHyJIb0YZ7gMHGvb4RRcqP0rwO6b96g0LjR2OWltvfC8 5rdPwo258D6nS1oTjfSikPsQKLVXBmJSL+cak9RuXAVlu1KG1QqvxPB4pTXPWDbqimq9 bwXpcCc2KlwPr8ZwdwvAO9vj2eDfCPRYkou+AkaQJZhBUP9WLrXWA2GtCPhDtK/tcRYd 6C9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e5d3YYQj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c15-20020ac87dcf000000b003ef63934bcbsi2162714qte.424.2023.06.27.09.10.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:10:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e5d3YYQj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBDl-0000ET-RW; Tue, 27 Jun 2023 12:07:13 -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 1qEBDe-000092-VL for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:07 -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 1qEBDb-00055x-GH for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:06 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3f90b8ace97so64168375e9.2 for ; Tue, 27 Jun 2023 09:07:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882022; x=1690474022; 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=PkkwaC5weGbOgI6TyHV8oGFM7+1AeUMfWTRfSlmxtvc=; b=e5d3YYQj7/zoKz5nduBkPvRVT48ov8rDmTZNfhWDFYZ3QWAonn1VFnFbkRYr9ccL3g NVQU3mYHZgnFWIHfxEl9ynLLKQx/PmU7onsgYhRitN4ZTZ+SnIaY2550DMXen87CN+DQ JQU91i6BcwmR5ERbOYwqkJ8ebSyUKyByj9h69pbbnwRKQJb3VidTn2mPKKFfaGEyk+6Q GoYSeWOD4e8mBvn9+S0PwOoLs7kwJs32fPDq9Q9W8XeF1rbT5ORXnQQwNg8cdRovZIrj RhVeheRidtl0xSwrTWJ8A1h24Z1VnQBuWWV1rcsqmylYJ7GnLWS2/rCoFa9E/UaXRBHu WMsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882022; x=1690474022; 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=PkkwaC5weGbOgI6TyHV8oGFM7+1AeUMfWTRfSlmxtvc=; b=M/hlcHRgDG6iUaqTVjY0MfMFY0M/spsxayt/rTtOFXGXPy090DZ2e3W5XSNlQ10BLq 9793UYfS+/c1ORmoVn5oArKBV+nADozzkBhENFNGOvCrUOcJuDzEPKAEgUe0m7FEX6lM UAS/aKfUMEu2rhjSbsrGxg02iBBg0/7n22+nvM0rg6bDM0iDNXkJUBIYJOH0ZBZiotu0 Cz/I5uCWHT1V9ZbWImmjWWBKF9kB0ud14uvVmNx0tP1gz2rHp5WTFjn7SfX6dB9AT2mW 4DnfI1CZ8iWju7FaOCCgwyg3O2A6rH1Kbvwe+MKvWbK6O5+lVPxJTku8fyNzJ4tY9xkC IHBQ== X-Gm-Message-State: AC+VfDwYKBtV5gruIF1e+I5+TqajAttWg50hQY/3YFDkyag37Zw4nXtd Fn54Pdnk3gFm0rFpjvd9XLBEEA== X-Received: by 2002:a7b:c8c9:0:b0:3f9:b8df:26ae with SMTP id f9-20020a7bc8c9000000b003f9b8df26aemr17695408wml.34.1687882022063; Tue, 27 Jun 2023 09:07:02 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id cx16-20020a056000093000b00301a351a8d6sm10926631wrb.84.2023.06.27.09.07.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:07:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1024D1FFBD; Tue, 27 Jun 2023 17:07:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PATCH v3 02/36] gitlab: ensure coverage job also publishes meson log Date: Tue, 27 Jun 2023 17:06:26 +0100 Message-Id: <20230627160700.2955547-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Daniel P. Berrangé The coverage job wants to publish a coverage report on success, but the tests might fail and in that case we need the meson logs for debugging. Signed-off-by: Daniel P. Berrangé Reviewed-by: Richard Henderson Message-Id: <20230623122100.1640995-3-alex.bennee@linaro.org> Message-Id: <20230503145535.91325-3-berrange@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/buildtest.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 24bba061cd..a8fd9a0c1f 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -462,9 +462,12 @@ gcov: coverage: /^\s*lines:\s*\d+.\d+\%/ artifacts: name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA} - when: on_success + when: always expire_in: 2 days + paths: + - build/meson-logs/testlog.txt reports: + junit: build/meson-logs/testlog.junit.xml coverage_report: coverage_format: cobertura path: build/coverage.xml From patchwork Tue Jun 27 16:06:27 2023 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: 696859 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3864434wrm; Tue, 27 Jun 2023 09:11:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7JmQvBQ2v2+SgFKOFlfcSX56dU5T8eEkgdFNJ9S94dw3PMU1j5dBDgI4EFGnmQfkoDssjM X-Received: by 2002:a05:622a:134f:b0:3ff:2c69:11a9 with SMTP id w15-20020a05622a134f00b003ff2c6911a9mr27881967qtk.32.1687882265333; Tue, 27 Jun 2023 09:11:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882265; cv=none; d=google.com; s=arc-20160816; b=Y4sV6NRelvKOoJTTv6QAPPOsftXBm/qlww7MkbBIsEEjiVkikCoTtn/oCJxDvsPm3e baMDDwATvxAAx998yeZm0vTdbwD0sNHBOrzONLUFN14Nv5HtDV4Br4ccRRy1bnBaQzcT nKTyS64CZ51nGTbWOa3NTgldrOMvob10BfEjiYfnN3JJd2eQEaFrhr9NzznFJDw2KPfD CJD75pJNq9FjXDTFuIX/teJZloudkPYAUNcLQtQsbRg0LOn92DW1nhgcjJp22H2dwrzB uSw7ER9BSMbqPmekSo3bTUiWTGKK/h7ZhKRTwh0GjXk2o1eM2zCXZQpofN/pRQI32bUW D/fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VTHkiiEsGJjQzyOMxbcLNdH7rkjQKhZ4rW+u2UfYIYE=; fh=UYmazdnd7dWeaUl9zzIqQyuUvQUcVQKeyrKAe+85WNA=; b=biNiuzF3ht4HwOh6yxLTQnMa8GgBCa0fLZDNmaA7mP/Dj+0IbF05cCUwVaodAgNlT6 2yC3PtA0WH95JzQ9qn5bEQjzkT3mD2tYzKsFvY518M4jgwKPhdilR7HYhIspDA9FKUU8 t2DIvBuRMss6hmoobF9kVHxDVEyMoLDTBBnFREtQAtaMFfdDmiG7C6aymJIjw07DZi2r m2N537WavwZtMssnBwe0HKTUXRviC/j4UFitdwgbn8/KrG25LRQdAh8plMo19TiVveuu 5Y8G4Ndo25tV0RSl2rRx6LpwLF5j1hK0wAkEHC6rjxy3ibYKKnlJ+E4dWrl4l0rqIeEy BHBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N6whGesP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i6-20020ac85e46000000b003b9a3723193si3323759qtx.204.2023.06.27.09.11.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:11:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N6whGesP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBDu-0000Ir-So; Tue, 27 Jun 2023 12:07:23 -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 1qEBDg-00009d-US for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:09 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qEBDc-00056P-Kb for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:08 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3fbab489490so3609765e9.1 for ; Tue, 27 Jun 2023 09:07:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882023; x=1690474023; 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=VTHkiiEsGJjQzyOMxbcLNdH7rkjQKhZ4rW+u2UfYIYE=; b=N6whGesPH7klh/0MAJIQ/977PbeomWSVI02jLAM5i+Me3dW499smPi7P2NSLCgQHqw zA6mvsPcklBe/AOiBfJ4QVmHg7TGRo84e5+yo2k87UzLpy6hs2QzCyfLEo50dufwh+Wn nfWaQ56CtEYc99IFj981I7zqfXj6xDaugXpeVsgzlgs/44+fBtXwGsqpQP6iLRnzvhxC h1XEYeth7Bmoz3okTx2ppkqHU9Jq3IpytWI9fN9m2lRdeJ3vziCOrn+6E8TQvrX8yv+Y 8kmq5eqDPksBNYf/bgAFSZ9rHsgRwsLQnQCIUiy+KAFA77eLhdgvaqYu/7WYZaamDpft eK+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882023; x=1690474023; 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=VTHkiiEsGJjQzyOMxbcLNdH7rkjQKhZ4rW+u2UfYIYE=; b=EnxREw98UhyjfDYe3rxlPGpeMs1pZ86xjgA4SWcg/uLZyXvwv6UNXxIAcHt/7kpvpu BppxOYBYOW0LXJdHY6M2yir0NvMCHLqoQgHbysESM7VysgomDvDmGC82mnY4NmGsjtD6 dB8Az/L6+Bn3jfQrcIWUssLBQQuCJinFxorV0tYt/217dumwOKUcGiGg2YhouIT4YWoy lru9SLAMrOpEuzFSyTe3x01wdOaYhv1sAx0TpUwJ46gp/yRAwHYN8W0RgTzx3b++LVmB zlmp+rFr6ONd0acO45yshOGrkKKoSkGKlIiHa2NcrrOVgYC272DnaHOxk7ZXkOPjYWNj 1pAQ== X-Gm-Message-State: AC+VfDyRTW7iBi66ZVmGXT4YeGtdzNnpzSFxTQoZUyT3NECbTluVTXIa GQwKrugGUTC04rUWNg6GoIUclA== X-Received: by 2002:a1c:791a:0:b0:3fa:76e2:e6d5 with SMTP id l26-20020a1c791a000000b003fa76e2e6d5mr12235133wme.37.1687882023113; Tue, 27 Jun 2023 09:07:03 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z3-20020a5d4c83000000b0030497b3224bsm10775476wrs.64.2023.06.27.09.07.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:07:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 28B171FFBE; Tue, 27 Jun 2023 17:07:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PATCH v3 03/36] gitlab: reduce testing scope of check-gcov Date: Tue, 27 Jun 2023 17:06:27 +0100 Message-Id: <20230627160700.2955547-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This keeps timing out on gitlab due to some qtests taking a long time. As this is just ensuring the gcov machinery is working and not attempting to be comprehensive lets skip qtest in this run. Message-Id: <20230623122100.1640995-4-alex.bennee@linaro.org> Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée --- .gitlab-ci.d/buildtest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index a8fd9a0c1f..77dc83a6be 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -454,7 +454,7 @@ gcov: IMAGE: ubuntu2204 CONFIGURE_ARGS: --enable-gcov TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu - MAKE_CHECK_ARGS: check + MAKE_CHECK_ARGS: check-unit check-softfloat after_script: - cd build - gcovr --xml-pretty --exclude-unreachable-branches --print-summary From patchwork Tue Jun 27 16:06:28 2023 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: 696853 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3863880wrm; Tue, 27 Jun 2023 09:10:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4GbmcsWdLF2/YeopGv0rvF4KFhOvSoQUWd1Pf1CzcQ5Q2YGHAelY8X2m09Gn72MeclT2+I X-Received: by 2002:a05:620a:414f:b0:75b:23a1:830b with SMTP id k15-20020a05620a414f00b0075b23a1830bmr49492323qko.6.1687882209098; Tue, 27 Jun 2023 09:10:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882209; cv=none; d=google.com; s=arc-20160816; b=Rkarep2v4n5PIcOyUgBbLOoYGjf92056oZDdQNsFz4tEfsoh2hTu/Nwo1+ExxmguPJ Z7Lqmrdhidj90E4iHM4MIckuZRBWgUd0bUhTDK4qtfQsGabQIOZU2exiuxL2KxLOK2Cs n9r45ejHbSIKqzjBdH51ExBkAtmHh77ClE7kr+30b2gsTZ9G36TDjl3wcHJn89vSAuHq 2yapuYO4kOV8bquK8J9I/a1VIGZFHbkxteEYUHNzUHUcNeV9OJxqWdKehek9TU0hxn+/ CibBuWhilr+eEVFURO0yOajM0UU9689Wj6NFLHjZpwgR+Xri/2CDMQA+dXZEPuRm2sNs VpeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hn+zKX2ZU5kJ7IFfmWrHts4Msqz+nCT2HShGHhdqu5E=; fh=rgUA5LysIpOc0bw6wasZNFM2d6N7oYRbxnf9xlYLAKI=; b=wGJRUrFUxLKsc3bJoThW3dMZie83MCU3FpWZ97GicinLwYDJd6NeNUma+obDoGPUZZ bmx2pfo+HfOF6lc/yYNc91/YRWukkos6OEejgUeb6KIhIdDpMvyNS/9eMVt91OpTI4AC GHqrXLn9eZIxioMpug1gJmCLwvIms7VF2MvmDJIeAmmzeX3wwNmWO3VaZf9YUL5tp0BW xSQ0AqqldxEDg3LlcWTE0byL/v205amXk0yN6k4HQ6rYY1VP7FNEGSFdq6so+JDqEXs5 H2VsOK58e9tTyYp5NAXhxogSUY2vHJK/7DhWVFUKHSZsKI9HY+gFbQeGO4oKM8QRFS2r Xp2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nIdpYPyS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ra19-20020a05620a8c9300b007606fd3b7f8si2265952qkn.139.2023.06.27.09.10.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:10:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nIdpYPyS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBDn-0000GB-SC; Tue, 27 Jun 2023 12:07:15 -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 1qEBDg-00009a-T5 for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:09 -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 1qEBDc-00056E-Ca for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:08 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3fba8e2a9ecso6760745e9.3 for ; Tue, 27 Jun 2023 09:07:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882023; x=1690474023; 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=hn+zKX2ZU5kJ7IFfmWrHts4Msqz+nCT2HShGHhdqu5E=; b=nIdpYPyS4ngFihoCaJLGN5/GVklazQlCaHB/oNRi9ptLCVRIA3lhB7YKf4I98j9YkJ O/S7x7PY3hYW3pFD/81G+pueHgFMF2bQqPp1FpqSAa1HzxMdiqUN7l9JAUrM7uz+zQPK 9CNNAE4h5IDYnTNzmunZAaBWxiHrqDKQB344SpPA6CscjKfnk1ZIzcXE/kYY3rDULGVf WgrU4hhhEf4sgZFTb/W8FRBZE/m2A71H7wyFFsQ3vKH+MBRV5uttB4knj2tAqydJ1BPF oJxdnYujI7nn9WVOd6baDyOq6Cgyf+NuOtdIKOC95FxReibJgJoqWRH4c7/w85QkSxme x81A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882023; x=1690474023; 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=hn+zKX2ZU5kJ7IFfmWrHts4Msqz+nCT2HShGHhdqu5E=; b=YTf/xQp5FdL/2TM+sBn/WLIXRhy5nLJpHYQmJi1GDWYVVsJsSwDsD9rTQPvudbGaQm Djb39lxIBo1VM934KQndi1OV6FMWDSkvjDjdgsHbrkyL7J8IJfIqOCOrCw8e5ME3XTGS 2Odystv0WXERhAiMuypRP639aj9ArSSZzvqBPWGzmI1M5LoVmwwJilkMunNBxVVEOiQv WwI9ll+Jb9CLxfpLW24pKg8rIZfOOPNZvFyp/OTINa65vzlxNT7P1hXs8it6pS3eZKWB /S/iwf2aGhjbAhSYoRrhRpl8bcqEDtGrTCB63vVdq9v0mUFVJmAugiIvYBKmshfUvecJ BcHQ== X-Gm-Message-State: AC+VfDwguGIfM8PES9OUWu9pQ58S6+/oiMjhGgw1k/5v12VqgIIEXonO Qh2abITgTnqFFI3yKLl0a0/CIA== X-Received: by 2002:a05:600c:b51:b0:3fa:83ef:1bc9 with SMTP id k17-20020a05600c0b5100b003fa83ef1bc9mr8923502wmr.41.1687882022843; Tue, 27 Jun 2023 09:07:02 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u8-20020a05600c00c800b003f70a7b4537sm14133054wmm.36.2023.06.27.09.07.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:07:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 408861FFBF; Tue, 27 Jun 2023 17:07:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov , Ani Sinha Subject: [PATCH v3 04/36] docs/devel: remind developers to run CI container pipeline when updating images Date: Tue, 27 Jun 2023 17:06:28 +0100 Message-Id: <20230627160700.2955547-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Ani Sinha When new dependencies and packages are added to containers, its important to run CI container generation pipelines on gitlab to make sure that there are no obvious conflicts between packages that are being added and those that are already present. Running CI container pipelines will make sure that there are no such breakages before we commit the change updating the containers. Add a line in the documentation reminding developers to run the pipeline before submitting the change. It will also ease the life of the maintainers. Signed-off-by: Ani Sinha Reviewed-by: Daniel P. Berrangé Message-Id: <20230506072012.10350-1-anisinha@redhat.com> Signed-off-by: Alex Bennée --- docs/devel/testing.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 203facb417..8f18052ba7 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -485,6 +485,12 @@ first to contribute the mapping to the ``libvirt-ci`` project: `CI `__ documentation page on how to trigger gitlab CI pipelines on your change. + * Please also trigger gitlab container generation pipelines on your change + for as many OS distros as practical to make sure that there are no + obvious breakages when adding the new pre-requisite. Please see + `CI `__ documentation + page on how to trigger gitlab CI pipelines on your change. + For enterprise distros that default to old, end-of-life versions of the Python runtime, QEMU uses a separate set of mappings that work with more recent versions. These can be found in ``tests/lcitool/mappings.yml``. From patchwork Tue Jun 27 16:06:29 2023 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: 696861 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3864661wrm; Tue, 27 Jun 2023 09:11:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5aC/F8axlQR4bU5A5M62aogMmy+8j+2tQQgj5CMdHUWT+uxmr3l1jhbRpZGSoME0ZxLk0Z X-Received: by 2002:a05:620a:3902:b0:765:70cf:d7a4 with SMTP id qr2-20020a05620a390200b0076570cfd7a4mr10192154qkn.71.1687882293307; Tue, 27 Jun 2023 09:11:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882293; cv=none; d=google.com; s=arc-20160816; b=cXa78knXas/NZPN2TIFojFHuHqha6Ty+tEp8FmAP3ocZLZA1V3QOlYLSTzknA4SmGe yuy5udGSldNDiFPz7QnLqV7Uf5HHrGQcsMxqpQkyqbZ1O1VM7hoxzJbsjUsF0y06wK5v 6wMke3bS0uvVqyBRS/9HqcGFXlY5pk7PHQs4bxgcL4iAQh+z/g7I5i+SBiauNA9mKW67 O1NU6uVAjblHYJLd5FysimOjgQpwnxp6geM9brf6GB/h7rupag9j7CVcrsieKfaG+PSy niFOmgF2rDh9eXgHOpOQyUOv1Cx57VlX0+bTMlkUESuBXGUVZiqvxchTpE4wbjxahtzh oNzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=I9YIwoz2syzBIvgIfb1KrTiedkOwekCcwMFZMGMcvn4=; fh=UYmazdnd7dWeaUl9zzIqQyuUvQUcVQKeyrKAe+85WNA=; b=FzuqQ99Y4sbwSJD1fD3q6J7WdQiJVk1kLQRo3r9Ewwb4pnxAV6Tc51T49QZuwzu1fH 3ZQ0u8EbeL1W6vKpjq5Vrc38m538BWoRve50Si4m4y7+leahVWUum1Iimk0iYLaJKo3n YYDIkG/1aAD3bIC4WtZAu4D/psHDwlh+dbc+GC7DRxg1XTky6rZxuOBldNRraNNEbppu FFU1gx49xLlNvJa2YC+S4piltYWSUc6/yC5GSMBBud13HHxClVZns7iNkweLJ1wtr+8q Ymy9eETRO3TXeSoErLbntWbdGtONWh+CeVvA7qqpBcmtYrTS56pAH93Fh7ywLwZU6OmS vIMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BImmWDS1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id uw7-20020a05620a4d8700b007639d123e23si3301449qkn.26.2023.06.27.09.11.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:11:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BImmWDS1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBE2-0000KZ-II; Tue, 27 Jun 2023 12:07:30 -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 1qEBDh-00009i-QL for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:09 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qEBDd-00057K-H4 for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:09 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3fb10fd9ae9so21485895e9.2 for ; Tue, 27 Jun 2023 09:07:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882024; x=1690474024; 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=I9YIwoz2syzBIvgIfb1KrTiedkOwekCcwMFZMGMcvn4=; b=BImmWDS1AhWeNAqHgZ1mRvKhHyuW1pnoYGmQZkwgX/zB/yNEaqmpiJgy0CHvx1K/Et +ajzyDCHkA166ee0WMRI8OJM8PJ0MsRF3edfl0KYyLw9p0jqbiMfZteslS1LuuA07CY5 e5KKch2klLZlL6RK+2N2X9c44mV6F/ilBqMN/IN7CTR3l4320qF6cmrLjcBceVCWKDYA J7Rf1lX8T4iQ9cjztdBPtrzH19j3wr7xj036eD2IxDpnzxYsMvGVgvGK0oHoj7V5ra6g mn75riyd20SG5ceftVFOZ0iBrA5lgu9GF3om0CSSWS4c6zhsLpxas+Q7Blc7YqrHyrgL WPNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882024; x=1690474024; 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=I9YIwoz2syzBIvgIfb1KrTiedkOwekCcwMFZMGMcvn4=; b=UuVGHImzD+XinOv9EFV1TC5fjpUeWwDGOWhXzXWswuqMSWfAnGC1NimEAoDflrGaVc Gqvbz0CJOyLPkW3fRHkFVTsoodqh8Q9r0yxsiWtJXovI/kcbOYNdNKxh9Zv+O35bKw40 ngaXGsRd7nRKEJqkh0EMArDRd7GJ0KdpGXfgn4tHCOPim7uzdpbvNlHd8qOjqKU6Wt7X 5oZzRKabvxp8Sw5BpfjyQQZDCUm3GXlO3zkuVlQAmhZnVP+At3fJk46AgKbDnBmS4eWb oLC5iwCUWGrMNo2oO8q7PmjppZ+zG+2dRLMoIUGRfoXUwgtVIp1jDG+zDYu92Gn/sJ2m uDlA== X-Gm-Message-State: AC+VfDy7DuyaYyGshgJwMCZ4WaKPmF52EroT/oNJX5/Kidt5hX5mWN0O 12zZV2SQpHzd9tS4tIhR5EvDFw== X-Received: by 2002:a05:600c:ad4:b0:3f9:b8b8:20df with SMTP id c20-20020a05600c0ad400b003f9b8b820dfmr15197504wmr.33.1687882023856; Tue, 27 Jun 2023 09:07:03 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m21-20020a7bca55000000b003f4248dcfcbsm14145540wml.30.2023.06.27.09.07.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:07:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5968A1FFC0; Tue, 27 Jun 2023 17:07:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PATCH v3 05/36] tests/tcg: add mechanism to handle plugin arguments Date: Tue, 27 Jun 2023 17:06:29 +0100 Message-Id: <20230627160700.2955547-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We recently missed a regression that should have been picked up by check-tcg. This was because the libmem plugin is effectively a NOP if the user doesn't specify the type to use. Rather than changing the default behaviour add an additional expansion so we can take this into account in future. Message-Id: <20230623122100.1640995-6-alex.bennee@linaro.org> Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/tcg/Makefile.target | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 72876cc84e..2462c26000 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -169,13 +169,17 @@ extract-plugin = $(wordlist 2, 2, $(subst -with-, ,$1)) RUN_TESTS+=$(EXTRA_RUNS) +# Some plugins need additional arguments above the default to fully +# exercise things. We can define them on a per-test basis here. +run-plugin-%-with-libmem.so: PLUGIN_ARGS=$(COMMA)inline=true$(COMMA)callback=true + ifeq ($(filter %-softmmu, $(TARGET)),) run-%: % $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<) run-plugin-%: $(call run-test, $@, $(QEMU) $(QEMU_OPTS) \ - -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ + -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@)$(PLUGIN_ARGS) \ -d plugin -D $*.pout \ $(call strip-plugin,$<)) else @@ -189,7 +193,7 @@ run-plugin-%: $(call run-test, $@, \ $(QEMU) -monitor none -display none \ -chardev file$(COMMA)path=$@.out$(COMMA)id=output \ - -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ + -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@)$(PLUGIN_ARGS) \ -d plugin -D $*.pout \ $(QEMU_OPTS) $(call strip-plugin,$<)) endif From patchwork Tue Jun 27 16:06:30 2023 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: 696848 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3863340wrm; Tue, 27 Jun 2023 09:09:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6MCxF0Ho0G0Zkpwf06CpSZojyVKTh/JGmKXnbOB2cNq7xeUAvKWXZENVQoRbyjYsS116PS X-Received: by 2002:a05:6808:188a:b0:3a1:7985:d0d2 with SMTP id bi10-20020a056808188a00b003a17985d0d2mr17988830oib.43.1687882167117; Tue, 27 Jun 2023 09:09:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882167; cv=none; d=google.com; s=arc-20160816; b=oa3NVfgKfGStEgn8jMx6rC8v+OlRZ8cs0XOWS8mTnvh5/ofjqCTesLvxUIu2eBK8tx ndSgNMU2WCObgCdSdqPT89Lv5uDYkGu9C5goWf5lKhzScFlzDQL+IkzUZWsW64mZ+knM JqS2n8b1AsZE/aPHf278LhgKVBLNwUoSTt09Z69s/ONnXkfeM1Xddi3WHncqKYK2bFaP 4W61GrHD8TmKCqcMTCWz1gFgXajVgo6DCx8wkmgV6A3u/MG/SGrGrXsYRjiJd25GTry/ v2DKVL9HGnFQh/655O7ovoskpveVyZ23FRfTR9t8x/yDlgYWL90BtbjAbuDvkh+hlqnd gm9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JwYXISrmUwYEeEBYbvf+rC+BgUtqy99AwD9pTl/rVpc=; fh=UYmazdnd7dWeaUl9zzIqQyuUvQUcVQKeyrKAe+85WNA=; b=sAY5PWCwTMf/sMKcwNeacYTcP7RgluejlYWYoZLcTrrwWHpeGwW5z7IglNoBTDepD8 ylnvEvfPVNexaacvivYzqFXS2TjQZvb7OIhk8M3T+o66CNfpBrIwyDdLwstxqJx9AShb QtALildOCzvu5U2Dns+/30HfNuken9Vl7chOvJoXENfJzggyarA6vCxPj0hNC+rqxfbS qgcrEnHuJimepfMamQ4FiXhsHHgh14XdR7iW+BW7x2R5p09owB2/jskFzzKO3JLChtht K8tNRNpWFOsWvvl99Z34P/OAi10IYMAEJW1CdJzDiDjnfdOmB689pHyupmWdyVfCWJ/S TZxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="LIJa8T/z"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w5-20020a05622a134500b003fde98266dfsi3364263qtk.81.2023.06.27.09.09.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:09:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="LIJa8T/z"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBDl-0000DL-BE; Tue, 27 Jun 2023 12:07:13 -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 1qEBDi-0000AT-5n for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:10 -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 1qEBDd-00056c-Qh for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:09 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-313f3a6db22so2318764f8f.3 for ; Tue, 27 Jun 2023 09:07:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882023; x=1690474023; 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=JwYXISrmUwYEeEBYbvf+rC+BgUtqy99AwD9pTl/rVpc=; b=LIJa8T/zlasl7a+2JlP0u6PEaw3nKQzMEaYwVuJjnL7qMpS3ibTjBE0Yu5buCy9Y8I gGQv72WZReSg2PR6g94UQAlAZQbucKAAMEmHYmZqsl87TuaPlkngR4u5mW3xDQFwSTTV YGt2bxvchx7aYR8z1CAyT5JZHO2gWEjH3VrXVfX3Sm/1GPymmdpJzB36Q2f50f5fi1dk 0cKeKzOpXc61qPtQHlYyocaMc3YeQSAbbUJ6HZ9yNMaeY4IYmXGDyTZ49Y0NoATX6gl9 9PrO/ZG1XC/UCl+DApg0KuPQRCYWZU/FrKyP/FVykDBcb3pu2/Lp1ARDZ19OwMppSCRY Kl6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882023; x=1690474023; 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=JwYXISrmUwYEeEBYbvf+rC+BgUtqy99AwD9pTl/rVpc=; b=GGguAuYq/ebEiefd/2x8cp4HUcaDc6ddQjto8xCa+1f1zoHTQsk7TGU+IEC8Ko8lCm TLLIioqzAV4/1Zf2sqnj+VNMXNsnnLoY4FLb9eFahI2HW86S7JgZwHAUUSz96SL/ayC6 CzEc0v1vt97+KQMdKi6nX8awlo2HvRgy6LQ7LW/ko41QfOX5bQWCT6MOkWcg4s0izIyt Cc44RTQ8eDxipeMVGW0RIgUXW/FPoLc9A/EmbSHOcS4AhcY3WXglJGhe3XdvoRwfMLwW yGEs+rSH5MvpqzIG45R7Lp+m5eiH51W/+BV5Z9TuJaN+YYm0anE1Ehuv5LlOH8agZ5Jf L65Q== X-Gm-Message-State: AC+VfDwuf7awsl5QuD7/gmssojsJMZ4iekkpkdMn9SB6AqIbsICpzvum Ab4bN1j4T1U9iaSbzHUa/GvYpQ== X-Received: by 2002:a05:6000:42:b0:313:e2c4:7bc2 with SMTP id k2-20020a056000004200b00313e2c47bc2mr9321794wrx.53.1687882023743; Tue, 27 Jun 2023 09:07:03 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id s7-20020adfeb07000000b0030ae901bc54sm10780158wrn.62.2023.06.27.09.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:07:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7154C1FFC1; Tue, 27 Jun 2023 17:07:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PATCH v3 06/36] qemu-keymap: properly check return from xkb_keymap_mod_get_index Date: Tue, 27 Jun 2023 17:06:30 +0100 Message-Id: <20230627160700.2955547-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We can return XKB_MOD_INVALID for AltGr which rightly gets flagged by sanitisers as an overly wide shift attempt. Properly check the return type and leave the bitmap as zero in that case. Tested output before and after is unchanged with the gb and ara keymaps. Signed-off-by: Alex Bennée Reviewed-by: Juan Quintela --- qemu-keymap.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/qemu-keymap.c b/qemu-keymap.c index 229866e004..8c80f7a4ed 100644 --- a/qemu-keymap.c +++ b/qemu-keymap.c @@ -140,6 +140,18 @@ static void usage(FILE *out) names.options ?: "-"); } +static xkb_mod_mask_t get_mod(struct xkb_keymap *map, const char *name) +{ + xkb_mod_index_t mod; + xkb_mod_mask_t mask = 0; + + mod = xkb_keymap_mod_get_index(map, name); + if (mod != XKB_MOD_INVALID) { + mask = (1 << mod); + } + return mask; +} + int main(int argc, char *argv[]) { struct xkb_context *ctx; @@ -215,14 +227,10 @@ int main(int argc, char *argv[]) mod, xkb_keymap_mod_get_name(map, mod)); } - mod = xkb_keymap_mod_get_index(map, "Shift"); - shift = (1 << mod); - mod = xkb_keymap_mod_get_index(map, "Control"); - ctrl = (1 << mod); - mod = xkb_keymap_mod_get_index(map, "AltGr"); - altgr = (1 << mod); - mod = xkb_keymap_mod_get_index(map, "NumLock"); - numlock = (1 << mod); + shift = get_mod(map, "Shift"); + ctrl = get_mod(map, "Control"); + altgr = get_mod(map, "AltGr"); + numlock = get_mod(map, "NumLock"); state = xkb_state_new(map); xkb_keymap_key_for_each(map, walk_map, state); From patchwork Tue Jun 27 16:06:31 2023 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: 696845 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3862883wrm; Tue, 27 Jun 2023 09:08:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7ewmEsksV9+RLlch4gZyj0BLsJcpB/q+5bumdLKkOWkmqzxszU2nCuCoT/NbMJP1fkoskF X-Received: by 2002:ad4:5de2:0:b0:625:aa49:ea03 with SMTP id jn2-20020ad45de2000000b00625aa49ea03mr34683136qvb.32.1687882130277; Tue, 27 Jun 2023 09:08:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882130; cv=none; d=google.com; s=arc-20160816; b=ZoRupONdb3aiHYv9FndUamZzotbrt7GEQynSXUBk8PtpJ5zWEpxkmJuYnzAKOPcmvo tcJKO06kv3v6cToJJr0wKmAZqmfYIj44egw4F6ewIdaWu3j/L431xEX7skR4QEqNpgfH OKDwuXk6A/V7LiVP9qFbYQMRFsS6xIFZofSPYKxRzP7ILu7OZe8WqinsyZro5EeeMnzT QlOzEeHz1Vf6I4aSi5WVw2xJpgxnAGb2vPMbIDf/V2A8q3MdlkgE14DU4Aj8BfkuooPN lSCIjyJ1vGXqbZS5Iu7Tbkf8IbT8tmhpoFslhMP3xRvLhCtnwfgBA2ZkM+cdY8W93oJg nmSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GnP8f96S0GKF3CO1A0jcmqKih6bOlzq38Er4YTCNWjo=; fh=UYmazdnd7dWeaUl9zzIqQyuUvQUcVQKeyrKAe+85WNA=; b=V9gKTMSP/Oy0uc+4N+dZH6qgw+bNSK4C7NNrbNmJ1CLlOZipe/nC8IaCLqA+hwrsUt ov9VURKPNV7Mnu4MpJBBRdDLhrcwP4s8CAdrRp3RTnJmYojNzaIm3VfmUNl0anUGaVWz 7VVyBelq0G25Jooov8clCPjZUehaR2HwrxYHNRXkMvf4z5K0BMTR+6Mw66M0bmMADwZe fikEuHqCX0/Yr1uDmzIBsWQCgQ5QGYcDW3C6jg98OjeOS8LpdOsgxQLjsxHRbpEusgi/ SqcIoJJ7HV/J2beKAQbsd8XYcsBiVgDVOSe3HvrNtmhujlRW6SRwNvTzfcaJLe8A74O1 njIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TL0E+q55; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id br35-20020a05620a462300b00761fffacf17si3440830qkb.534.2023.06.27.09.08.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:08:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TL0E+q55; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBE6-0000NA-Rd; Tue, 27 Jun 2023 12:07:34 -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 1qEBDl-0000C5-0m for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:13 -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 1qEBDe-00058m-TV for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:12 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3fbaa534dd4so4937165e9.1 for ; Tue, 27 Jun 2023 09:07:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882025; x=1690474025; 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=GnP8f96S0GKF3CO1A0jcmqKih6bOlzq38Er4YTCNWjo=; b=TL0E+q55wYUsZuGYCLCfc7mgnfjV0tH5Td/+n1VS6HjtjBln+9N8A1Cc6dqjihwWQ1 gb4U5AjmrV0k7JdyvVF80Zi7wSetPmx1fbu8wbd5oFXSX7TXD+m81hb/q7SIi1xZNLzR 6CPDxTg8cv/ITH1bbUqUAB/ph4nMHzkH/3YCKhvEW9J2tee4q/xs+p859V7s/EKgkGz9 0zIm/f12gkP4auBjFiX22krKLBUF2G8s7vdoprP77WFqzwcjD4Iyanjt5IoheatKGilN ZZI/vAgogCL2/VVHjtexWL+7Kwm6AsAfdd5asELEoW6XvzNqa5Cab2WHDYeNANh7wTGr KpsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882025; x=1690474025; 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=GnP8f96S0GKF3CO1A0jcmqKih6bOlzq38Er4YTCNWjo=; b=ZJdQbM1kvYgnGAKgtMzq+Rtr34NWtIQ5z0oolZ2srwHR0VdN4q5SPTH7kE6rlbaKFm Em6qbIhJ6tON0cDJR8ve8yBxiA32PPNoP5/M1UyNhf1IK2/wg5+1oZeVczcaEVwBNe0p j1kDi6z/2gegv3OPqtxF6f40IATrFVVViqyQTvFsxiXE1R0L1xUCfq5Opymf9Bna/bld lxxD6T3j3nugnzFgrCCBKSRz9aQPXBuiYhVbe6USgmFui9ON1sJF+DK0BTAKBHvEqn2H noT4OLU7SaQW+npgqHOmyvIE+tJZu7yqV14y7ENb37iogEM2NYar2U5ACIRp2RyqDJk2 0LfA== X-Gm-Message-State: AC+VfDzXAYF4eBH8SullDjZ/sG0X+NocxgqhGCatfNn70J5GCMpu/Oqn Ue0wucDKpoeH9MiSOEAcF4XKjw== X-Received: by 2002:a05:600c:22c6:b0:3f9:b244:c294 with SMTP id 6-20020a05600c22c600b003f9b244c294mr29213300wmg.35.1687882025130; Tue, 27 Jun 2023 09:07:05 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v1-20020adfe281000000b00311299df211sm10835337wri.77.2023.06.27.09.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:07:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 89C7D1FFC2; Tue, 27 Jun 2023 17:07:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PATCH v3 07/36] scripts/oss-fuzz: add a suppression for keymap Date: Tue, 27 Jun 2023 17:06:31 +0100 Message-Id: <20230627160700.2955547-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org When updating to the latest fedora the santizer found more leaks inside xkbmap: FAILED: pc-bios/keymaps/ar /builds/stsquad/qemu/build-oss-fuzz/qemu-keymap -f pc-bios/keymaps/ar -l ara ================================================================= ==3604==ERROR: LeakSanitizer: detected memory leaks Direct leak of 1424 byte(s) in 1 object(s) allocated from: #0 0x56316418ebec in __interceptor_calloc (/builds/stsquad/qemu/build-oss-fuzz/qemu-keymap+0x127bec) (BuildId: a2ad9da3190962acaa010fa8f44a9269f9081e1c) #1 0x7f60d4dc067e (/lib64/libxkbcommon.so.0+0x1c67e) (BuildId: b243a34e4e58e6a30b93771c256268b114d34b80) #2 0x7f60d4dc2137 in xkb_keymap_new_from_names (/lib64/libxkbcommon.so.0+0x1e137) (BuildId: b243a34e4e58e6a30b93771c256268b114d34b80) #3 0x5631641ca50f in main /builds/stsquad/qemu/build-oss-fuzz/../qemu-keymap.c:215:11 and many more. As we can't do anything about the library add a suppression to keep the CI going with what its meant to be doing. Message-Id: <20230623122100.1640995-9-alex.bennee@linaro.org> Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée --- scripts/oss-fuzz/lsan_suppressions.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/oss-fuzz/lsan_suppressions.txt b/scripts/oss-fuzz/lsan_suppressions.txt index 02ec0a6ed5..7d90c280d0 100644 --- a/scripts/oss-fuzz/lsan_suppressions.txt +++ b/scripts/oss-fuzz/lsan_suppressions.txt @@ -1,2 +1,5 @@ # The tcmalloc on Fedora37 confuses things leak:/lib64/libtcmalloc_minimal.so.4 + +# libxkbcommon also leaks in qemu-keymap +leak:/lib64/libxkbcommon.so.0 From patchwork Tue Jun 27 16:06:32 2023 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: 696864 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3865053wrm; Tue, 27 Jun 2023 09:12:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5xOPvGX0sTSywUYtS9dscu3WektMZELAYUFQNcjowXTL1u0JcUVQkiB6nSU4pF34FKN6T3 X-Received: by 2002:ac8:58d6:0:b0:3f5:1321:26f7 with SMTP id u22-20020ac858d6000000b003f5132126f7mr35872390qta.36.1687882333617; Tue, 27 Jun 2023 09:12:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882333; cv=none; d=google.com; s=arc-20160816; b=0yR7hSLjVOQ5BjSYexrg80jJm8+B+QIM5ijDFhbNPis5QRnxLWBJD/fonsFxdiSGCh my+CFs/hrgHFK6FCYMeqfU8dVD2lNHrut+b1RR2OnCmBZIOvwZXzYonPtAOAfXQMFcQk OWti6+H0EnGSAlUKVqv0hVuS4DRXZm1BpHxh2hiwic8MLmg+plr6nZ30vzhOgqYTp1kx 6V39hZ/A7nzDOgjEnAx2wBfGIpopCSwp4gnx7BXiOu27nqDgs2DvWGMN+Jk6IenKzSgz u8lka6YHonFrLuE1UCHAUGhTQ/ih5jNPFRL6ym4dl3GVd+rUrEdp8AkHBh2cc4eZA0wZ YgpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=o65EU6QKm/ZKlwjUjomTQSbG60nANx/Rf8AOn4I397k=; fh=UYmazdnd7dWeaUl9zzIqQyuUvQUcVQKeyrKAe+85WNA=; b=oZ0EBV8lRTlXq1QFUXbSgtGkOeuMY6s8P/J6ogxtArngISjtQg1yRDtxI+Q2oxLpGA gVIt8kWr/4VQGOQ+zdne+aiB0VAECUO135MvTGGIfBtliv228ZPhoAmm0i/39kt5MQW5 WSZ+RWCcSfJXraw3GYyJQdxecPF/dGmbKnzr6Is5aqGVKFHjI1SbWGHkvO2N9ZFk3lSE t0G/rhTq4sw98MtIXHP0PhcM3y2Z0XDLyGaT9hxO6fIVvnyYhGrAdkuRhtj4lBb50tZj B7KLOi7JTUjnRrWi4wX2q8Nb8TyzJrAWJcnVgEHqSUoLV70pDK6S3IIZzxIQicgXYcOM 9kmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CbHtyoZ7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o3-20020ac87c43000000b003f6c46a79c5si3271183qtv.454.2023.06.27.09.12.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:12:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CbHtyoZ7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBE5-0000Lt-EX; Tue, 27 Jun 2023 12:07:33 -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 1qEBDk-0000Bx-Tp for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:12 -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 1qEBDe-00058Z-OI for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:12 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3fba8e2a9ecso6761415e9.3 for ; Tue, 27 Jun 2023 09:07:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882025; x=1690474025; 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=o65EU6QKm/ZKlwjUjomTQSbG60nANx/Rf8AOn4I397k=; b=CbHtyoZ7l3CHg14wHQLLaJZkrslTC02xBDp/hppUHY8ORu4Gja0LUY7GpaSsrL0hAn 29JQ0SOPm84Vfrw93rkQ1aj7JBYMf9zAOFYg08LPgHdwR8NzsDTVXXiJlR1YXIuwlVvd b8zUZipq6wP7T9/iSAkbOUe3oc/raZ9SZ9xnDcw/w75oDb0m+NpF4mC/+uRpn5aXHduO rt9i1tbMP7sdAA0tf/UZvEsoL0w2/CjkgAoaxfVPAT067p9tWPVt2UvumBM6/0CYpvlw ux6U9yaQA6uQxbZZevMSuMcBddtH5vC/S2r24xhfrPi0Rm+p1PMk8KYuxhrZfQpE7p5N kWFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882025; x=1690474025; 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=o65EU6QKm/ZKlwjUjomTQSbG60nANx/Rf8AOn4I397k=; b=jFTBMYplCjpUe978U/SNtaoQahMuIgOR+7GqqoB6IYAzxdivd9EMxbFf5DitYcLleg iOX56jivxzmGPL1S5snlfy/JLgYEC7HcRNK0tOQE8Dc6jsXNK/keIXWYvC6s2A63T4aQ 5SqQcKCk/AXH2cUuNbhCENH3hTaaTrPkzTBEvShw86rgyiCLUcEY9F8dlCfNEgnlCmGi K8PjA99mnkaVjKBG0him0MuSiTADi3zPgDCCCNsbNW/r9T/3Buoelp45jf6PojJOlWoN bVl5+GGFjANc17khziS8esksUW4lO5OtA++WLG/d55Zg3JLVc5B1p6xlEcNj6VXNmmFf rReg== X-Gm-Message-State: AC+VfDwPvvVSyqL9d7ab0Y9q2cJGszzwI14p7juQP8jPDREfSlTt3dWQ MCiDwfuNtYHVkhR0Zn1yBH+2KQ== X-Received: by 2002:a7b:c414:0:b0:3fa:7cb1:ff7a with SMTP id k20-20020a7bc414000000b003fa7cb1ff7amr9887231wmi.13.1687882024928; Tue, 27 Jun 2023 09:07:04 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a10-20020a05600c224a00b003faef96ee78sm5045149wmm.33.2023.06.27.09.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:07:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A265F1FFC3; Tue, 27 Jun 2023 17:07:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PATCH v3 08/36] tests/qtests: clean-up and fix leak in generic_fuzz Date: Tue, 27 Jun 2023 17:06:32 +0100 Message-Id: <20230627160700.2955547-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org An update to the clang tooling detects more issues with the code including a memory leak from the g_string_new() allocation. Clean up the code to avoid the allocation and use ARRAY_SIZE while we are at it. Signed-off-by: Alex Bennée --- tests/qtest/fuzz/generic_fuzz.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c index c525d22951..d0a59f7475 100644 --- a/tests/qtest/fuzz/generic_fuzz.c +++ b/tests/qtest/fuzz/generic_fuzz.c @@ -954,17 +954,10 @@ static void register_generic_fuzz_targets(void) .crossover = generic_fuzz_crossover }); - GString *name; - const generic_fuzz_config *config; - - for (int i = 0; - i < sizeof(predefined_configs) / sizeof(generic_fuzz_config); - i++) { + for (int i = 0; i < ARRAY_SIZE(predefined_configs); i++) { config = predefined_configs + i; - name = g_string_new("generic-fuzz"); - g_string_append_printf(name, "-%s", config->name); fuzz_add_target(&(FuzzTarget){ - .name = name->str, + .name = g_strconcat("generic-fuzz-", config->name, NULL), .description = "Predefined generic-fuzz config.", .get_init_cmdline = generic_fuzz_predefined_config_cmdline, .pre_fuzz = generic_pre_fuzz, From patchwork Tue Jun 27 16:06:33 2023 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: 696850 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3863554wrm; Tue, 27 Jun 2023 09:09:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6SjpiwsqdeXQhqoooqeng92BN0Kh+JFsV/Ala1qITHnNZtOGY/vbtK35oETx/LRt8woztS X-Received: by 2002:a05:620a:4546:b0:765:53b1:f0bd with SMTP id u6-20020a05620a454600b0076553b1f0bdmr17353079qkp.46.1687882182519; Tue, 27 Jun 2023 09:09:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882182; cv=none; d=google.com; s=arc-20160816; b=eDKfy8gFYEYTvQByKBgHvKLQYhVSfG5JIEwjqqQkoggkMzbI1/h/UXriqj3ZYuYw4o lWjCR1JWv0Ryn33h6C7dksqSnR9fGc7saO/U7eFE2yDmg0xupQzjmrmzKRP5iBEmQXrB P7yt7F4AegJMTpTwavhXUYbIZ8BtZouzdFLNS8JGa6AVNI0WB9BI3AdrpUjSh7MDwCyI SkD4ZMpmpyID+lYiXqhAeAVuBovPRRh1sAOrn6oJWaIzZE+7yH8l7JF41uCnoitrrZOS GaYlTqFw2qLgRoJNMiClKd98s9PXJa/EvPKpNLmu/lVZvIe+vbMdcr7TE3pL8NPRGn81 IWbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OoH/DOZFZDe6ZD+LHfFvG2TjLm3SJ3G2i0MfunKyFLs=; fh=UYmazdnd7dWeaUl9zzIqQyuUvQUcVQKeyrKAe+85WNA=; b=QEzzZmXH4Li9JWpWiTbd9gRsg6ovWDSCpLZRaraxRBFkHUI1+q2FxcS1/pu8igkpeU J+t/zztiu4IX2zwcCAZpU+28CVEIC2pXBcwv8JVQ/oPK2sc4DIVNoeunuxp4199WKZrM bwFOEf0Mw0DcpNh0uV3B6Pi/X4bmZkgTa4Mt9hSOgIpK2muiT9qWJr3mPbqbFfoRErPl cD3OKMjeStjMjwJI6zFkMbzHe2UNUpcHNS+YVxVGXsNPFtIn1poVy3Mndls1HhbR4Vmc 1yKP4hn6yTzkNR6sIa0sZbY83xwkbIxkE0lKsMJOHOsetphOXwZzWAjK0/WzPpy4J+Am iS0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HAXvgYVQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r21-20020a05620a299500b007628f6e084bsi2086829qkp.404.2023.06.27.09.09.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:09:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HAXvgYVQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBDn-0000FU-6p; Tue, 27 Jun 2023 12:07:15 -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 1qEBDi-0000AP-4j for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:10 -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 1qEBDd-00057t-Qc for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:09 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-31297125334so12624f8f.0 for ; Tue, 27 Jun 2023 09:07:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882024; x=1690474024; 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=OoH/DOZFZDe6ZD+LHfFvG2TjLm3SJ3G2i0MfunKyFLs=; b=HAXvgYVQj2aKDGxr/IBoeMC/673IqY3UyaMYpy1khbhfutpblQDEXBXTT4NiIIujFh z6ni3z7fPvio4+65wfSn2GpY/YovvOJ1VfmyKKyNfwL8/W/Uwcbxr2/iDuW1vy+vLYJZ CL0ZtNLsaogPzhEe+70qbgrrWSv08GeGefu5kmWa7VsQc6CNWShZb/E6IgeY9BwiN3Dv IHzbWdRciWoqV4uiSmypf622q4OHybxzw4mfK6louRtiAacJ4Mnm7s1SQq5i+om2kSl5 qELZE1EB3uLoc2ENG6rqEep4zcgAhHvrnBkeYIsr8eiMCc2vTuojT1yFBUDlxLMsxqWt 89cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882024; x=1690474024; 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=OoH/DOZFZDe6ZD+LHfFvG2TjLm3SJ3G2i0MfunKyFLs=; b=gE9G7c/Hb0VAGHGW8BKTyVZrcAF9CImJAv9tIClRzg7RIQbKSaFM3/iV6xNN8lRMCC 1VQVUx8CvLYISqx4tpfMv2caGSyUGuhoMz5s6BN7gbiXgrpDI09NMtF+scpStPAHPPk4 JQVDctdb+zX+nqm/yvJ7MAPe1AXng5QDH5m6TtIOEC/rc7jdkGsxijRTGAbO/clv3/sY P6OBx6kHToeHT6WOKmzCUGk4W9WtJMkCSW52T22NhQwH20s6BOiGvoQZXa+yj1PRqEFV iV+VFE7Gu/s2+RMmXJ6yzkYhRllWqNeWcBXOsaGGLL5WAuO8xwdd9JLme4aGGYwUnhF8 Y3og== X-Gm-Message-State: AC+VfDxWqk9sjztICuyiz10vW1mrgYqMTwabgNrKrIKfxRmslt/O+wFq qQrhDGOls/AVFo+8bcWhrjG20g== X-Received: by 2002:adf:edd1:0:b0:311:3ce9:c9fa with SMTP id v17-20020adfedd1000000b003113ce9c9famr24936345wro.3.1687882024100; Tue, 27 Jun 2023 09:07:04 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id t12-20020a7bc3cc000000b003f604793989sm13855945wmj.18.2023.06.27.09.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:07:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BD5531FFBB; Tue, 27 Jun 2023 17:07:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PATCH v3 09/36] tests/docker: add test-fuzz Date: Tue, 27 Jun 2023 17:06:33 +0100 Message-Id: <20230627160700.2955547-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Running the fuzzer requires some hoop jumping and some problems only show up in containers. This basically replicates the build-oss-fuzz job from our CI so we can run in the same containers we use in CI. Message-Id: <20230626215926.2522656-10-alex.bennee@linaro.org> Reviewed-by: Alexander Bulekov Signed-off-by: Alex Bennée --- v3 - checkpatch cleanups --- MAINTAINERS | 1 + tests/docker/test-fuzz | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100755 tests/docker/test-fuzz diff --git a/MAINTAINERS b/MAINTAINERS index e07746ac7d..3cfc389db0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3106,6 +3106,7 @@ R: Qiuhao Li S: Maintained F: tests/qtest/fuzz/ F: tests/qtest/fuzz-*test.c +F: tests/docker/test-fuzz F: scripts/oss-fuzz/ F: hw/mem/sparse-mem.c F: docs/devel/fuzzing.rst diff --git a/tests/docker/test-fuzz b/tests/docker/test-fuzz new file mode 100755 index 0000000000..7e506ae1f6 --- /dev/null +++ b/tests/docker/test-fuzz @@ -0,0 +1,28 @@ +#!/bin/bash -e +# +# Compile and check with oss-fuzz. +# +# Copyright (c) 2023 Linaro Ltd. +# +# Authors: +# Alex Bennée +# +# SPDX-License-Identifier: GPL-2.0-or-later + +. common.rc + +requires_binary clang + +# the build script runs out of $src so we need to copy across +cd "$BUILD_DIR" +cp -a $QEMU_SRC . +cd src +mkdir build-oss-fuzz +export LSAN_OPTIONS=suppressions=scripts/oss-fuzz/lsan_suppressions.txt +env CC="clang" CXX="clang++" CFLAGS="-fsanitize=address" ./scripts/oss-fuzz/build.sh +export ASAN_OPTIONS="fast_unwind_on_malloc=0" +for fuzzer in $(find ./build-oss-fuzz/DEST_DIR/ -executable -type f | grep -v slirp); do + grep "LLVMFuzzerTestOneInput" ${fuzzer} > /dev/null 2>&1 || continue ; + echo Testing ${fuzzer} ... ; + "${fuzzer}" -runs=1 -seed=1 || exit 1 ; +done From patchwork Tue Jun 27 16:06:34 2023 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: 696852 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3863821wrm; Tue, 27 Jun 2023 09:10:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7CfJ/7/WV/AEqBF5DgogiAlBlPPV8yC3+hALK/0JoezH2cFhzurtDvYuW4iYbyjb/lAJ93 X-Received: by 2002:a05:620a:191c:b0:765:3c4a:6237 with SMTP id bj28-20020a05620a191c00b007653c4a6237mr14709144qkb.16.1687882203104; Tue, 27 Jun 2023 09:10:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882203; cv=none; d=google.com; s=arc-20160816; b=lR3E+CwrRDBMz+/pokdGLf3kJUSazrwRjdk7YlrpdlqEo7KeydyZgrM0ptzM7QcsSF OQmmz5gUcccYqs02p0kJJi3Qs/PsFn2+ELwH+Ma+musY0CqMBZ0K6rL8zLrjY8MoeDMt 0SdCR/wu1zoKyrLqIyFQ2gopE7/3ztaZsHx06T6mK9y8i3L83B0WzLkL/tdvMtlMgiPb 65Dv49ju4iZdXOGxuGPf8Bb3k6VTXxP28V7OfPeceVh5XbrH3rKuBMroFY/F0bzKfGkf nTHmEdo2YwVB4CZdVeIZ9ra1mCs2319Jutm22ck4LbIk0F9klB5mOPlh099BvRd0Nw3D wrWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=cf5ti9xDtG3D2s3Jcs/OJus8Ga0lob29HRcRChdiZSs=; fh=UYmazdnd7dWeaUl9zzIqQyuUvQUcVQKeyrKAe+85WNA=; b=TCoWcRUAePMsNGJJlY5RKtrq4kqPy2r/ZizgmQVF/5pVj8nszcJpkecVruhHbQr40N 6SbuRgj0oQXGI1v4D60wuYFanweNRCJyJdqttRaqQ8X9w85Hze7MRd8lRgGCe7Ny6Kyz Eh9IJTg+GEFKZYdkPYUBeGmiZp5AjgNsWG77Jr6vTrXZwgFeeLGztuS4UecF1uMAH3x8 SDgb6CfKfwHF5SUOYSugSb6cuBp/q6TM2f8u816e1Cry6TI3CtNlZABmPPN2KkcCVnTx U9U7/NkLE279pS3pBpfWSRQd5NrcYro0XikBhqKp/ag3NxG7f+qlxP+tPGxSCPSsS/xE Q2Wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z4hB2YpI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id tn8-20020a05620a3c0800b007655a4d2ab0si1739904qkn.85.2023.06.27.09.10.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:10:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z4hB2YpI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBDp-0000HU-01; Tue, 27 Jun 2023 12:07: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 1qEBDl-0000C4-0s for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:13 -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 1qEBDe-00058P-F7 for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:11 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-313f58d6652so2161065f8f.2 for ; Tue, 27 Jun 2023 09:07:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882024; x=1690474024; 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=cf5ti9xDtG3D2s3Jcs/OJus8Ga0lob29HRcRChdiZSs=; b=Z4hB2YpIukhxvgKaUhkpQm8Pr4d70+dTWAqOHNF1IY2yCSYxFUGEO+XwBIA3D70827 Hej9VFYP2g7/GJaNRuG2DdOaqXk5DbRnNBrTiNfWHis02V66KC3cWRJf9jUQ9FMQhqTF gyA8+dyLe9eKzwJYzMT1ECTW1v88sninlMbEzt+nr46MnAsd/JvisHkjo5xb43StJm/T cM9NZzmiydzWiwKfRCZKCLHRpepdf9dHBThojtWMVoRvtZ7g7JkDlJestUAfcFEls0F/ 3hi1vMKnDIX8ePS6g7+cilWxdbj7hCc6dctZ7wAvrCBOIS01WDv9umfNIqdF9BeEe27E Q2Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882024; x=1690474024; 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=cf5ti9xDtG3D2s3Jcs/OJus8Ga0lob29HRcRChdiZSs=; b=HPehzzh8FUGYGAABV9kcouWU4HmGpdGxBiVhMb/MXakR1vlplpAqj51S7Mp3BWBF3t tWuzqNJLU+0sE7YcEHiEOvBTdEe06CgaXqv4oGQp0DiXIwmEu7WwgVWVNkPqrwOc4ofH bJrPY1BnPOJUFObkWB6bjWVteLPu4xLR7ge6vA+SONlgL83P04OTLZ84zxG/VEJEVprL BPrgc9a/9EETJhB/8fEeRyn72oATZkXpPKynxpUePButVfXEGlc0IUHJLh/LMLizfeRl MbMFkxTWQjcRX4oi4+IPyUq3wjyTENgpFyD5icNlrk4Q5srwCVPLPwRtQzvxcTGXIFgm CjkQ== X-Gm-Message-State: AC+VfDzWpk23eURHO5pyd58CmYJkEXAkf+07S0bJhbLV9+vr0GWZSVBY mspO7QuLR8PjyNaz/rL7R+vAgg== X-Received: by 2002:a05:6000:c5:b0:314:12c:4322 with SMTP id q5-20020a05600000c500b00314012c4322mr1472102wrx.4.1687882024778; Tue, 27 Jun 2023 09:07:04 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id da16-20020a056000197000b0031274a184d5sm10900882wrb.109.2023.06.27.09.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:07:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D74361FFC4; Tue, 27 Jun 2023 17:07:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PATCH v3 10/36] Makefile: add lcitool-refresh to UNCHECKED_GOALS Date: Tue, 27 Jun 2023 17:06:34 +0100 Message-Id: <20230627160700.2955547-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This is yet another make target you usually run in the top level of the source directory. Message-Id: <20230623122100.1640995-12-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 804a5681e0..5d48dfac18 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ quiet-command = $(quiet-@)$(call quiet-command-run,$1,$2,$3) UNCHECKED_GOALS := TAGS gtags cscope ctags dist \ help check-help print-% \ - docker docker-% vm-help vm-test vm-build-% + docker docker-% lcitool-refresh vm-help vm-test vm-build-% all: .PHONY: all clean distclean recurse-all dist msi FORCE From patchwork Tue Jun 27 16:06:35 2023 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: 696844 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3862704wrm; Tue, 27 Jun 2023 09:08:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4APjtmd+ovnpMZ6bitNqt93+bHZOMLVKWniFfT4QCsnmVShXndnmt8HevisKiL+GDEAtb7 X-Received: by 2002:a05:6214:ccb:b0:62d:f601:38b9 with SMTP id 11-20020a0562140ccb00b0062df60138b9mr37495535qvx.11.1687882117032; Tue, 27 Jun 2023 09:08:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882117; cv=none; d=google.com; s=arc-20160816; b=sacU0snMeWnzuwklceI4SRshuoD61x7aehMm6DX81h1Y+bKNOU8lkddlAyPe4iMV7U NQf3XjFNQTb0BdJczgShK9trYtCG26KiM14K2mJ3jiBqBovcaW93zrqU6LkHkGF7h9bu 2xiC45dOGWguYU+EbRrSChSrmdIQABTAhv0DkFLvJCJmSMiOfc3AWvEMxJTJYpy58UZZ MsJlXL+F8ESMGcG2j9WeFN/H0An5Gvi2SPtDtfPtL7M6UCuRu438M8ZL4TouIOO49pe7 CC7Wsacmn8uoMuTrPC72c+mWJyotR3ZhjzgFdznhz6ucGKjZqCE6JG1cc8M6J1UNGcla gYdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tOV9EOnx/XHsK7XQyMJxy5drdvS9UgZO7Cmh6YX5vFY=; fh=UYmazdnd7dWeaUl9zzIqQyuUvQUcVQKeyrKAe+85WNA=; b=NCg8lZV+6M+guTPbZmjqlZxcPMEhmWFVBJuffcNIv3UgWFIWG/2iElKT2C03Cg3C+m FLE/cT88FmWRD6RBPmYWA43C7bDP9TRiCAihaxe1but4W2mcfhQDLtLXA39pvsNSofAR /IE2KPuiL99Mqz2UN8VwHGKkqOJxRUpFdsJ+oUyaQZtDO8s7r0dQWMSy7Q2p+X/Fiqww gvqHkHdlJQfDh4OJPczZJoVvBbvqab6bL30i/u0XZXzgSjNqkHIM6NYNM2IW09+y/4S8 3W2gqPsmt5HoJexFDZzvITANsBKBB6uQEie0CX7bZAd2JaKbunfcRMQ0e3Iot1WRHN3B Bwhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="m2UGK/LP"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ey1-20020a0562140b6100b0062fe5397100si3386075qvb.144.2023.06.27.09.08.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:08:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="m2UGK/LP"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBDo-0000HI-Li; Tue, 27 Jun 2023 12:07: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 1qEBDm-0000F3-4B for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:14 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qEBDf-00059V-TT for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:13 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3fb4146e8ceso18785635e9.0 for ; Tue, 27 Jun 2023 09:07:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882026; x=1690474026; 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=tOV9EOnx/XHsK7XQyMJxy5drdvS9UgZO7Cmh6YX5vFY=; b=m2UGK/LPjBVqZRqDoiLh/23KpnLshfWe0xR30ISl3pnrdG1HCeVgRdBmKFyeewWL3y 5IRZHCXLJVad3Kj3GpO27m87K2f6CKBIZRA2uPW9MxA+Ypu5GEmxkL2cU1dtYUdanofV yP5e4qFeEHHvbKrICBoHo82rjaINN3AZEf6s4YrT3HQMXcHDOfzqGlsO9ScncM7cDbSn A3A8p2CZUkcEYF0fdL1+zPuVbqRGVMa/wbUkAJ2bkcIF+Hk4XiQAnYB6fBLAV7qMe6Wl gdBHv67UTV0I3tNyTUIQzwwBBxQEQ1dffyJVCFnCaMSIeRACWj1keJ/weMIiiouZ9nDe /q0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882026; x=1690474026; 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=tOV9EOnx/XHsK7XQyMJxy5drdvS9UgZO7Cmh6YX5vFY=; b=iEp7c/dCZjXKI3uh8AdjNZSVsV3rmp40zHap8J8I7h3HWH3/3OivwQQGddZ1PAVrnT n8x5+cQJYXLVfwAjOTPTm/2ue0AxsKHr/oGQIRrGsWPWKQbnSopk/oNuZYnFi1UOOF9A AmV5OMVbwnXX3nJODjQwj0Gzp2uLyPp2jsBnhrrEAOQt85M3BZMQWRIYo/hKiJX6OuWT vR4hA2Zld/JVon4QtKQnNumzeKe7WRRNfjSAdTNE6NuaNWWf5NJtWFYaLvxZcRtK+u6e h+YTJAqWAnU+r4e67+th6V9qsUn1JaRdvh+z6PpAO334zMPmJIpVPbgIRcojwPSbJlN8 62cQ== X-Gm-Message-State: AC+VfDxoCRvgJqVosJdooY64InGNrL5FPcB8fsUKE6hE7mpXoyawYccc DGW9w1CRxJfk+CaeQMEvfleX6w== X-Received: by 2002:adf:dc88:0:b0:313:ee3e:50c5 with SMTP id r8-20020adfdc88000000b00313ee3e50c5mr6467081wrj.20.1687882026330; Tue, 27 Jun 2023 09:07:06 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a25-20020a5d4579000000b003048477729asm10824061wrc.81.2023.06.27.09.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:07:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 009E91FFBC; Tue, 27 Jun 2023 17:07:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PATCH v3 11/36] tests/lcitool: update to latest version Date: Tue, 27 Jun 2023 17:06:35 +0100 Message-Id: <20230627160700.2955547-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We need this for the riscv64 and gcc-native mappings. As the older alpine release has been dropped from the mappings we also need to bump the version of alpine we use. Message-Id: <20230623122100.1640995-13-alex.bennee@linaro.org> Acked-by: Richard Henderson Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/alpine.docker | 4 ++-- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 0097637dca..43370f7b36 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all alpine-316 qemu +# $ lcitool dockerfile --layers all alpine-318 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/alpine:3.16 +FROM docker.io/library/alpine:3.18 RUN apk update && \ apk upgrade && \ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index c8971e90ac..b0f44f929a 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit c8971e90ac169ee2b539c747f74d96c876debdf9 +Subproject commit b0f44f929a81c0a604fb7fbf8afc34d37ab0eae9 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index f1570b54df..5d36a62b10 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -115,7 +115,7 @@ try: # # Standard native builds # - generate_dockerfile("alpine", "alpine-316") + generate_dockerfile("alpine", "alpine-318") generate_dockerfile("centos8", "centos-stream-8") generate_dockerfile("debian-amd64", "debian-11", trailer="".join(debian11_extras)) From patchwork Tue Jun 27 16:06:36 2023 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: 696854 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3863957wrm; Tue, 27 Jun 2023 09:10:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ujM8AdM/FZsTz6wlKxe9wEMkRM3Xj23TG9i7nCyWtnzGITrrIkqI2TWgEKyCBIwWXgsEF X-Received: by 2002:ad4:5fcb:0:b0:615:29ab:e4a8 with SMTP id jq11-20020ad45fcb000000b0061529abe4a8mr44047606qvb.31.1687882215830; Tue, 27 Jun 2023 09:10:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882215; cv=none; d=google.com; s=arc-20160816; b=vWXRg3EjLCkl4YisPHSyRm9mfW2THdfXXS1aHp+VmgQ2atbY8BU7qIKjP+A2K7iMyP msbqCkCc5zmzqytT2aye27IyvIykzEgnjBjNsBgmJu0/EewBh/uTX+c8ZX8+iv9i2cxS 9OxuK7d5L/nZXEAows7EYjDEC+jOkmptGVEHnqtBtdMXaVbDTjFLH6+BUcdCJECigwQx Is50HmTOR7TBWMFZA1wURF+45/TvEPfltOoLP5IAaEfRCgUvcPMFkm5sUTjAprJiVsMN syNmlIRUJsC0iJXUkq8HaEZw6ypfVhbu45660yV1jdIofgPsVnUvoDzHUF2ZgZZHoDzr 2ctw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DudiICXjsv3m9urKUi2tH2RtAEiqXNFzr67H4vIREuA=; fh=+NRNdcgcJjnn+9uAYbGJsnG01ukdQCacmyOOSMkVOG4=; b=EMtdcMPAiG7wJhuQMQ0pRkMNWzDgv2nzvw5Arb4E6QICtRYT1XIABPN/7579hv3tAO 2t2F+zC92mATWMTHsDEiYNXdnhsAfOkJ07PThEuLJh2HDeh+ClvLNRDr5sbv0PUXbGWg qPcHZ9o0AZyccgrHWv73XQYsoQDZsuc9bgpEosQwVsvxb5M6mNRglTmLhPK93TCICy20 ESZ45BsEk5D329EaCqUqCKND5grb8JasVOs3kf20KI8/XEz/NIg+ivpYRJ4xtBEkcW52 a3pLXD6gSOMZutuY3uKPNSc8MKswKKZWB1ViuxNOJR/3/sLKvLwwajoTDd03WnzRr14s xfiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zj9BiacG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 8-20020a0562140d4800b006261a39302fsi1833907qvr.357.2023.06.27.09.10.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:10:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zj9BiacG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBE2-0000K7-EP; Tue, 27 Jun 2023 12:07:30 -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 1qEBDl-0000CJ-3z for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:13 -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 1qEBDf-00059J-D8 for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:12 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-313f58d6652so2161098f8f.2 for ; Tue, 27 Jun 2023 09:07:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882026; x=1690474026; 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=DudiICXjsv3m9urKUi2tH2RtAEiqXNFzr67H4vIREuA=; b=Zj9BiacGSsQbUoy+1hmbtgTv9C6XKYE4VM6iM4uWgXdyGb3nB2cvVe5Z3NxMJeYu0O j8ub5SRHTZDJG8b++4ah6Y7fM0ytkEt5INo2qDMyyG4RapGRQWFHba3s6ngZjerAKTQl 6kIn+CXII+FjuwsD7w6GkQdUvBNMPA0WHqGm1KQhVrrnhI57QW1XoFkONfFWUHC9/fw8 T5MFChQM2hRnY1e+oMeggVi8VHCAAPue6eODYN3fvz02tSDURf+bB36mDRJl9W/fd6F+ qtEbHvV7mFFHLIvpY4cNhCuySVhkXPDbeyc6/gYufotX0Jn3tywrLRJLtzoMYFn+X+vp G+wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882026; x=1690474026; 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=DudiICXjsv3m9urKUi2tH2RtAEiqXNFzr67H4vIREuA=; b=BEkXXteTCvvdosvbtUBQV1NQADBBnwKbUbvtpn+rRMjEA9/Mf1NYJt5j1Xv2UI6PDL 42XEgxpSy9Nx9nAsrlG5teYR4Z+Pkh377wrnemU+iWJJ4c8BUZ/OCt6/1ROMbiXGTr0o zN5pLD53TtYkGTyTOMh8FWjGxZGHCIQ2nsIbpQotIPeQ1q3AWg8tjO4GelMp/PD5QXyH DxsxYbWQNkmTx3Trqko3mogqPgQp8DxMgbk317rD8q2KRWH0eIRB7Wp408IoNDlX2Dnr uqlA5FWLOol4bpFUit9EZRpk/oSwNddiDaxVlCwOhnLudOhIvLjwCUkbGoggOujJPA6h bJ4w== X-Gm-Message-State: AC+VfDxt1GU/aCdoNb1X2WLw/C5Rb2WwahW8ZTFkZRzfu6En9Uv/B7U6 /rssvt/dvJo8aJVhZOyc9ff8Kwo4GHXcfyISFrQ= X-Received: by 2002:a05:6000:1202:b0:313:eadf:b82d with SMTP id e2-20020a056000120200b00313eadfb82dmr6383791wrx.69.1687882026087; Tue, 27 Jun 2023 09:07:06 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 21-20020a05600c22d500b003f9cb3c8958sm14296534wmg.3.2023.06.27.09.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:07:03 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 20F731FFC5; Tue, 27 Jun 2023 17:07:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov , Erik Skultety Subject: [PATCH v3 12/36] tests/lcitool: Bump fedora container versions Date: Tue, 27 Jun 2023 17:06:36 +0100 Message-Id: <20230627160700.2955547-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Erik Skultety Fedora 37 -> 38 Signed-off-by: Erik Skultety Acked-by: Richard Henderson Message-Id: <20230623122100.1640995-14-alex.bennee@linaro.org> Message-Id: [AJB: Dropped alpine (in prev commit), reflow commit msg] Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/fedora-win32-cross.docker | 4 ++-- tests/docker/dockerfiles/fedora-win64-cross.docker | 4 ++-- tests/docker/dockerfiles/fedora.docker | 4 ++-- tests/lcitool/refresh | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index dc72ae9cc9..a0a3cd9e5b 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross mingw32 fedora-37 qemu +# $ lcitool dockerfile --layers all --cross mingw32 fedora-38 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:37 +FROM registry.fedoraproject.org/fedora:38 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 7eb4a5dba2..b6c1a6a339 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross mingw64 fedora-37 qemu +# $ lcitool dockerfile --layers all --cross mingw64 fedora-38 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:37 +FROM registry.fedoraproject.org/fedora:38 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 3a69eefdda..8a35a17617 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all fedora-37 qemu +# $ lcitool dockerfile --layers all fedora-38 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:37 +FROM registry.fedoraproject.org/fedora:38 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 5d36a62b10..5e06fb2cf5 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -119,7 +119,7 @@ try: generate_dockerfile("centos8", "centos-stream-8") generate_dockerfile("debian-amd64", "debian-11", trailer="".join(debian11_extras)) - generate_dockerfile("fedora", "fedora-37") + generate_dockerfile("fedora", "fedora-38") generate_dockerfile("opensuse-leap", "opensuse-leap-15") generate_dockerfile("ubuntu2004", "ubuntu-2004") generate_dockerfile("ubuntu2204", "ubuntu-2204") @@ -169,12 +169,12 @@ try: trailer=cross_build("s390x-linux-gnu-", "s390x-softmmu,s390x-linux-user")) - generate_dockerfile("fedora-win32-cross", "fedora-37", + generate_dockerfile("fedora-win32-cross", "fedora-38", cross="mingw32", trailer=cross_build("i686-w64-mingw32-", "i386-softmmu")) - generate_dockerfile("fedora-win64-cross", "fedora-37", + generate_dockerfile("fedora-win64-cross", "fedora-38", cross="mingw64", trailer=cross_build("x86_64-w64-mingw32-", "x86_64-softmmu")) From patchwork Tue Jun 27 16:06:37 2023 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: 696855 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3863946wrm; Tue, 27 Jun 2023 09:10:15 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4GCucoLIfln/hxuGLzTXD0Rpn2Dy9RQ/2QBk2GM5mYadmLcLyQv/ch4OY+/sIOFvJHYkOd X-Received: by 2002:ac8:5a0a:0:b0:402:a9b2:b4fa with SMTP id n10-20020ac85a0a000000b00402a9b2b4famr1953159qta.15.1687882214765; Tue, 27 Jun 2023 09:10:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882214; cv=none; d=google.com; s=arc-20160816; b=N+DkQXP73KKFLPLFqfW9+0ZHXNvTODWDTh29wUpOjFonWrDuzvtCfzekKUGzDTe0cr DHLWdgov1TX4NC8Zp/k8BbvomSa+fMTXDkFiAWmqKf5Yuy0Z+yrs52F4/DNJeHYzK4dg nFRZgZHWtbHFJL5lBvb8h5FIesyjj171UMm1PuoruVFiQZUMHpaTfK4ou3/eXV/q1gij bExHP87iAajlzqgkOrL8M+LTJSbFRiF4xVhT4+tVbAv1/12jVRmcr7Q3B8W7zakt/juI UTSsbMGuY/8mrZRnAMOuKRlfnJdG1arx/z8m/eSQ9MF3UbSNLON58+7OLoalf0yX2SML Nviw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YjcBvoRPGdwmtkpSOh5Jr/t8a2L1GvJT/Iq1phAB7S4=; fh=UYmazdnd7dWeaUl9zzIqQyuUvQUcVQKeyrKAe+85WNA=; b=vIa+q6z8TWvFuCx6xpwc/3SIIvsErqjgrnUzZyFEMRZzZPinbqmFwEXfNEgnoVPekd KcK5Lppsg+vkQEe3levnI6eC1v0oDfWlo/7ddEPLQjnsustzj3DJQ2BgbNfLmlLtoOrd UbpDi7cEeDld93nLCZbKYs0moPjeQXG6NdWoKNVuZ8G2yZ28GJHQChNxABploO5aMrew eM0h8nlTRFuYKsxaAG9Hhtet/ax0mIPNe/k/eKs2XV7PXxqPF3njL+7n4WMqazHYiOr3 1g+KPvioY7E0wntqhCosq3/JgIEk88Md3is0kO4id+xirDkndzbJgQG79Y32hJlozqcP Zbpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R4yzFstX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d16-20020a05622a05d000b003f6b22bfe94si3206380qtb.461.2023.06.27.09.10.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:10:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R4yzFstX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBE8-0000NK-DN; Tue, 27 Jun 2023 12:07:36 -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 1qEBDn-0000Fs-ID for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:15 -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 1qEBDg-0005AE-Rm for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:15 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3fa8cd4a113so26608815e9.2 for ; Tue, 27 Jun 2023 09:07:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882027; x=1690474027; 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=YjcBvoRPGdwmtkpSOh5Jr/t8a2L1GvJT/Iq1phAB7S4=; b=R4yzFstXFP2qmOw2IASL+GLLpvP6Dguw1mpjCJoRCbtDIeMXO+vp2LC9PEUp57mkIS qxdV4Q0a55Ac+pfD3KXkETXdqo2x/Peu2jA1Mt1a+SHy2v4akmqhxHuzjsE8Kagx6gL+ O7hTI8l/e2xLY4Q0NkOqCFbCLFchRO940+RS0fumlYW4NG/Iclk8cGoRgcjDw/c8OQO2 7KNeFQ4VpiQv/UoMbhctz+BWOKTGxuZrAqY7pmeE6i1AGmRxHKJy9QXXzYINiclWwmBT JKYU2hPMvKC99YH+ce+iwGnJrWA4MjXVeZllWDbTL4gAXVEf5lbhE20m6z4oVhGA2ERO tcNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882027; x=1690474027; 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=YjcBvoRPGdwmtkpSOh5Jr/t8a2L1GvJT/Iq1phAB7S4=; b=NLSkKXBVFhRZbkwC2rbRfEewBGO2EbVLv3jrOYGKI6SNhqfEnTRxfWAjz6RcgEypg0 MqLheVbcM4vSd6+5GmS+fVEF4lumoIDbz3eOfThNLftCZpNxXZnIDaKVfPlC4mIW6L9+ WxO85pl640odfXwM4pgbRnIqBC6FDmfZ8vnhbTsaJQ8e7PHFqJ14WzAN5ZwGFwQT214R CGRdVUF67Ca7b4NO74Af4JbySNU7gi3qe2qvG1vXxAIxk6wnOfaOfUUCtuE8YNvDNffT 4VZRR/J4LyHueMKWGjmlb46Gl5HTDYAVHRRJUbt/IwT1XDfTcrZCqNupnUxmht0IGh86 YIkw== X-Gm-Message-State: AC+VfDzLTFnqg+W/cBfBDbERUa+Qa/EGzdggmze+gy5AXaLxG4YSp0CA k6EzKfM9c2eRNQg8VBtMotnXTQ== X-Received: by 2002:a7b:ca48:0:b0:3fa:99ae:3a9a with SMTP id m8-20020a7bca48000000b003fa99ae3a9amr4067345wml.2.1687882027412; Tue, 27 Jun 2023 09:07:07 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a10-20020a05600c224a00b003faef96ee78sm5045225wmm.33.2023.06.27.09.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:07:04 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5361A1FFBD; Tue, 27 Jun 2023 17:07:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PATCH v3 13/36] tests/lcitool: add an explicit gcc-native package Date: Tue, 27 Jun 2023 17:06:37 +0100 Message-Id: <20230627160700.2955547-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We need a native compiler to build the hexagon codegen tools. In our current images we already have a gcc as a side effect of a broken dependency between gcovr and lcov but this will be fixed when we move to bookworm. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=987818 for details. Update the packages while we are at it. Message-Id: <20230623122100.1640995-15-alex.bennee@linaro.org> Acked-by: Richard Henderson Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian-amd64-cross.docker | 1 + tests/docker/dockerfiles/debian-arm64-cross.docker | 1 + tests/docker/dockerfiles/debian-armel-cross.docker | 1 + tests/docker/dockerfiles/debian-armhf-cross.docker | 1 + tests/docker/dockerfiles/debian-mips64el-cross.docker | 1 + tests/docker/dockerfiles/debian-mipsel-cross.docker | 1 + tests/docker/dockerfiles/debian-ppc64el-cross.docker | 1 + tests/docker/dockerfiles/debian-s390x-cross.docker | 1 + tests/docker/dockerfiles/fedora-win32-cross.docker | 1 + tests/docker/dockerfiles/fedora-win64-cross.docker | 1 + tests/lcitool/projects/qemu.yml | 1 + 11 files changed, 11 insertions(+) diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 40a2b6acc4..016c2321f1 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ exuberant-ctags \ findutils \ flex \ + gcc \ gcovr \ gettext \ git \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index c99300bbfa..3c114efa11 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ exuberant-ctags \ findutils \ flex \ + gcc \ gcovr \ gettext \ git \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index 5db5c78b31..dfbd47db89 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ exuberant-ctags \ findutils \ flex \ + gcc \ gcovr \ gettext \ git \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index ae6600b25f..4e0084e896 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ exuberant-ctags \ findutils \ flex \ + gcc \ gcovr \ gettext \ git \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index daa2d48e36..88adf333e9 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ exuberant-ctags \ findutils \ flex \ + gcc \ gcovr \ gettext \ git \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index 5af04e2054..256e8b5dfe 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ exuberant-ctags \ findutils \ flex \ + gcc \ gcovr \ gettext \ git \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 1eeba7fcab..4d19cd2bd7 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ exuberant-ctags \ findutils \ flex \ + gcc \ gcovr \ gettext \ git \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index 52e89a6dab..642bbde3d1 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -24,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ exuberant-ctags \ findutils \ flex \ + gcc \ gcovr \ gettext \ git \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index a0a3cd9e5b..e3dfd68bed 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -29,6 +29,7 @@ exec "$@"\n' > /usr/bin/nosync && \ diffutils \ findutils \ flex \ + gcc \ gcovr \ git \ glib2-devel \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index b6c1a6a339..0e15c9643a 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -29,6 +29,7 @@ exec "$@"\n' > /usr/bin/nosync && \ diffutils \ findutils \ flex \ + gcc \ gcovr \ git \ glib2-devel \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index 566db8313b..21fd3d2cf9 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -24,6 +24,7 @@ packages: - fuse3 - g++ - gcc + - gcc-native - gcovr - gettext - glib2 From patchwork Tue Jun 27 16:06:38 2023 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: 696851 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3863694wrm; Tue, 27 Jun 2023 09:09:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7jhnSUOVdOCbNI7OxFPryiq3SMMN7MwSr16G6xuKTKs3EtUSXzpxu7Muv16pnJevf6n2Iq X-Received: by 2002:a05:6214:3015:b0:621:1a4c:759b with SMTP id ke21-20020a056214301500b006211a4c759bmr4808173qvb.36.1687882192911; Tue, 27 Jun 2023 09:09:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882192; cv=none; d=google.com; s=arc-20160816; b=ByuDrqi/okTgfTDzZa2nWv+qJIYKIxIIa85Gt43opVdeUZGwPwpIDovQRyCWv9x0+F PGxiFAzIfXGl6J2kmS/il46d7sI6alhY6zgACc9NLuDyv6dUIhQqxlfwIR/ZUbgnzCy2 ke0eAzK/gyLwkwSFDlt/LzGKIHKMiDjnJZBBIB9XvDUT8wBSfXnXWgCnrSmLwzJPR7TS P07AMx0feGy0MlnzhWPV1EL2QRbY5D4inzhs8tQxAda4FleQpBMmb+Nav1lEOQXrpI/b GMUOaNodoD5TFEvF+L/Le0XW1EVOpbIDR3e24KMZw++5urWrffrNBCmEn/Q18En0QbrU gUzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mrxZa7XFEUbEabq4wBcL7gzCxqp+QvBtMc1otNNsIiU=; fh=UYmazdnd7dWeaUl9zzIqQyuUvQUcVQKeyrKAe+85WNA=; b=cZOn5bg9tNAX4mOQ68nW4S8prRMdqrTUdHORnWXQMV9xbUt26FkOiXhvWC7Euh/2mz BDSfFc3ZE2VNoIM+DYlms/MjrT22fYRoHbYi7coMtyI5OE3MvtYDXh1Z8VL3fJRgo0Jy JgP+X3s5v2tArVi2+MsukaUnDD1FHreHJzuS3zXfho//8/N0RcVMHOJL3nId0EJBo2gw DTsQ51XC8B7Ueec6FFf0l1lIKWa6VEVwsuAIxRpGJYND1rFw9DB5RWUBgeehbsjeKfEC yPwwBum47ata1BJ/8vFBu/V2uz0qRvEn/tHXdKakCahfCycWy6MFaBzMzpOT9yUKU/id J9zA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="qV/h+v2f"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a10-20020a05620a02ea00b0076219960045si786150qko.239.2023.06.27.09.09.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:09:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="qV/h+v2f"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBDv-0000Is-8j; Tue, 27 Jun 2023 12:07: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 1qEBDm-0000FK-C6 for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:14 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qEBDg-0005A4-JM for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:14 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3fba8e2a9ecso6762105e9.3 for ; Tue, 27 Jun 2023 09:07:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882027; x=1690474027; 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=mrxZa7XFEUbEabq4wBcL7gzCxqp+QvBtMc1otNNsIiU=; b=qV/h+v2fw4V5Wrmwe/TeT7Zb0YSfKEr83bF1bApS8qiyYaR6UuEB2KNakZD7I2yJqn e9SJ+fbpuKagfZeJbzcxx8k8GxqeSuXWU7WyhddtY9Zy0E+mqsgAPpVYSMvLYfcnLVow lIELghh39M00e1UVTST9FIW+++PbrHGiZRgoPQw7jEud/yDvsyi3I+Y0OpUAZnKEf8os 2dvFe9lddOBZHA4ch4hqpKB5TPbKo+sIBWC02k+8sAgwrH5/2pRKL714f/MY0PQiaShW bLrATQf0GRwEUYRq4rKPtOQf2dJprEqmX6h7aMlPNkxj2G+nW45M1i2OcpKD37hSn1Y5 cN6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882027; x=1690474027; 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=mrxZa7XFEUbEabq4wBcL7gzCxqp+QvBtMc1otNNsIiU=; b=N73ZLG6Rm+dmj4OePXw6DkBYG9v6hp1tcVVTeCGVndH4/I0Q8Qht6sXL+/LDff+4KK 4PaMYpRQqvc8YtBn8CwkEMCwS8KmkqPLb3Wsw2ERpSmMVoBW9u8zBt2QsS02Wu+o9+qS J/WikOLM22eQPa/9A3AAgQ+KNrwlPyFbQARnX9ihdEI3GkvqS4Yt/mzWYYdmOvxCNpEX st+EJqO9lR5/VCzj+vdA2xp7BMDdRej0do7ebAurV3Pdn4bQMLP7QfDpFUzfGPdm9THS /33Pd13GcLNtUMnry27f+AbKzdEjeXVZ1Knw/kLZ6Yhwa7kk/Y5cEi38dujQCrPZcV36 +uIw== X-Gm-Message-State: AC+VfDywLF5faslY1cOhI8X9GWg34E0qKjX8YqAzNi1wP3HYYidBh//l JnkQ+qCxMwmxwmpA9DrAmsr0Aw== X-Received: by 2002:a7b:c017:0:b0:3f7:aad8:4e05 with SMTP id c23-20020a7bc017000000b003f7aad84e05mr26348503wmb.11.1687882027154; Tue, 27 Jun 2023 09:07:07 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z26-20020a1c4c1a000000b003f91e32b1ebsm1868903wmf.17.2023.06.27.09.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:07:04 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6B6121FFC6; Tue, 27 Jun 2023 17:07:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PATCH v3 14/36] tests/lcitool: introduce qemu-minimal Date: Tue, 27 Jun 2023 17:06:38 +0100 Message-Id: <20230627160700.2955547-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This is a very bare bones set of dependencies for a minimal build of QEMU. This will be useful for minimal cross-compile sanity check based on things like Debian Sid where stuff isn't always in sync. Message-Id: <20230623122100.1640995-16-alex.bennee@linaro.org> Signed-off-by: Alex Bennée --- v2 - minor rewording --- tests/lcitool/projects/qemu-minimal.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 tests/lcitool/projects/qemu-minimal.yml diff --git a/tests/lcitool/projects/qemu-minimal.yml b/tests/lcitool/projects/qemu-minimal.yml new file mode 100644 index 0000000000..b60fec715c --- /dev/null +++ b/tests/lcitool/projects/qemu-minimal.yml @@ -0,0 +1,23 @@ +# Very minimal set of qemu packages, used for minimal cross-compile sanity checks +--- +packages: + - bash + - bc + - bison + - flex + - g++ + - gcc + - gcc-native + - glib2 + - glib2-native + - glib2-static + - libc-static + - libfdt + - libffi + - make + - meson + - ninja + - pixman + - pkg-config + - python3 + - python3-venv From patchwork Tue Jun 27 16:06:39 2023 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: 696849 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3863524wrm; Tue, 27 Jun 2023 09:09:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7OD1s+25hbUMc/NNGqBDLfrAZOjghLR6FBhTUAwoM4Y9/oLhw+pzWNRBA+8ilW1mQdbqmc X-Received: by 2002:a05:622a:1492:b0:3ec:490b:ce6e with SMTP id t18-20020a05622a149200b003ec490bce6emr36130900qtx.48.1687882180595; Tue, 27 Jun 2023 09:09:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882180; cv=none; d=google.com; s=arc-20160816; b=uY8KEqud+MOKjArd4Csr26IZE5AA4cNwHvTBzeohebN/2yk7Q0Oq58Fqib8BHICblo wau9zy75GrP11tnKNm8CGKoHxIL4OmAa1HaxpTiO/+z0Bxq5uAQM7mQquCbMV6iN+/yv dYEUoek78miytmXLr7sHwd5VARhI8tNFqtwcRksN1Qy2Bl5KYmHno/Gn/Vtm8+YtV5ql Rhn9S4hoF1/sixHyCfU9dd9/PPYOY98EZm5i53lOGvE+k7RcAI/C2zMAop0EQs7KLzxB TlJ81e4esdLlxiNYs3ULGyk9Mq2HV6Rw1H+N+YipQFnmZ+6y2uqZKQB2TAj76i50ceim FSUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CntAb+cgLtatchfM+3lzjapvTHJaq2r9C16N2thtx8U=; fh=UYmazdnd7dWeaUl9zzIqQyuUvQUcVQKeyrKAe+85WNA=; b=FBNL7lyXL4yQCGQHq/m+uWhdDDNibGF3MGdyPXpbljt/tbWQaYxp/Xw+2oWiWIIqoM WpXkzrD6m1oPMgNFRHc2K4xg54+kQDKTvzimee4Wzt2jH3GQ4/eTgk/T22hDNfgxfcSB iLfc6Jmxhnq1yO5dPvHS8ALEP+NS4pAT0Km1nrWV4P0UkGC2Crd6izzDt3GYPFlcb6yp bOULb6TdoIaJ4PfA0RMvVeYN9uDHFbAVLVDHHv+iysDP/N6tR+LGDLZhvn0Pb3wQf2dk NtZ8wuYCKVO+LarNJNSt55O5/if4+THhfNgNhRdzBFs+PasL91pH7B4bYjucUWuJh1N2 eFLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dkXUU+7o; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b1-20020a05622a020100b0040302981715si350021qtx.722.2023.06.27.09.09.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:09:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dkXUU+7o; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBDw-0000J7-Hk; Tue, 27 Jun 2023 12:07: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 1qEBDo-0000Gv-4y for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:16 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qEBDh-0005An-SP for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:15 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f9ede60140so45354525e9.0 for ; Tue, 27 Jun 2023 09:07:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882028; x=1690474028; 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=CntAb+cgLtatchfM+3lzjapvTHJaq2r9C16N2thtx8U=; b=dkXUU+7oC/cTas77Z0arW3prkMsEfcXG/+HCYst4+1fIK4tISpxA5gw4LfHUa3oXF8 cedQkFMxWQhEdNPqAgmuPQfC41Zey/iEUAgHgpDrx4lffwVOMaOkAkfEr67dX7iZRNB8 HMIa43rIv3RZKkKYC8lwhL9KtjcHVLAKaK+OEY7h6ZFaqofPV+MAIT+iqMFjIRk6ndJH 5ODVrEYZbIQ/HCZCpEah33YiMzLkcrv+R/JxMQFKNwxN6IOlQAd2rnq771Fhz50rTWAd OYrkxYNtIdoPx6QFl4xTMt7NwYDown8d+pZTgsgin/l1wjbXThtQU9dTAmzN0OF8qkEk FOHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882028; x=1690474028; 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=CntAb+cgLtatchfM+3lzjapvTHJaq2r9C16N2thtx8U=; b=VIBem+ySKaGgrl6IHGH7GFsA3Ej26zujGjhkX5lKYjs0woONnHOGX0kIPt5oyZw/x+ 2cQIbq4N6PBisNsl2wKP6Nl26e9biQBGk5ntjoCrHLNvcXbZgzhvayo5ReiMM0kvs9xu donS+2uO19l/2kM3+38X31GxRxtl9Xxqv0zvgAkPZWo815vT1g2QtJOyDqRLfulcVZec PFYz5lQHUfy8HQaji4T5r2PJYImgWA6t07sYIlwZtiYzXr/J1uM90hL4vKfcnhUP9Ju5 WjzggXcti51UfxcMRXMIOyNvHqrk7fihzNJoPNcLHc0aTPU+unaniXSf+OtLqwJ2buBx Fb4A== X-Gm-Message-State: AC+VfDx9RT7bXsuD2Urd738UWwUq89SLa/+/FdG0eLlmv5/pmjZr1nd8 lcw/dLASFoPuh/3sT4ktf21dZKESF9sroKJ3Lu0= X-Received: by 2002:a05:600c:230b:b0:3fa:8874:fe69 with SMTP id 11-20020a05600c230b00b003fa8874fe69mr5870011wmo.29.1687882028271; Tue, 27 Jun 2023 09:07:08 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id hn8-20020a05600ca38800b003fa722e8b48sm14293848wmb.32.2023.06.27.09.07.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:07:06 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8AE8D1FFC7; Tue, 27 Jun 2023 17:07:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PATCH v3 15/36] tests/docker: convert riscv64-cross to lcitool Date: Tue, 27 Jun 2023 17:06:39 +0100 Message-Id: <20230627160700.2955547-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We still need to base this on Debian Sid until riscv64 is promoted to a release architecture (or another distro provides a full cross compile target). We use the new qemu-minimal project description to avoid bringing in all the extra dependencies because every extra package is another chance for sid to fail. Signed-off-by: Alex Bennée --- .../dockerfiles/debian-riscv64-cross.docker | 119 +++++++++++------- tests/lcitool/projects/qemu-minimal.yml | 4 + tests/lcitool/refresh | 10 +- 3 files changed, 87 insertions(+), 46 deletions(-) diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker index 081404e014..a2d879ee1f 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -1,54 +1,85 @@ +# THIS FILE WAS AUTO-GENERATED # -# Docker cross-compiler target for riscv64 +# $ lcitool dockerfile --layers all --cross riscv64 debian-sid qemu-minimal # -# Currently the only distro that gets close to cross compiling riscv64 -# images is Debian Sid (with unofficial ports). As this is a moving -# target we keep the library list minimal and are aiming to migrate -# from this hack as soon as we are able. -# -FROM docker.io/library/debian:sid-slim +# https://gitlab.com/libvirt/libvirt-ci -# Add ports -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=noninteractive eatmydata apt update -yy && \ - DEBIAN_FRONTEND=noninteractive eatmydata apt upgrade -yy - -# Install common build utilities -RUN DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \ - bison \ - bc \ - build-essential \ - ca-certificates \ - debian-ports-archive-keyring \ - dpkg-dev \ - flex \ - gettext \ - git \ - libglib2.0-dev \ - ninja-build \ - pkg-config \ - python3 \ - python3-venv +FROM docker.io/library/debian:sid-slim -# Add ports and riscv64 architecture -RUN echo "deb http://ftp.ports.debian.org/debian-ports/ sid main" >> /etc/apt/sources.list -RUN dpkg --add-architecture riscv64 +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + bash \ + bc \ + bison \ + ca-certificates \ + ccache \ + findutils \ + flex \ + gcc \ + git \ + libglib2.0-dev \ + locales \ + make \ + meson \ + ninja-build \ + pkgconf \ + python3 \ + python3-venv \ + sed \ + tar && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list +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 apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - gcc-riscv64-linux-gnu \ - libc6-dev-riscv64-cross \ - libfdt-dev:riscv64 \ - libffi-dev:riscv64 \ - libglib2.0-dev:riscv64 \ - libpixman-1-dev:riscv64 +RUN export DEBIAN_FRONTEND=noninteractive && \ + dpkg --add-architecture riscv64 && \ + eatmydata apt-get install debian-ports-archive-keyring && \ + eatmydata echo 'deb http://ftp.ports.debian.org/debian-ports/ sid main' > /etc/apt/sources.list.d/ports.list && \ + eatmydata echo 'deb http://ftp.ports.debian.org/debian-ports/ unreleased main' >> /etc/apt/sources.list.d/ports.list && \ + eatmydata apt-get update && \ + 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++-riscv64-linux-gnu \ + gcc-riscv64-linux-gnu \ + libc6-dev:riscv64 \ + libfdt-dev:riscv64 \ + libffi-dev:riscv64 \ + libglib2.0-dev:riscv64 \ + libpixman-1-dev:riscv64 && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + printf "[binaries]\n\ +c = '/usr/bin/riscv64-linux-gnu-gcc'\n\ +ar = '/usr/bin/riscv64-linux-gnu-gcc-ar'\n\ +strip = '/usr/bin/riscv64-linux-gnu-strip'\n\ +pkgconfig = '/usr/bin/riscv64-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system = 'linux'\n\ +cpu_family = 'riscv64'\n\ +cpu = 'riscv64'\n\ +endian = 'little'\n" > /usr/local/share/meson/cross/riscv64-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-gcc -# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV ABI "riscv64-linux-gnu" +ENV MESON_OPTS "--cross-file=riscv64-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=riscv64-linux-gnu- ENV DEF_TARGET_LIST riscv64-softmmu,riscv64-linux-user # As a final step configure the user (if env is defined) diff --git a/tests/lcitool/projects/qemu-minimal.yml b/tests/lcitool/projects/qemu-minimal.yml index b60fec715c..d44737dc1d 100644 --- a/tests/lcitool/projects/qemu-minimal.yml +++ b/tests/lcitool/projects/qemu-minimal.yml @@ -4,6 +4,8 @@ packages: - bash - bc - bison + - ccache + - findutils - flex - g++ - gcc @@ -21,3 +23,5 @@ packages: - pkg-config - python3 - python3-venv + - sed + - tar diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 5e06fb2cf5..b54566edcc 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -63,12 +63,12 @@ add_user_mapping = [ " id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi\n" ] -def generate_dockerfile(host, target, cross=None, trailer=None): +def generate_dockerfile(host, target, project="qemu", cross=None, trailer=None): filename = Path(src_dir, "tests", "docker", "dockerfiles", host + ".docker") cmd = lcitool_cmd + ["dockerfile"] if cross is not None: cmd.extend(["--cross", cross]) - cmd.extend([target, "qemu"]) + cmd.extend([target, project]) if trailer is not None: trailer += "\n".join(add_user_mapping) @@ -164,6 +164,12 @@ try: trailer=cross_build("powerpc64le-linux-gnu-", "ppc64-softmmu,ppc64-linux-user")) + generate_dockerfile("debian-riscv64-cross", "debian-sid", + project="qemu-minimal", + cross="riscv64", + trailer=cross_build("riscv64-linux-gnu-", + "riscv64-softmmu,riscv64-linux-user")) + generate_dockerfile("debian-s390x-cross", "debian-11", cross="s390x", trailer=cross_build("s390x-linux-gnu-", From patchwork Tue Jun 27 16:06:40 2023 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: 696846 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3862934wrm; Tue, 27 Jun 2023 09:08:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7Mqj0fyeEp055ZPrsMRnIxXfWCRkM+2xxLYtS2yXFtrFUcZ7RTIqCJB0MDQKYLyjSvGUSf X-Received: by 2002:a05:620a:258b:b0:762:3565:7407 with SMTP id x11-20020a05620a258b00b0076235657407mr34999646qko.2.1687882134333; Tue, 27 Jun 2023 09:08:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882134; cv=none; d=google.com; s=arc-20160816; b=AqB9Vb9HvMYlB5oO9xpOTJBhxjJAaoVnLP8EXySgLR6BN+onrVeGtaMrbAhAex7ipA RYkBdzClCsmA1TkVq6ASB3cmKNmpxSc+qa0fI5THo59g57z23MN4L/k6J3rO7YvVF9oF PpakO9R9lQHS2RiEIIkehNbR8IWnhEyjUKjDLj1R0jMVmsrZ2znyPh+kh5D6/JxyW/hZ wETgRHDnDlmEXBK7NLBJDksGGxDfslqLLKsjsTPHcxhoWha6NV4bOHqJrIQNtWG7ku2R kzQ20d1iABoSLi9st4J1YPWxhMXC5YAjo2eS6W1y6vuy9zkBao0uVG8RdjygbdntepcX PAmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AouWM1m7VIgcxf/wQ9k/4ktgNJVDqALSrdqBKb0paEY=; fh=UYmazdnd7dWeaUl9zzIqQyuUvQUcVQKeyrKAe+85WNA=; b=0zcHgUH5qp4GJIkJmWHN4QF/48wMztkHQOCnc8+KK3HfCZAuU5zp381BqfocQue6Xo laX1yPlAXAjgREhzYW0ez8yvW3Gcew/qOXcqVfUdcYeuZga35YWsu02yQd6V/KdMYDA1 gTJB+6fu/zrxqzIDJA1anCnzTsHdz7Ia/WhoSo72aJ+TccBt1mFQL8ReKosExOYZRiIe JFU6z2gZjGBqWYR8/GrrwLvudi8x1VfFl/hQdmwdkZ/O8D57mOEUNSb9wvEDzDUM7bDi fwUtKw/p+lsekT0BopBOjbEYCKceVyhY5/zmNTQ5gQkuj24KBQII4aqNRzo7rrRF32Os mVCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LdCR1f0g; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t6-20020a05620a0b0600b00763b64c273esi2111759qkg.220.2023.06.27.09.08.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:08:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LdCR1f0g; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBE9-0000OP-PJ; Tue, 27 Jun 2023 12:07: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 1qEBDp-0000Hi-3H for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:17 -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 1qEBDi-0005Az-0h for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:07:16 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3fa8ce2307dso38250105e9.2 for ; Tue, 27 Jun 2023 09:07:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882028; x=1690474028; 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=AouWM1m7VIgcxf/wQ9k/4ktgNJVDqALSrdqBKb0paEY=; b=LdCR1f0gPcTjLls4gsCDJE56hvQXwVfLgH2LjS+JNO6cCNP8JcDalTTJ32f8GxnS94 eM3y9OVylVa0VtfIUXwZZZx2oWqH+bmk3Ti6o7tbOynUXBLsHOFvRsqsegTy9cHhTzEH wVmhbvvrrIfgGI+q1/PBIzmM78D0iFB+eeECYdau414XVWvMSNen8xOpmZzL54bDjzqA RaQiBPIjEVfibty5VUS1mHhvfz8NauIXPT8KpfU2EsBWioJ80fks0l7oq7mY6k/DYrpm JsM/Tm6qRSA+d1KyA5btN/kKtxrLWE9clix7tkG/qxCkErEOkaNXuvv9qxcFz4p36l99 FXlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882028; x=1690474028; 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=AouWM1m7VIgcxf/wQ9k/4ktgNJVDqALSrdqBKb0paEY=; b=kmgv96NBwr4JbEOzwi+Y+o5Pt60U4mjO7VHQx6SsHhZzVLCHpob1nyQAWjGkNqWSPx 93z4xdHnNyy5Rgu86JRAAgC8pu7mdYHNkbimk4MYc0FUkYsWocxyzrZ52qSDI9P/hkNj S6br9WU5I6nVFREH3Xu+Zs7WjqbSuzdZ8PmDWOylV0lOIyIdo0KTraUNgZbxQyybzIeK am32VoQ5w3D2IOk2zw4L/zmzjMVqWbh3y/YRsFGmEir5BJpuwa5KMfWiMw3mOgUs1l6l Xx2p9rvon6EUySTqT6j9PB/ZFddxoiEclfM5r4Oea8rYXakn4Ix4EnPpSmPDPHyEFmpT X8iQ== X-Gm-Message-State: AC+VfDx1muvqqBhbNqsqZMyjRUo4xZHsndtaujKQShiIrkIy1sYM3xc2 37FuAsjj6q+56It4vuO/nFtWPw== X-Received: by 2002:a7b:c4c9:0:b0:3fa:8519:d323 with SMTP id g9-20020a7bc4c9000000b003fa8519d323mr11524580wmk.5.1687882028560; Tue, 27 Jun 2023 09:07:08 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id l21-20020a7bc455000000b003fa95c466a1sm6836620wmi.5.2023.06.27.09.07.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:07:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A3C751FFC8; Tue, 27 Jun 2023 17:07:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PATCH v3 16/36] tests/avocado: update firmware to enable sbsa-ref/max Date: Tue, 27 Jun 2023 17:06:40 +0100 Message-Id: <20230627160700.2955547-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Marcin Juszkiewicz Update prebuilt firmware images to have TF-A with FEAT_FGT support enabled. This allowed us to enable test for "max" cpu in sbsa-ref machine. Signed-off-by: Marcin Juszkiewicz Message-Id: <20230530152240.79160-1-marcin.juszkiewicz@linaro.org> Signed-off-by: Alex Bennée --- v3 - re-enable for CI --- tests/avocado/machine_aarch64_sbsaref.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py index 0a79fa7ab6..cce6ef9f65 100644 --- a/tests/avocado/machine_aarch64_sbsaref.py +++ b/tests/avocado/machine_aarch64_sbsaref.py @@ -29,23 +29,23 @@ def fetch_firmware(self): """ Flash volumes generated using: - - Fedora GNU Toolchain version 12.2.1 20220819 (Red Hat Cross 12.2.1-2) + - Fedora GNU Toolchain version 13.1.1 20230511 (Red Hat 13.1.1-2) - Trusted Firmware-A - https://github.com/ARM-software/arm-trusted-firmware/tree/5fdb2e54 + https://github.com/ARM-software/arm-trusted-firmware/tree/c0d8ee38 - Tianocore EDK II - https://github.com/tianocore/edk2/tree/494127613b - https://github.com/tianocore/edk2-non-osi/tree/41876073 - https://github.com/tianocore/edk2-platforms/tree/8efa4f42 + https://github.com/tianocore/edk2/tree/0f9283429dd4 + https://github.com/tianocore/edk2-non-osi/tree/f0bb00937ad6 + https://github.com/tianocore/edk2-platforms/tree/7880b92e2a04 """ # Secure BootRom (TF-A code) fs0_xz_url = ( - "https://fileserver.linaro.org/s/ATnSmq6k8SoXgbH/" + "https://fileserver.linaro.org/s/HrYMCjP7MEccjRP/" "download/SBSA_FLASH0.fd.xz" ) - fs0_xz_hash = "a210a09692bcbe0a3743ffd0df44e80e0c7ad8ab" + fs0_xz_hash = "447eff64a90b84ce47703c6ec41fbfc25befaaea" tar_xz_path = self.fetch_asset(fs0_xz_url, asset_hash=fs0_xz_hash) archive.extract(tar_xz_path, self.workdir) fs0_path = os.path.join(self.workdir, "SBSA_FLASH0.fd") @@ -93,15 +93,15 @@ def test_sbsaref_edk2_firmware(self): # AP Trusted ROM wait_for_console_pattern(self, "Booting Trusted Firmware") - wait_for_console_pattern(self, "BL1: v2.8(release):v2.8") + wait_for_console_pattern(self, "BL1: v2.9(release):v2.9") wait_for_console_pattern(self, "BL1: Booting BL2") # Trusted Boot Firmware - wait_for_console_pattern(self, "BL2: v2.8(release)") + wait_for_console_pattern(self, "BL2: v2.9(release)") wait_for_console_pattern(self, "Booting BL31") # EL3 Runtime Software - wait_for_console_pattern(self, "BL31: v2.8(release)") + wait_for_console_pattern(self, "BL31: v2.9(release)") # Non-trusted Firmware wait_for_console_pattern(self, "UEFI firmware (version 1.0") @@ -136,21 +136,18 @@ def boot_alpine_linux(self, cpu): self.vm.launch() wait_for_console_pattern(self, "Welcome to Alpine Linux 3.17") - @skipUnless(os.getenv("AVOCADO_TIMEOUT_EXPECTED"), "Test might timeout") def test_sbsaref_alpine_linux_cortex_a57(self): """ :avocado: tags=cpu:cortex-a57 """ self.boot_alpine_linux("cortex-a57") - @skipUnless(os.getenv("AVOCADO_TIMEOUT_EXPECTED"), "Test might timeout") def test_sbsaref_alpine_linux_neoverse_n1(self): """ :avocado: tags=cpu:max """ self.boot_alpine_linux("neoverse-n1") - @skip("requires TF-A update to handle FEAT_FGT") def test_sbsaref_alpine_linux_max(self): """ :avocado: tags=cpu:max From patchwork Tue Jun 27 16:06:41 2023 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: 696894 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3868503wrm; Tue, 27 Jun 2023 09:18:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4P+VaxOBFDjyBCV6Cjj5VxBtCciabdTbPKpNcc8lS9DhMcZ67DfIPb8E5oKLMEYEZsFDen X-Received: by 2002:a1f:6093:0:b0:471:6499:dc78 with SMTP id u141-20020a1f6093000000b004716499dc78mr17325717vkb.9.1687882688519; Tue, 27 Jun 2023 09:18:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882688; cv=none; d=google.com; s=arc-20160816; b=P5XvlyRcERDWBy/Dqp1O46VILfEsIInoq4Fdb848+Qa99gd+b9dxA8Ls8LYplLOwvl XE8zDn7asKYFd4MGqCYmNybTWcl2Oqq2tXgyZnoXzIHe41rE8AimbawqGqqTYqVbrt9B Z9dcBwHfa1ZzUjIu+Tak9wxQ9C8m0AEqMG/xH0ozmmP+YaQZx2+Kh7evytP8X9eKVPiK ZynQ7GyyH13Rspeiaro9DIEWiP7nsozN+t+khok4Spnv1fvfh6CGZDkJk/i9GdeEAoZY PUsyWwsoQVuyNfxDKj0/AY7HZcgp1S8DlTOWAJDfZHPTt+qiVbv6l6KUaCamXedP6im1 2jUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Mu0VzYZ5qJSeNduimPIxEjIPeU7djJlezitZVXx019k=; fh=PSMQo2U146jbGTLXnDNx5hadlgVQ8soVLPk8hX8OECU=; b=UjyOpJBSin3Es9nEaxw15cwteHV7Cacz+wMkf3ZoyjbOaxyxSnL4b/RZ9NgQBKGmf+ Vc2ZpvjLU0jWmqsyH11JScWoQluUEHZNK3kZjkbHWQ6k5m7PAdW5oDjp+xzlo2Rop4yP IZQ/RF7Yn+sjFeTSmuC8LUZlDDKV2qxc2NNjFXIjExmApye4gS0dh437yNcWlj2P80h7 DF+AoWVAOgOwDwtuAUsKRxvllJHExr2WjbiQmjOgwojlcFB55fJdH4IiTe1UE4VL0Hrx C5BR9xxYFjupn4tVZQHZoiBmzG6ryvIQCMKFGaNPb2P3PdSeSyisE4IH+aLQM/SHFuLS VC8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=J144fp8t; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 13-20020a056214202d00b00630173ee631si3436579qvf.321.2023.06.27.09.18.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:18:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=J144fp8t; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBMM-0001Ab-ER; Tue, 27 Jun 2023 12:16:06 -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 1qEBMK-00016z-GV for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:16:04 -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 1qEBMA-00089C-I9 for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:16:04 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3fbac9dd8ebso965585e9.1 for ; Tue, 27 Jun 2023 09:15:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882553; x=1690474553; 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=Mu0VzYZ5qJSeNduimPIxEjIPeU7djJlezitZVXx019k=; b=J144fp8tNC6fW4maKWTqh2xWnLZPGa+F5+0I8tU+ONdCJd0sF+0/LiOeI1OOpxefEj qLy2pzZnaSIh2Lku6IVhKLdDGWgI5eH23vUOt4gL1hsnaS/pJyPuxywmTLCaKcY+mxpH HZ7zkc98r5fpzaJaggBo6nSpyDsgjE2ptGKlwCChg0olDpdEdqcMLXa+ZwpUUkyQiN/O fZxD1oLhf97Ctt6lDKJflFflwxzsF9kXEIC4GxlqBeYNMOIwHPZgozOPmmz2nfc9JMY8 mHlOMKAZpSs87T+2kHL+tjBKlZdg+TBbVEoKC/ftTSl9HT2RYRCzexaJfAUrfLHU0GpR ywXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882553; x=1690474553; 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=Mu0VzYZ5qJSeNduimPIxEjIPeU7djJlezitZVXx019k=; b=mCNxy4XcIrwnl3VSeh9rPc9A2wLXujDiwIkn0hGzC/0j5u38Fvb/oQC2LgGgybz5Ee hoxyyywSutIc9NtWv4HEq7pENd3Mo9WEnmPEd3ran9UHNMa2Q05Cu79fYPgiLuEhitB1 E9iUvQ1tf0PNnC71h8nmyyun7FHJNeKcOc7TQGsz7l7T+C/AkFUVbg4FJkklHaiVw7db XaoLSVJQzAp4tVQWDHqLLHlGCGGTR3P1o2FOnMFXXFHDMgtWGZ7Lfx08O5q+PQmUq4kp e2l9CkblfyfVDgev8gnsAE0jrNUIgk2epb0V/hfy+HmkPtt6wBM/bT7LKUF3/fcZ7Lh8 wcmw== X-Gm-Message-State: AC+VfDwvo8E2oZ1e+OrgtJV+KkgcNemLDhwOeP4Ng+w5V8CjTHv6fw2J 879db6Ar1wkmadako+/KlyZh3g== X-Received: by 2002:a05:600c:3797:b0:3fa:c3e8:900c with SMTP id o23-20020a05600c379700b003fac3e8900cmr4019279wmr.11.1687882552244; Tue, 27 Jun 2023 09:15:52 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 21-20020a05600c22d500b003f96d10eafbsm11280847wmg.12.2023.06.27.09.15.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:15:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C9DF61FFC9; Tue, 27 Jun 2023 17:07:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Riku Voipio , Leonardo Bras , Wainer dos Santos Moschetta , Leif Lindholm , Yanan Wang , Marcin Juszkiewicz , Bandan Das , Beraldo Leal , Laurent Vivier , Marcel Apfelbaum , Bin Meng , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Stefan Hajnoczi , Richard Henderson , Peter Maydell , Thomas Huth , Cleber Rosa , Alexandre Iooss , Juan Quintela , Eduardo Habkost , Paolo Bonzini , Qiuhao Li , Mahmoud Mandour , Peter Xu , Radoslaw Biernacki , Darren Kenny , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov , Robert Henry , Aaron Lindsay Subject: [PATCH v3 17/36] plugins: force slow path when plugins instrument memory ops Date: Tue, 27 Jun 2023 17:06:41 +0100 Message-Id: <20230627160700.2955547-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160700.2955547-1-alex.bennee@linaro.org> References: <20230627160700.2955547-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The lack of SVE memory instrumentation has been an omission in plugin handling since it was introduced. Fortunately we can utilise the probe_* functions to force all all memory access to follow the slow path. We do this by checking the access type and presence of plugin memory callbacks and if set return the TLB_MMIO flag. We have to jump through a few hoops in user mode to re-use the flag but it was the desired effect: ./qemu-system-aarch64 -display none -serial mon:stdio \ -M virt -cpu max -semihosting-config enable=on \ -kernel ./tests/tcg/aarch64-softmmu/memory-sve \ -plugin ./contrib/plugins/libexeclog.so,ifilter=st1w,afilter=0x40001808 -d plugin gives (disas doesn't currently understand st1w): 0, 0x40001808, 0xe54342a0, ".byte 0xa0, 0x42, 0x43, 0xe5", store, 0x40213010, RAM, store, 0x40213014, RAM, store, 0x40213018, RAM And for user-mode: ./qemu-aarch64 \ -plugin contrib/plugins/libexeclog.so,afilter=0x4007c0 \ -d plugin \ ./tests/tcg/aarch64-linux-user/sha512-sve gives: 1..10 ok 1 - do_test(&tests[i]) 0, 0x4007c0, 0xa4004b80, ".byte 0x80, 0x4b, 0x00, 0xa4", load, 0x5500800370, load, 0x5500800371, load, 0x5500800372, load, 0x5500800373, load, 0x5500800374, load, 0x5500800375, load, 0x5500800376, load, 0x5500800377, load, 0x5500800378, load, 0x5500800379, load, 0x550080037a, load, 0x550080037b, load, 0x550080037c, load, 0x550080037d, load, 0x550080037e, load, 0x550080037f, load, 0x5500800380, load, 0x5500800381, load, 0x5500800382, load, 0x5500800383, load, 0x5500800384, load, 0x5500800385, load, 0x5500800386, lo ad, 0x5500800387, load, 0x5500800388, load, 0x5500800389, load, 0x550080038a, load, 0x550080038b, load, 0x550080038c, load, 0x550080038d, load, 0x550080038e, load, 0x550080038f, load, 0x5500800390, load, 0x5500800391, load, 0x5500800392, load, 0x5500800393, load, 0x5500800394, load, 0x5500800395, load, 0x5500800396, load, 0x5500800397, load, 0x5500800398, load, 0x5500800399, load, 0x550080039a, load, 0x550080039b, load, 0x550080039c, load, 0x550080039d, load, 0x550080039e, load, 0x550080039f, load, 0x55008003a0, load, 0x55008003a1, load, 0x55008003a2, load, 0x55008003a3, load, 0x55008003a4, load, 0x55008003a5, load, 0x55008003a6, load, 0x55008003a7, load, 0x55008003a8, load, 0x55008003a9, load, 0x55008003aa, load, 0x55008003ab, load, 0x55008003ac, load, 0x55008003ad, load, 0x55008003ae, load, 0x55008003af (4007c0 is the ld1b in the sha512-sve) Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Cc: Robert Henry Cc: Aaron Lindsay --- v2 - allow TLB_MMIO to appear in user-mode probe_access v3 - checkpatch cleanups --- include/exec/cpu-all.h | 2 +- include/hw/core/cpu.h | 17 +++++++++++++++++ accel/tcg/cputlb.c | 5 ++++- accel/tcg/user-exec.c | 8 ++++++-- target/arm/tcg/sve_helper.c | 4 ---- tests/tcg/aarch64/Makefile.target | 8 ++++++++ 6 files changed, 36 insertions(+), 8 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 8018ce783e..472fe9ad9c 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -301,7 +301,7 @@ CPUArchState *cpu_copy(CPUArchState *env); * be signaled by probe_access_flags(). */ #define TLB_INVALID_MASK (1 << (TARGET_PAGE_BITS_MIN - 1)) -#define TLB_MMIO 0 +#define TLB_MMIO (1 << (TARGET_PAGE_BITS_MIN - 2)) #define TLB_WATCHPOINT 0 #else diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index eda0230a02..2be7c8f2d9 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -982,6 +982,23 @@ void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *watchpoint); void cpu_watchpoint_remove_all(CPUState *cpu, int mask); #endif +/** + * cpu_plugin_mem_cbs_enabled() - are plugin memory callbacks enabled? + * @cs: CPUState pointer + * + * The memory callbacks are installed if a plugin has instrumented an + * instruction for memory. This can be useful to know if you want to + * force a slow path for a series of memory accesses. + */ +static inline bool cpu_plugin_mem_cbs_enabled(const CPUState *cpu) +{ +#ifdef CONFIG_PLUGIN + return !!cpu->plugin_mem_cbs; +#else + return false; +#endif +} + /** * cpu_get_address_space: * @cpu: CPU to get address space from diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 5b51eff5a4..b1b9bf4b1d 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1553,7 +1553,10 @@ static int probe_access_internal(CPUArchState *env, vaddr addr, flags |= full->slow_flags[access_type]; /* Fold all "mmio-like" bits into TLB_MMIO. This is not RAM. */ - if (unlikely(flags & ~(TLB_WATCHPOINT | TLB_NOTDIRTY))) { + if (unlikely(flags & ~(TLB_WATCHPOINT | TLB_NOTDIRTY)) + || + (access_type != MMU_INST_FETCH && + cpu_plugin_mem_cbs_enabled(env_cpu(env)))) { *phost = NULL; return TLB_MMIO; } diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 8fbcbf9771..d95b875a6a 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -745,6 +745,10 @@ static int probe_access_internal(CPUArchState *env, vaddr addr, if (guest_addr_valid_untagged(addr)) { int page_flags = page_get_flags(addr); if (page_flags & acc_flag) { + if ((acc_flag == PAGE_READ || acc_flag == PAGE_WRITE) + && cpu_plugin_mem_cbs_enabled(env_cpu(env))) { + return TLB_MMIO; + } return 0; /* success */ } maperr = !(page_flags & PAGE_VALID); @@ -767,7 +771,7 @@ int probe_access_flags(CPUArchState *env, vaddr addr, int size, g_assert(-(addr | TARGET_PAGE_MASK) >= size); flags = probe_access_internal(env, addr, size, access_type, nonfault, ra); - *phost = flags ? NULL : g2h(env_cpu(env), addr); + *phost = (flags & TLB_INVALID_MASK) ? NULL : g2h(env_cpu(env), addr); return flags; } @@ -778,7 +782,7 @@ void *probe_access(CPUArchState *env, vaddr addr, int size, g_assert(-(addr | TARGET_PAGE_MASK) >= size); flags = probe_access_internal(env, addr, size, access_type, false, ra); - g_assert(flags == 0); + g_assert((flags & ~TLB_MMIO) == 0); return size ? g2h(env_cpu(env), addr) : NULL; } diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c index 0097522470..7c103fc9f7 100644 --- a/target/arm/tcg/sve_helper.c +++ b/target/arm/tcg/sve_helper.c @@ -5688,9 +5688,6 @@ void sve_ldN_r(CPUARMState *env, uint64_t *vg, const target_ulong addr, flags = info.page[0].flags | info.page[1].flags; if (unlikely(flags != 0)) { -#ifdef CONFIG_USER_ONLY - g_assert_not_reached(); -#else /* * At least one page includes MMIO. * Any bus operation can fail with cpu_transaction_failed, @@ -5727,7 +5724,6 @@ void sve_ldN_r(CPUARMState *env, uint64_t *vg, const target_ulong addr, memcpy(&env->vfp.zregs[(rd + i) & 31], &scratch[i], reg_max); } return; -#endif } /* The entire operation is in RAM, on valid pages. */ diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index 3430fd3cd8..cec1d4b287 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -91,6 +91,14 @@ sha512-vector: sha512.c TESTS += sha512-vector +ifneq ($(CROSS_CC_HAS_SVE),) +sha512-sve: CFLAGS=-O3 -march=armv8.1-a+sve +sha512-sve: sha512.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) + +TESTS += sha512-sve +endif + ifeq ($(HOST_GDB_SUPPORTS_ARCH),y) GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py From patchwork Tue Jun 27 16:09:41 2023 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: 696856 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3864012wrm; Tue, 27 Jun 2023 09:10:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7Q7sjKQj4sa5KElbMHIefzvLQLe0kCH8zdMR7baP45gcwfoP2PxNol1sWzdC3uONnImpE7 X-Received: by 2002:a05:6214:528f:b0:62b:6f7e:f77 with SMTP id kj15-20020a056214528f00b0062b6f7e0f77mr15843585qvb.39.1687882221764; Tue, 27 Jun 2023 09:10:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687882221; cv=none; d=google.com; s=arc-20160816; b=FNm0tBWEjabfr+v3g9hsBk/TREfIOorl66ew9LMDP7HjCORyFjxv2uIvhnRi1IHCZz mC2Dm4wn7Qi2LOgZ22N9b7a7die2jGfy7Lr/hgD758+tb0Y3MSzApcnf5wY8KAFcjQOl E8VenXhPtNsUywD9FB6jaNNJMFPAehGYQe2/BH1/fM6rvc3cnXJl1ALvr2puDiYgmXJU 47P3RcDrQbM7gyQcwkc5PfoJakMP1mnp3j1JryHiwK7hk1NqIaOTp7BW9HI7cbUeFP61 8vvN91wwOGbFlUbUkrsgMZTFXEzrj46JA8nXUWgGKMOBBG8B4k2uyf+vd6v1GhVrgdy+ voHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/ej/Y3V64Q/r96ZxqVsSKehfEDkXMSA6X3ZM3mtmxeg=; fh=v1GuKjWx+GtByARuYHRIfMqtATsfhAD0Ge8nRIWwNFM=; b=k0Ru/zpTOEBeoDblqTVkWdAAbBseOS+XZsRhFpniQ5JRVGTdrqCP3nA36aZlfq2Cds jn8YvUNqAfPqKNu8cunyr3RnGGi4Z93bCaWsbLwVGhfHkZmdCxIyLz4Dqfm9rDQQ84Cu mpIaMFs5MNw1oUcjYXgdXvgaA2tdQZQzCyWcO2eApfaNG+ooIdQ2ubF6aB5kyf0aSr6d gLjt2o8B/7eDnoQattOOds/NsI1j+FHcws5hdI7LXOH5yJKsKE6ziHG2tTzA/J4RcP1A 5cEZ07MJYMaLjUkbPotK5gsKJB5c6+QlZJLSiOQ39tY7iFWLfhesNnPeYYWWvFJ6oAGB 5KZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZKUkvxQS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gc13-20020a056214230d00b006263f946463si3511853qvb.155.2023.06.27.09.10.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 09:10:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZKUkvxQS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEBGY-0000fi-HT; Tue, 27 Jun 2023 12:10:06 -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 1qEBGV-0000Sh-B7 for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:10:03 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qEBGM-0005rR-Rh for qemu-devel@nongnu.org; Tue, 27 Jun 2023 12:10:02 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3fba66f3b14so9128145e9.3 for ; Tue, 27 Jun 2023 09:09:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687882193; x=1690474193; 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=/ej/Y3V64Q/r96ZxqVsSKehfEDkXMSA6X3ZM3mtmxeg=; b=ZKUkvxQSINrrmZZccaKm9TQr0C6Yys/plvvfFrl43JdLdIUSf8O79aVtk1ax6Keho4 DhRSbhNKY3bNfTX/SVG3IUVpNNKr9pyC9cQnhmMo8NSsskd4VWr52klGFabuM4Ph2Gry 2MqPc23vMwZhRtjWwOMSilCtlIEhqLISKiEqE+0g0rAlgGKgcpQOFqPizQPswrM8SXVO DXn/ZeO9j1O1H4vQMvuGUyPSW/gCpqMvwnYkQEfTKsTjxL+aMnphCg9jModDnT5J6nsI 3Z74haO4kYbvONGA4Ix4W52qHFERQT3uy8I0uxxZfDmX8FYyzySybWJ2IsZCOXABjPhT RfGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687882193; x=1690474193; 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=/ej/Y3V64Q/r96ZxqVsSKehfEDkXMSA6X3ZM3mtmxeg=; b=L3fl7Dao314BJBRVgyMd5VYRrCQ6s+zcONKmCgfEU59Wzo/eLLLB/ViAIbdohpMKep 6bp2keB1w61Hj38ZgvS77atxzdRoiSeSlqVExXFbRnL9HcKX0cXhjyYqj0hRCMLNu+BS 3/M4kCrrMKFGTBV6bfWGH6jjjHqGK1NIUL767TnfqwSrXY1a25gD5OkWWSCjn14zDzfw WtZYMO7plSe+3C7d+M+73sPU6DAX3jIenvVoyZDyP03LVmxafKrTV2pfYRUVR5uUHdYi 1tMXIc0fJfvIosnr6cxmtZCwzurYKhDrbHh3P3jB4a7lAxhc8oKi6NFUUim6i6zEKs6I 417g== X-Gm-Message-State: AC+VfDxgYsBgDovQo6LJ3NJ4jfhKMD2iDFMEdrbf9WBdWb+whoeshAFV lcLZSolMj6cVpbujx8JcSmjFwA== X-Received: by 2002:a05:600c:3657:b0:3f9:b804:1785 with SMTP id y23-20020a05600c365700b003f9b8041785mr18236856wmq.0.1687882193245; Tue, 27 Jun 2023 09:09:53 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id k22-20020a05600c0b5600b003fb40f5f553sm4180425wmr.31.2023.06.27.09.09.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:09:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E84E81FFDF; Tue, 27 Jun 2023 17:09:47 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Juan Quintela , Thomas Huth , Cleber Rosa , Leonardo Bras , Beraldo Leal , Peter Maydell , Bin Meng , Yanan Wang , Darren Kenny , Alexander Bulekov , Marcel Apfelbaum , Peter Xu , Radoslaw Biernacki , Laurent Vivier , Paolo Bonzini , Eduardo Habkost , qemu-arm@nongnu.org, Stefan Hajnoczi , Richard Henderson , Bandan Das , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Dani?= =?utf-8?q?el_P=2E_Berrang=C3=A9?= , Alexandre Iooss , Marcin Juszkiewicz , Leif Lindholm , Laurent Vivier , Qiuhao Li , Mahmoud Mandour , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Ilya Leoshkevich , Dominik 'Disconnect3d' Czarnota Subject: [PATCH v3 34/36] gdbstub: Add support for info proc mappings Date: Tue, 27 Jun 2023 17:09:41 +0100 Message-Id: <20230627160943.2956928-35-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230627160943.2956928-1-alex.bennee@linaro.org> References: <20230627160943.2956928-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Ilya Leoshkevich Currently the GDB's generate-core-file command doesn't work well with qemu-user: the resulting dumps are huge [1] and at the same time incomplete (argv and envp are missing). The reason is that GDB has no access to proc mappings and therefore has to fall back to using heuristics for discovering them. This is, in turn, because qemu-user does not implement the Host I/O feature of the GDB Remote Serial Protocol. Implement vFile:{open,close,pread,readlink} and also qXfer:exec-file:read+. With that, generate-core-file begins to work on aarch64 and s390x. [1] https://sourceware.org/pipermail/gdb-patches/2023-May/199432.html Co-developed-by: Dominik 'Disconnect3d' Czarnota Signed-off-by: Ilya Leoshkevich Message-Id: <20230621203627.1808446-7-iii@linux.ibm.com> Signed-off-by: Alex Bennée --- gdbstub/internals.h | 5 ++ gdbstub/gdbstub.c | 45 +++++++++++++- gdbstub/user-target.c | 139 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 187 insertions(+), 2 deletions(-) diff --git a/gdbstub/internals.h b/gdbstub/internals.h index 25e4d5eeaa..f2b46cce41 100644 --- a/gdbstub/internals.h +++ b/gdbstub/internals.h @@ -189,6 +189,11 @@ typedef union GdbCmdVariant { void gdb_handle_query_rcmd(GArray *params, void *user_ctx); /* softmmu */ void gdb_handle_query_offsets(GArray *params, void *user_ctx); /* user */ void gdb_handle_query_xfer_auxv(GArray *params, void *user_ctx); /*user */ +void gdb_handle_v_file_open(GArray *params, void *user_ctx); /* user */ +void gdb_handle_v_file_close(GArray *params, void *user_ctx); /* user */ +void gdb_handle_v_file_pread(GArray *params, void *user_ctx); /* user */ +void gdb_handle_v_file_readlink(GArray *params, void *user_ctx); /* user */ +void gdb_handle_query_xfer_exec_file(GArray *params, void *user_ctx); /* user */ void gdb_handle_query_attached(GArray *params, void *user_ctx); /* both */ diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 697dd4bbad..6911b73c07 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -1327,6 +1327,36 @@ static const GdbCmdParseEntry gdb_v_commands_table[] = { .cmd = "Kill;", .cmd_startswith = 1 }, +#ifdef CONFIG_USER_ONLY + /* + * Host I/O Packets. See [1] for details. + * [1] https://sourceware.org/gdb/onlinedocs/gdb/Host-I_002fO-Packets.html + */ + { + .handler = gdb_handle_v_file_open, + .cmd = "File:open:", + .cmd_startswith = 1, + .schema = "s,L,L0" + }, + { + .handler = gdb_handle_v_file_close, + .cmd = "File:close:", + .cmd_startswith = 1, + .schema = "l0" + }, + { + .handler = gdb_handle_v_file_pread, + .cmd = "File:pread:", + .cmd_startswith = 1, + .schema = "l,L,L0" + }, + { + .handler = gdb_handle_v_file_readlink, + .cmd = "File:readlink:", + .cmd_startswith = 1, + .schema = "s0" + }, +#endif }; static void handle_v_commands(GArray *params, void *user_ctx) @@ -1472,11 +1502,14 @@ static void handle_query_supported(GArray *params, void *user_ctx) ";ReverseStep+;ReverseContinue+"); } -#if defined(CONFIG_USER_ONLY) && defined(CONFIG_LINUX) +#if defined(CONFIG_USER_ONLY) +#if defined(CONFIG_LINUX) if (gdbserver_state.c_cpu->opaque) { g_string_append(gdbserver_state.str_buf, ";qXfer:auxv:read+"); } #endif + g_string_append(gdbserver_state.str_buf, ";qXfer:exec-file:read+"); +#endif if (params->len && strstr(get_param(params, 0)->data, "multiprocess+")) { @@ -1615,13 +1648,21 @@ static const GdbCmdParseEntry gdb_gen_query_table[] = { .cmd_startswith = 1, .schema = "s:l,l0" }, -#if defined(CONFIG_USER_ONLY) && defined(CONFIG_LINUX) +#if defined(CONFIG_USER_ONLY) +#if defined(CONFIG_LINUX) { .handler = gdb_handle_query_xfer_auxv, .cmd = "Xfer:auxv:read::", .cmd_startswith = 1, .schema = "l,l0" }, +#endif + { + .handler = gdb_handle_query_xfer_exec_file, + .cmd = "Xfer:exec-file:read:", + .cmd_startswith = 1, + .schema = "l:l,l0" + }, #endif { .handler = gdb_handle_query_attached, diff --git a/gdbstub/user-target.c b/gdbstub/user-target.c index fa0e59ec9a..5f0098c806 100644 --- a/gdbstub/user-target.c +++ b/gdbstub/user-target.c @@ -11,6 +11,10 @@ #include "exec/gdbstub.h" #include "qemu.h" #include "internals.h" +#ifdef CONFIG_LINUX +#include "linux-user/loader.h" +#include "linux-user/qemu.h" +#endif /* * Map target signal numbers to GDB protocol signal numbers and vice @@ -281,3 +285,138 @@ void gdb_handle_query_xfer_auxv(GArray *params, void *user_ctx) gdbserver_state.str_buf->len, true); } #endif + +static const char *get_filename_param(GArray *params, int i) +{ + const char *hex_filename = get_param(params, i)->data; + gdb_hextomem(gdbserver_state.mem_buf, hex_filename, + strlen(hex_filename) / 2); + g_byte_array_append(gdbserver_state.mem_buf, (const guint8 *)"", 1); + return (const char *)gdbserver_state.mem_buf->data; +} + +static void hostio_reply_with_data(const void *buf, size_t n) +{ + g_string_printf(gdbserver_state.str_buf, "F%zx;", n); + gdb_memtox(gdbserver_state.str_buf, buf, n); + gdb_put_packet_binary(gdbserver_state.str_buf->str, + gdbserver_state.str_buf->len, true); +} + +void gdb_handle_v_file_open(GArray *params, void *user_ctx) +{ + const char *filename = get_filename_param(params, 0); + uint64_t flags = get_param(params, 1)->val_ull; + uint64_t mode = get_param(params, 2)->val_ull; + +#ifdef CONFIG_LINUX + int fd = do_guest_openat(gdbserver_state.g_cpu->env_ptr, 0, filename, + flags, mode, false); +#else + int fd = open(filename, flags, mode); +#endif + if (fd < 0) { + g_string_printf(gdbserver_state.str_buf, "F-1,%d", errno); + } else { + g_string_printf(gdbserver_state.str_buf, "F%d", fd); + } + gdb_put_strbuf(); +} + +void gdb_handle_v_file_close(GArray *params, void *user_ctx) +{ + int fd = get_param(params, 0)->val_ul; + + if (close(fd) == -1) { + g_string_printf(gdbserver_state.str_buf, "F-1,%d", errno); + gdb_put_strbuf(); + return; + } + + gdb_put_packet("F00"); +} + +#define BUFSIZ 8192 + +void gdb_handle_v_file_pread(GArray *params, void *user_ctx) +{ + int fd = get_param(params, 0)->val_ul; + size_t count = get_param(params, 1)->val_ull; + off_t offset = get_param(params, 2)->val_ull; + + size_t bufsiz = MIN(count, BUFSIZ); + g_autofree char *buf = g_try_malloc(bufsiz); + if (buf == NULL) { + gdb_put_packet("E12"); + return; + } + + ssize_t n = pread(fd, buf, bufsiz, offset); + if (n < 0) { + g_string_printf(gdbserver_state.str_buf, "F-1,%d", errno); + gdb_put_strbuf(); + return; + } + hostio_reply_with_data(buf, n); +} + +void gdb_handle_v_file_readlink(GArray *params, void *user_ctx) +{ + const char *filename = get_filename_param(params, 0); + + g_autofree char *buf = g_try_malloc(BUFSIZ); + if (buf == NULL) { + gdb_put_packet("E12"); + return; + } + +#ifdef CONFIG_LINUX + ssize_t n = do_guest_readlink(filename, buf, BUFSIZ); +#else + ssize_t n = readlink(filename, buf, BUFSIZ); +#endif + if (n < 0) { + g_string_printf(gdbserver_state.str_buf, "F-1,%d", errno); + gdb_put_strbuf(); + return; + } + hostio_reply_with_data(buf, n); +} + +void gdb_handle_query_xfer_exec_file(GArray *params, void *user_ctx) +{ + uint32_t pid = get_param(params, 0)->val_ul; + uint32_t offset = get_param(params, 1)->val_ul; + uint32_t length = get_param(params, 2)->val_ul; + + GDBProcess *process = gdb_get_process(pid); + if (!process) { + gdb_put_packet("E00"); + return; + } + + CPUState *cpu = gdb_get_first_cpu_in_process(process); + if (!cpu) { + gdb_put_packet("E00"); + return; + } + + TaskState *ts = cpu->opaque; + if (!ts || !ts->bprm || !ts->bprm->filename) { + gdb_put_packet("E00"); + return; + } + + size_t total_length = strlen(ts->bprm->filename); + if (offset > total_length) { + gdb_put_packet("E00"); + return; + } + if (offset + length > total_length) { + length = total_length - offset; + } + + g_string_printf(gdbserver_state.str_buf, "l%.*s", length, + ts->bprm->filename + offset); + gdb_put_strbuf(); +}