From patchwork Mon Jun 26 20:25:10 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: 696488 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3416812wrm; Mon, 26 Jun 2023 13:26:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6BBSocGVo2JN88JIgoJUEahX4yWz7CLYAxUQltktNZMYfdkYM7Kv0ZcKLyxhxOhjpcD9Uc X-Received: by 2002:a05:622a:1353:b0:3ef:2f81:7865 with SMTP id w19-20020a05622a135300b003ef2f817865mr38562337qtk.33.1687811205004; Mon, 26 Jun 2023 13:26:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687811204; cv=none; d=google.com; s=arc-20160816; b=YhkxR58/FP/+kM0LAgw2Fe53tY4PO53UiY9j9AeFfixyKFHJgHyi6jwSHrnsBNVy1w Yf+5iwyB7tepsw1Wdps4FAh84OTom/5HT+Ar4I2EaBwgQ/XOoWJtR6eyFnK6Y4voEl1z pjThXXT3zbt3SuIevc39wpDJ3vwOhOUZqM6wewX38TbvC3EXHzQTE5wBl93b505sT/M7 NYqrkF/N5FN5A2nmcWSPv4cKadG7Qc6kA2oYkrZRBHDEi2V6nK2V1cvXJDdRi/cWL0/5 I5KOl43nHyc/nV8nOCELXpHNVp5NaCYJdwoxcX7aTvOJLleCLmfPYgoGrOfeZnviQscW nwSA== 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=+72hqC9CJwo/HJv/dERzrbqiWQh1jGfkEiyYBAgNgqs=; b=vLyRcV9r2mHXSlmRWk2VCr5vNeOPtNoI4qgak5DUkmrE4MNJ0jIS9oGZtGpeOhlaIC QTurdyFmCVXw5fzX5SVfW7Fo8F9MUngc64UVRFDzahR74a0qKMVKS94JBBxPiL2dxtgX +BVrsecas8yQA3AIrCFh84Gq92sNddFmaZ90uXwkfJ/Ma20m3xkD8W42hEGR4uxAviQg nQ7/GtIeqH5Y3t8k6u3kt+dcygqsK8sdpQMOPCy+EHiy9sJtWVKJzE1fl5WCQtGF4rpt DTeuSoYbJeAy40OgNTWnnp3vpYPWJ7g0poep03WhnZl7EeBHEEwNoFkcTnJUSaVfbcfU 5caA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YNUvfeAs; 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 t19-20020a05622a01d300b003f39080fac5si2225942qtw.2.2023.06.26.13.26.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 13:26:44 -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=YNUvfeAs; 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 1qDsm8-0005eB-Cw; Mon, 26 Jun 2023 16:25:28 -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 1qDsm0-0005aP-Pe for qemu-devel@nongnu.org; Mon, 26 Jun 2023 16:25:22 -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 1qDsly-000550-Kh for qemu-devel@nongnu.org; Mon, 26 Jun 2023 16:25:20 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-313e12db357so4046618f8f.0 for ; Mon, 26 Jun 2023 13:25:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687811117; x=1690403117; 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=YNUvfeAsZnV6/D+m7nIKOhHvM//ambdKCHNu2NuJLqSCW6R7qjNRtBh8+1Gbbju8je 59akoxOgEOFIczhZCF5+VbHdwqnrEYHtPLAQkVcd8+1boQPAqo2RouW8Qw9Fq6zotyC+ TLOzwMpx/6hrBqKeiqqp3gyJO5XyDfOUduBi7VhiVr7USBEZCFZXkASoO1FLaQp5zGOo aZFY7OD6J5kyuwO7TjQMUY1o8t42EOwP66Vr+1SWi3ghxfn9kJJ1LOc+ZNymLFWeK2kK 3ypSMtE8kDpX1jaY57KCTDRryZuhgzixifvPbu5RzteEZh2kSemD0yhYTTl4qKRlzxRL NLqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687811117; x=1690403117; 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=EyRpdKxPB0T95ya3clLVxIziLbQLBdluhPWOGkEiLv9vdbII8K6rhIC+DwnEMkT3BO 3DP3jMoTKbp1GYObB2L0uNp11pJov1DxK16mpE9wEnCavHES7p54mNGICb85K0cCmgJE BYa5+/LwAFomDY4N0BuT/GFne8a7mvXmw+9X7l35JLscjc24V5u8OQGFf/Q5///XlDvK 5ZwcLvBq94BrWzabRAUCjBLivhiHVov9xcamaUOSROrBz0WI5kh7jvEytGZfABcPVDLl lSu1mu6fiWonAkbGqIyQwnAQX8qwnlUF/D5W+l/SCtzWRnfDMTJyewp+rJBS2aB/9ryR tRcw== X-Gm-Message-State: AC+VfDyF3+wRaOkmgTnWgYe/pGLZAsBR61bb7aLnbaUVX1EBhTD8hx3v H3aY6SBRCxNUnBoMQUQEQmLyUg== X-Received: by 2002:adf:efca:0:b0:313:f6fc:1f48 with SMTP id i10-20020adfefca000000b00313f6fc1f48mr1804084wrp.14.1687811117190; Mon, 26 Jun 2023 13:25:17 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v2-20020a5d6102000000b003127a21e986sm8193795wrt.104.2023.06.26.13.25.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 13:25:16 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3FA4E1FFBC; Mon, 26 Jun 2023 21:25:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Qiuhao Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Juan Quintela , Marcin Juszkiewicz , =?utf-8?q?Daniel_P=2E_B?= =?utf-8?q?errang=C3=A9?= , Eduardo Habkost , Alexandre Iooss , Peter Xu , Yanan Wang , Mahmoud Mandour , Peter Maydell , Bin Meng , Marcel Apfelbaum , Beraldo Leal , Richard Henderson , Leif Lindholm , Paolo Bonzini , Thomas Huth , Riku Voipio , Cleber Rosa , Alexander Bulekov , =?utf-8?q?Alex_Benn=C3=A9e?= , Radoslaw Biernacki , Bandan Das , Leonardo Bras , qemu-arm@nongnu.org, Darren Kenny , Wainer dos Santos Moschetta , Laurent Vivier Subject: [PATCH v2 1/6] gitlab: explicit set artifacts publishing criteria Date: Mon, 26 Jun 2023 21:25:10 +0100 Message-Id: <20230626202516.2507915-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230626202516.2507915-1-alex.bennee@linaro.org> References: <20230626202516.2507915-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 Mon Jun 26 20:25:11 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: 696486 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3416706wrm; Mon, 26 Jun 2023 13:26:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ62Q78ch2CaQCxPkcDVPdp6khp323u2Xx/87LjEqNFU+mB18tXIQlDVHfH62xMZl5PcFe5x X-Received: by 2002:a05:6214:489:b0:626:24c4:7d78 with SMTP id pt9-20020a056214048900b0062624c47d78mr39786933qvb.56.1687811192292; Mon, 26 Jun 2023 13:26:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687811192; cv=none; d=google.com; s=arc-20160816; b=DARJQfK+jT31W3gm5ODeRlReCK/7Fz18UfRFOLlZIb3FhFwr3QHPCfrd0sBFK8/AW0 gdAHYgNmAcUDhfA5RAuZQV14l89+hjjQHrhhIQR+wzDGdhmkLQ1n+jlBEpHcB823bDqA rvgIOqcYD6OKDdQf+qfxcT8AsMsyuXonTu1ZGiA36lJvCyVF2FwZbcDiM66LTBtJLL9/ Zu37Rv+2wgkCfmAG8WUkEia/GhfSs9W3UTqbH8fH8vSmbHQjhVo4SBxlFh34mFC4XaKC iwvdgSaXDPO4bpa3HCBwGyuf3wvznq1atNxBIjtwmwKKsMGHV47BaULMkIhHHJF1CQMK FScQ== 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=+72hqC9CJwo/HJv/dERzrbqiWQh1jGfkEiyYBAgNgqs=; b=un0QzhgGBZHEsR5OnrN/tmJt7E2XORT/vBKo/lrcw/XYu7nnrkP27Oo7qxVL14Rul7 0Eft7xtQuTXpSKwqMOlYt7Ohdb82t2oBQdkW5XWkPmfHJ3GY3IZ7/56GIEhAa0DccCLL iItf77z5HG/zkYWwFbZvuTUmk6J3cHlmNQlYGYGN1UmYzFAXeVpm2xB/wPr6v3E2N3HZ N2HiBjUnYqRfYcYMHzB5N+rAY7U1aTrOPJ7V90p/H8zx7D6OolQw3HqLx/1sosnW0pKN RhWoj6MqbO1Xl8rYB8Pgwi5keAShAVz2pVmFdzdv8jN/cmW7rbqZyveCW2iJ+SHf6F7g IpRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mDaGz5jU; 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 a1-20020a0562140c2100b0062fe439305bsi2385929qvd.219.2023.06.26.13.26.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 13:26:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mDaGz5jU; 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 1qDsmE-0005qp-Pc; Mon, 26 Jun 2023 16:25: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 1qDsm4-0005c1-DU for qemu-devel@nongnu.org; Mon, 26 Jun 2023 16:25:24 -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 1qDsm0-00055L-HE for qemu-devel@nongnu.org; Mon, 26 Jun 2023 16:25:23 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3fa9850bfebso12645155e9.1 for ; Mon, 26 Jun 2023 13:25:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687811118; x=1690403118; 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=mDaGz5jUFVjy4wOdgoQO36PtD35lqRYewem3qlYGLWlSMw4g92vVp3+pzFU9kXjrGe 2/wxdpneS/M8wT3ZS7KYOVdlXhblzKzMDr0FndcYO7CkgKjso5fQIUcQtnE/LuHCdhE5 WveJMKvEXqXyGzOGwRPCC8xkBnoWWQzWVIwRI3lycPzq6ie4lGUd4QufOZPkyvcfHPV3 Z+bnZ/RZKI8Fe/Lh/nAx3a0NJK7fFdvp3yRhVcWLAwZSFTefLL5cEe2Nk1Jo07Kvj/Ti aFM/H5HCWqVA9szm3t2lzLRp8T1N2ogbN+i0UEfqfuC66PZOdT0s5rYrWfbytqbDKfOn ahCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687811118; x=1690403118; 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=HUmCbIjtPzLPC9DEjYi3T+467btis2jR7YiWOQmEwEIylS2DZb1bo4VtrG8mCTrM/W TGAzJP4bB/Us+iDDOtZdnUBynbX00PDEh4CFTra0d8TaGIQl4C+azpn6gE0iGvpu4T97 D4kEf4UWQgcjTgHV9fv+NsN4RPBskPb2egX4X8Cxd4yonef+4SNer6wZ5BtP4nSsQYVv jJJW0T6vhU7RW7rGFCDLMqoeeQeU3MoCbDrK88Q6S17UmlXFkODhPXn1giDBYq4moKwc I5wbi438n/MKh8xmv9TGUWeOYwTa7RGbmt3NccA5ep3bO8h/3GZQG7lvf8u+CzQFQf6k JV2A== X-Gm-Message-State: AC+VfDwgItMVEAqnzXpCicMpYSQ1OGDnqU5GiFlep4prLKuxKowpBI4x 3QpVGrXhny65Jy7InAdITFGEgg== X-Received: by 2002:a7b:c409:0:b0:3fa:934c:8350 with SMTP id k9-20020a7bc409000000b003fa934c8350mr3236246wmi.27.1687811117937; Mon, 26 Jun 2023 13:25:17 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m5-20020a05600c238500b003f900678815sm8700257wma.39.2023.06.26.13.25.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 13:25:17 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 588C61FFBD; Mon, 26 Jun 2023 21:25:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Qiuhao Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Juan Quintela , Marcin Juszkiewicz , =?utf-8?q?Daniel_P=2E_B?= =?utf-8?q?errang=C3=A9?= , Eduardo Habkost , Alexandre Iooss , Peter Xu , Yanan Wang , Mahmoud Mandour , Peter Maydell , Bin Meng , Marcel Apfelbaum , Beraldo Leal , Richard Henderson , Leif Lindholm , Paolo Bonzini , Thomas Huth , Riku Voipio , Cleber Rosa , Alexander Bulekov , =?utf-8?q?Alex_Benn=C3=A9e?= , Radoslaw Biernacki , Bandan Das , Leonardo Bras , qemu-arm@nongnu.org, Darren Kenny , Wainer dos Santos Moschetta , Laurent Vivier Subject: [PATCH v2 2/6] gitlab: ensure coverage job also publishes meson log Date: Mon, 26 Jun 2023 21:25:11 +0100 Message-Id: <20230626202516.2507915-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230626202516.2507915-1-alex.bennee@linaro.org> References: <20230626202516.2507915-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=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 Mon Jun 26 20:25:12 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: 696487 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3416737wrm; Mon, 26 Jun 2023 13:26:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7UVm3WB4qlFZiqV1DH0VrLqHeTaxeJEf4fJlh4enYaGpO9dHWiw3dD0PJ/J2MqzL6uT6vK X-Received: by 2002:a05:6214:e84:b0:632:3633:700c with SMTP id hf4-20020a0562140e8400b006323633700cmr11687514qvb.6.1687811196225; Mon, 26 Jun 2023 13:26:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687811196; cv=none; d=google.com; s=arc-20160816; b=jYC0JOSJBdb1iri2oP6SW7Z3pv9OVQDP1FcroxYkmM0TBbltOrPS2AVzS+++isnRKy JU0Jzzucn9nMF0/iGVvIgZF1B/7ghO0Igfp5WJp9m9pOr0TNSEFTJMah+xoJ8P1huCyV EydBLe2bnUuVY+orWL4xH3ah/mYGTj1OdYpy2bKn7d1BrcY+0LDQomEhQrvFKrrQIyHd LKVsGNYJezW7N79oqdjagx6dZN1C+aJllvgKnlhHP5RZqqivfltILEQBE07jg/AWxfiF oOj6aWVsJ6WWTS5GMcpcqxv8wHooga7EjUpiDD/cdSGQDyqeFXHRnWW5fhIn8dLMmT/O KCXQ== 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=+72hqC9CJwo/HJv/dERzrbqiWQh1jGfkEiyYBAgNgqs=; b=YkonXgW27z+ndaZ+RbRd5UyJ2GrPhm/NNDgl6ZBaJx4r+PYm2AHKCisULMblF19+NM WghGF0in6VFKuv/yx3lc+xmupklXwkEDw2LzYjT77PC9dA/AMuMvbLkxP7/4LBMHacR6 tWxM+hbE1kfw5u8GfNowWZQPuovm+8xbExBKaAGxfO4eDNp3cVGyeZCZcJPLXg53Gt6x InKxvzGrNYx3LiI/9Z9TTEgkEGStZzoELlfEYDEdmv9votUAV6HX9Fn6iPXBgKOc2kg6 1MKdYbGCy2BozcOHCZlK4D3ZRjLCWEd9OCLfnBIrzGkb3h2mV3y5AWkZwEie40UFW/d8 3cFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MKK8zG4Q; 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 fn6-20020ad45d66000000b0062df3985dd3si2377417qvb.270.2023.06.26.13.26.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 13:26:36 -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=MKK8zG4Q; 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 1qDsmG-0005t3-JR; Mon, 26 Jun 2023 16:25: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 1qDsm5-0005d9-Bv for qemu-devel@nongnu.org; Mon, 26 Jun 2023 16:25:25 -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 1qDsm2-00055U-Fd for qemu-devel@nongnu.org; Mon, 26 Jun 2023 16:25:25 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3f9b4bf99c2so48109095e9.3 for ; Mon, 26 Jun 2023 13:25:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687811118; x=1690403118; 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=MKK8zG4Q7FCjDHFPB1PNyce92Z+i1ui3ci07HtDI7m+wTT0RlHMLS6r0aDFkF72QE5 H+pQ0lSDHUdeLayVAKcbKnxYElXJch5SO/dP5Yt9iJxhQbF6mVXofxD9wWa2HK1g5P6t g1DhYP/Mkl/0fNGbkQVgrLNuIMcJMFDAHUq5nPLlwKTKAvtYd7JWeTallz43Q8dT9Xq/ G88/YFGOX27hNy9ne85XSU1wzaXWVuBBAkNDvJ16205HzFv013U+52C1grVZHkl7/K52 kEoCG658XXoklxhW47HLz15LX0jylwmO6miqQVHRI44+oS25HaPzIqoUipbzvtf7aruS T4ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687811118; x=1690403118; 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=l3FCBXoJ2bX8KFyAQrnYr1c9wlBGD0r5Ddcx1jR7BZj5ZrLRqz+gm7qVPK5tvmOYnS bnogwRFVQxLlNF1Lym+pr7SQLYXGBg4J64uyt9QN/Wo0mrFQ++RXGV6EpC2NpocHui4J mUhTEYbnay9NDBAFQWUEcG6FpDRzIBRsBfA/aBeJrUtZZxjtrF7A+AQ/+fhBZjtKNvRD Nvtxll2Ly86R54Kq/KXXr46ZmsR6P0edqpw9A9j2iyt504z3ftbt+cOSfyJp0bql0LBP zJ73frTGpFcCIBI0MeLIyU+f/rHuFWdasPtY4Qf9y2hT34h95W0Cy/a6OZelnyYCFixJ 62OQ== X-Gm-Message-State: AC+VfDzvjrB3wg1/ovLAZjjMNzPt6tsag9Gk82ITMGSS6F0k7mPqBEd2 RsgLCzQXPt1fQDGyQUDXqg9JZA== X-Received: by 2002:a1c:7507:0:b0:3f7:678c:74b0 with SMTP id o7-20020a1c7507000000b003f7678c74b0mr22472542wmc.12.1687811118336; Mon, 26 Jun 2023 13:25:18 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id p9-20020a05600c204900b003f93c450657sm8626035wmg.38.2023.06.26.13.25.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 13:25:17 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 71B171FFBE; Mon, 26 Jun 2023 21:25:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Qiuhao Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Juan Quintela , Marcin Juszkiewicz , =?utf-8?q?Daniel_P=2E_B?= =?utf-8?q?errang=C3=A9?= , Eduardo Habkost , Alexandre Iooss , Peter Xu , Yanan Wang , Mahmoud Mandour , Peter Maydell , Bin Meng , Marcel Apfelbaum , Beraldo Leal , Richard Henderson , Leif Lindholm , Paolo Bonzini , Thomas Huth , Riku Voipio , Cleber Rosa , Alexander Bulekov , =?utf-8?q?Alex_Benn=C3=A9e?= , Radoslaw Biernacki , Bandan Das , Leonardo Bras , qemu-arm@nongnu.org, Darren Kenny , Wainer dos Santos Moschetta , Laurent Vivier Subject: [PATCH v2 3/6] gitlab: reduce testing scope of check-gcov Date: Mon, 26 Jun 2023 21:25:12 +0100 Message-Id: <20230626202516.2507915-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230626202516.2507915-1-alex.bennee@linaro.org> References: <20230626202516.2507915-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 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 Mon Jun 26 20:25:13 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: 696490 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3416925wrm; Mon, 26 Jun 2023 13:27:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ60kzfxPBV4/FQ4OJblWND8XFkTfkYwX7BEo41ka4sqcTa6Rv5FWYdZQu6p9N1t6uY9nf8J X-Received: by 2002:a05:6214:1c47:b0:5b5:9c2:8c29 with SMTP id if7-20020a0562141c4700b005b509c28c29mr29431648qvb.12.1687811224261; Mon, 26 Jun 2023 13:27:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687811224; cv=none; d=google.com; s=arc-20160816; b=dLJpaX8gIxyKz8BtARmP8wMC0eg2YgdN2fOLWrS9tmMAJp04nVAKmRbcJmxe2PtYsP HecZM1WKBG3RObHGdge99hSUR8rUT8BNDskY2fJEzPtn8p5r860ckNG1vQhxZygqs7da l27vJBjpVwPe33zZqPMtKbJEsZF8FbuCnuz4LnJ0WcLqrd7C5WnuxD+WXlXM9hH/2IGq rAyJFiwq+RXIxm/UdcUL95p53s/vkhQyAZ2ZFgYuwCV63UxH9Mtcl/Lp2pqHhDa0Txl9 M8WdQ4WukLilDo+qBd5l+3QKO96G132OtphfyBBJgiQpI9lzz+PnulI1tmOSl/XFSJGW L7og== 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=gTl3JKI/PjJECOcixmjK8XtvKaOol4SROZQjj0ROPbU=; b=ZujEf6VpTmOHFWmlLggeqpfhaVSRx0AgAxgBIE9FSoduwb24X7SC0eVCH3oC1vwEK0 LLw+HzIZaYusfLILFF5rhb/LBWGTlEp7TOaC4AHLv8Ez8ydz4uNZYycq91/i+6xZjCEJ C+1fB1b8aZNjIrd1s6Gq02JxPVTJb6cBjDjfPyQE7kael105rzqmckLj5juKh/23Wmfp UI8RbOkv8LayLsp3FLfqlrTSQTLhKNhTy2Xk/gGVKssWXc6nJfDHtq8BivzpDIVxo4bV MYVkYuy/2s2/dNvi/cW1l01KBVU9j5bdExZ3xdfJGk81OAymJw2OMBmWs2q7uznYUr5T Vn3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rlEhtYgZ; 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 ke21-20020a056214301500b006259b105384si482659qvb.515.2023.06.26.13.27.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 13:27:04 -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=rlEhtYgZ; 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 1qDsmH-0005uY-5a; Mon, 26 Jun 2023 16:25:37 -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 1qDsm5-0005dC-Ml for qemu-devel@nongnu.org; Mon, 26 Jun 2023 16:25:26 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qDsm2-00055Q-GH for qemu-devel@nongnu.org; Mon, 26 Jun 2023 16:25:25 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-313f3a6db22so1316646f8f.3 for ; Mon, 26 Jun 2023 13:25:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687811118; x=1690403118; 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=rlEhtYgZC/4LHm7w+Tx/oFBYOax+Ydar4y/83sQWoE7RAwC27lNK6f2/6Ivk8JHaOi NcgFkfqMY063tNjgm/xXa/Hi/zkMe5doCvIup/NeR0VgZKvXSjqlVweX9lVhPIuRXtEN fwlAbibbqsEsylWCB0a30oa1svi9ftwR81qm96uzN3m/l9KyKUT6Bv1RxI3PTOnBYL+u O3Iw5i3ApPy7SZEc1+n2hu0Ta1iD40h9oiDD1YhZV3CkmOEx5iEVL3hVcZiUJAiNerQr 3GVgWuemE3f6NBW86mxJmvx4vWQajYXYxyKOoAiiJxQnw2FAQmZpSOAKl06t31zmQoIe 7jZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687811118; x=1690403118; 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=ZHKAFHEUYsc9lyDayCIX9E8r3fDeuSj1OCkSFpYF2tvrbzHh9xoYMhcidrzFKPvuZl Co37SYRLjVFssr0gnH20h3zFRnceg4gtZ1ZFielSeVMSAfIsaEaMol5dKjnTm8NJZcQQ ailZrFDIyrIJXYnk97C0qDJsoHrIA0yBBcypmMqSBGEiFvBFKYB2vzknyosVrBZcTtLw kVkHjAHpyVcJE+CUTQQ1LbpQg1OCEI4Sg+cFSd17SRJVnbc8j4PnH6f7kxYPIrda0SJe p5IvJlLH8DR1nPU/m3S/EDmmQMcxbVRwvnwynLUlHpIYKv4J9D1m4Mn6bxdkVEOh9pgd 4TQw== X-Gm-Message-State: AC+VfDxZgVBxZpNuWlzy8M+MMlIvtZBu/iHMV/xZyknYPKYSqtUiNp7m Wjgpv9gUPg/IYDPA4yDg1JCo3w== X-Received: by 2002:adf:f711:0:b0:313:e553:b858 with SMTP id r17-20020adff711000000b00313e553b858mr5694878wrp.33.1687811118166; Mon, 26 Jun 2023 13:25:18 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o10-20020a5d58ca000000b0031128382ed0sm8283322wrf.83.2023.06.26.13.25.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 13:25:17 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8A25F1FFBF; Mon, 26 Jun 2023 21:25:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Qiuhao Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Juan Quintela , Marcin Juszkiewicz , =?utf-8?q?Daniel_P=2E_B?= =?utf-8?q?errang=C3=A9?= , Eduardo Habkost , Alexandre Iooss , Peter Xu , Yanan Wang , Mahmoud Mandour , Peter Maydell , Bin Meng , Marcel Apfelbaum , Beraldo Leal , Richard Henderson , Leif Lindholm , Paolo Bonzini , Thomas Huth , Riku Voipio , Cleber Rosa , Alexander Bulekov , =?utf-8?q?Alex_Benn=C3=A9e?= , Radoslaw Biernacki , Bandan Das , Leonardo Bras , qemu-arm@nongnu.org, Darren Kenny , Wainer dos Santos Moschetta , Laurent Vivier , Ani Sinha Subject: [PATCH v2 4/6] docs/devel: remind developers to run CI container pipeline when updating images Date: Mon, 26 Jun 2023 21:25:13 +0100 Message-Id: <20230626202516.2507915-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230626202516.2507915-1-alex.bennee@linaro.org> References: <20230626202516.2507915-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: 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 Mon Jun 26 20:25:14 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: 696491 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3416939wrm; Mon, 26 Jun 2023 13:27:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5CkzmIcK1wzXQ0DFLdbFiRBGjcZD6iXo3S4g/U8WZVklSW/DIrqb8FJrUSjgjE5maIIGcs X-Received: by 2002:a05:620a:290b:b0:765:7957:1b06 with SMTP id m11-20020a05620a290b00b0076579571b06mr8156454qkp.10.1687811226793; Mon, 26 Jun 2023 13:27:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687811226; cv=none; d=google.com; s=arc-20160816; b=aTm4/F0XLPOZXHVDmCm60HJwsycYOGr939/IDdetJB7UqLdBraLNyox8N5siYnz8kH DyDFoEDWWRf+tW5+atiH+ca61fuV46m/v29ZmTI/iHh+ymIKGXuni8XH2b4n8zQCUAPy SUNr+MR2rl7+YDB8hAzceOYZARXsylhjsw4Ow6cIWHbBeyLZpKObT/+MmHjMYfLNfPNj 2WrXl8j37num9eWCN221FziXRPxoNS5Q25Hhto5Urpo6tZ0lEPs2KKGj3nWi4kasfR5s yq7buCf/8HMaAGfBys+iyr6/6HVO+aZnrZiv5Vxsvm3thE84HNNi45lcQPesfZyW/QLO M+zQ== 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=+72hqC9CJwo/HJv/dERzrbqiWQh1jGfkEiyYBAgNgqs=; b=bg7o1F2QmwDAixLfbwxQELLPxwUNd4h3tO5RYNEBreDMSpGMKrTkcdHW2bExw4CSJJ cuvd7UbSG81WWo+oVtNY3FwNdOXC+7gf6hXZ9RsoaeZ+3igP18aJ2s+zfUzCBbr3+Jo2 CyHIHhDWO6A4p9FkfVlN+HmsqK8eNdBiJ24IBlqs0bAxpklOCLvkaxCIyak1k39e2/e3 4yiFItAVhPOnHgk9RBnmoSh6sQBe+Zxgi+TeTv0+ajyiXtN4J2qXe3xbtaACl1gt1yU+ 6j7Ts4QqtokqdP0FPzwD5QWxg4BhB8OSYYN4qGdgTFnhHw4iWvOChFg3i+6xu3gglhht N3Mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rVhts01U; 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 g11-20020a05620a40cb00b00763d326cf39si2275400qko.266.2023.06.26.13.27.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 13:27:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rVhts01U; 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 1qDsmI-0005za-0F; Mon, 26 Jun 2023 16:25: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 1qDsm5-0005dA-CW for qemu-devel@nongnu.org; Mon, 26 Jun 2023 16:25:25 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qDsm2-00055s-Fy for qemu-devel@nongnu.org; Mon, 26 Jun 2023 16:25:25 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-313f58d6652so1159649f8f.2 for ; Mon, 26 Jun 2023 13:25:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687811119; x=1690403119; 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=rVhts01UgxFKWFD6Ed4/uRW1uKUHrgq1waUaAUJ8PfdUVhVgqj0Q+O29ZeoatrHHzU GTvAGqOIXa9E04Oc2E+7hYhS6SGrAHr4CGtKP/ZD9Ba2te6FcxLvqWwA89RC59gemeZy fvUJN5vb1K25J4O0o8Vp+KG4Fhy+/qdMf1fageBgCXmcY02ds5cKfemzuT+qs1lvD1JD WOuqkBcOgG+j47RjOntogoNo7nHYTvylQXlxm3QB/gEy05FQpsWwPiiZAwJTyfkNjp3v w+TTbIP9XhbnTXABqIMEjMat3q90y3FkKOzXK+of7I5rkZQjZKYIVgr5VhTErui/DAHQ rtxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687811119; x=1690403119; 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=iTf1Fra3/3OmIBJ7Yl9wmP2+/6D1GGDxDUQJQrAr2ULuV7H5yuRdKNlKFNwgfUkvM/ +75OUXaRS5bs7UryI/ZiFgshl98rnB+7KOufUxNJhC56i5dlBkzEHAWHtaLeGPJ4Iv7N pyTShvBt7JLw1/5v2stVKr1AFLkD+w9jCQ/qUT1gcChYvma4R+a0IlmpbuU5k0TadswU 8V3FIEIsCZPxmLU99E488vMMyBaQfPPOVdHZDPV6XQs7DW6E0TseUXAryy6VTMoQkyDI YUmPKB8zGgqHgihi9I9PCtxHoe+fZrpX05bzdHFDnERJyPMZW2ed0Cwm2o2GKvhhMdhw iBWA== X-Gm-Message-State: AC+VfDzZ5CYW5mx5JnBoh1yrWjtxDmdkZYVU1jns2fN91tNAT6G/9Sme E5aqwa+a2AYmVLVfn9Zs2KkYpA== X-Received: by 2002:adf:f752:0:b0:313:f54a:a842 with SMTP id z18-20020adff752000000b00313f54aa842mr2067793wrp.63.1687811119177; Mon, 26 Jun 2023 13:25:19 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id t24-20020a1c7718000000b003f91e32b1ebsm11506372wmi.17.2023.06.26.13.25.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 13:25:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A447E1FFC0; Mon, 26 Jun 2023 21:25:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Qiuhao Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Juan Quintela , Marcin Juszkiewicz , =?utf-8?q?Daniel_P=2E_B?= =?utf-8?q?errang=C3=A9?= , Eduardo Habkost , Alexandre Iooss , Peter Xu , Yanan Wang , Mahmoud Mandour , Peter Maydell , Bin Meng , Marcel Apfelbaum , Beraldo Leal , Richard Henderson , Leif Lindholm , Paolo Bonzini , Thomas Huth , Riku Voipio , Cleber Rosa , Alexander Bulekov , =?utf-8?q?Alex_Benn=C3=A9e?= , Radoslaw Biernacki , Bandan Das , Leonardo Bras , qemu-arm@nongnu.org, Darren Kenny , Wainer dos Santos Moschetta , Laurent Vivier Subject: [PATCH v2 5/6] tests/tcg: add mechanism to handle plugin arguments Date: Mon, 26 Jun 2023 21:25:14 +0100 Message-Id: <20230626202516.2507915-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230626202516.2507915-1-alex.bennee@linaro.org> References: <20230626202516.2507915-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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 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 Mon Jun 26 20:25:15 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: 696489 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3416921wrm; Mon, 26 Jun 2023 13:27:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7Cqwk/jV0pSyYzXvKB7MYmhg+H9jcXLmuYsJXSmMONqnP8Wv2KvYDZb2OAXbdNS/uG+bGB X-Received: by 2002:ac8:7d03:0:b0:401:dfdf:e42a with SMTP id g3-20020ac87d03000000b00401dfdfe42amr2336437qtb.2.1687811223197; Mon, 26 Jun 2023 13:27:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687811223; cv=none; d=google.com; s=arc-20160816; b=EwLTaIdRhrVWhjLPnfHflUCjJ1z5lIHAHD/brsfbXuu+o7wqqemVDQ4pcn72kHM6sn IHMqkL93iyCq1JAtpGcrXNXAMfvdX9waestW4+A5Z2oolBkAL+dwocEs6bI1JFoDl/Gy GYlYFcB7bFogEyuMDPgmxqgtZb2vFfzT5+6lGgsQme7PMKaRVs7Moao7zdjtI7TODu8r PwV8tscZOPBVO2FTGP0CiBsmvgJBgj5LWqocEwcziP/U/BM2O5M9V2JYqI9ZvuQxjWYj 8bpAAzpifiAe/JRf4yCJ3ta6F/uvHszEMkVG2px+21Ta0Bj01b15z1B7GbU90NV7j9yC hf0A== 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=UiwEwjAi6lomr9E2iVsjR5pQJHgLNYXOTgd+ktx/cfE=; fh=+72hqC9CJwo/HJv/dERzrbqiWQh1jGfkEiyYBAgNgqs=; b=wJ0QgthmKQDbfVqhimfhVBbLM26447EkewBQiWfOfisTXhavPh6ET4Py5K2x3gYlZD jFaBoTFIIFWQ47QpWy7t7y9VMv/vEjCJi34Hnl+gw0/QNm+sXX3/ZcciJyUkXCnKVXTp 79Oqfk9rZMESwkOVELlo9949zSM0oAFXlUrXhb8PW6VCBH79PkEeMVhKtZY2dlQJZmKd ObLAQnC/Hqns1VOXd7aKmyG4UP2I1cCTAIe5QhvHbfmJugCTVL3igyv/zIHwYR4v6CL6 jtr4AbjHrcEQ+UqFXd5AxS86NOuNZR9EKtmpOEGrz5mrHdx9fKu6vz3UByvrVt5KFKj+ qVmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iu7d9Ue0; 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 l15-20020a05622a050f00b003ef41417024si2294650qtx.562.2023.06.26.13.27.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2023 13:27: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=iu7d9Ue0; 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 1qDsmH-0005te-2R; Mon, 26 Jun 2023 16:25:37 -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 1qDsm5-0005d7-7P for qemu-devel@nongnu.org; Mon, 26 Jun 2023 16:25:25 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qDsm2-000567-G4 for qemu-devel@nongnu.org; Mon, 26 Jun 2023 16:25:24 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3fa7cd95dacso46160795e9.3 for ; Mon, 26 Jun 2023 13:25:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687811119; x=1690403119; 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=UiwEwjAi6lomr9E2iVsjR5pQJHgLNYXOTgd+ktx/cfE=; b=iu7d9Ue0an7YMNwlflrR3yzAETx5HgQUv/Y6Q+TSzzSQi8fCCUPoGxY7yBeG+hIYZU OZ0O5i4OVltg1k5l5sHWoog895CzR9B/aIct82pQYJnwmT2X59KBk6RxJ8TijccdiHCq hVCSMAqrRr9mddIjOUFVs0rJHNWVDlzosPymLYNwdqTvSmVxbmYyoAF+7LnR6UUgfPNX 7euKiM18I4M9wQpbcmyQH6ku9kDE4XGwjxR0O/VvuyDd48iFA/9JriKUf1Sh7cHWoB8g zBKmpkXflTAYgihJ8AIYSNmD1MUR/sdy4waXf2RQFBM0IzzzKAUkOUqez4/d4snknyWk i4dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687811119; x=1690403119; 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=UiwEwjAi6lomr9E2iVsjR5pQJHgLNYXOTgd+ktx/cfE=; b=MJJZ1Sxno1j8S9o7ZCAd1GuItj0cUXYwr5EVo5iUvoPlzIXh77+827NnURwiqMH8cW VP0yZBE+U/+A3Tx2vjneJlwm7XA/CRA3yA+QFEt8jUZEpmpFa83Rg6gpD5z3H9AwZkQ9 fudffK45f7+nCX290mRrwskOBZUUyBTLGsX7L+lx+zizN4XymYh2/XX74mtP22R//PMw rhI75nIR6N+U3kCadzkSWEv99QsqafkDVpJPHq3i96WmEqdg3V+jiPy3qLOQKCAPaQRw x7W7YlNX1Eah6TaXz8mxTqE5lPrentn2k0CID602wOfsLK2Lje+dPO5+KYHAudJlnL4u lhMQ== X-Gm-Message-State: AC+VfDzkqD60sFh4CF+Unt4GfoCV5HRKfz2AtkssiFnDFGUpz5mgD9I3 8nFehB5J27veWoyZF6f7JLKXFg== X-Received: by 2002:a1c:7c04:0:b0:3fa:85c6:57ff with SMTP id x4-20020a1c7c04000000b003fa85c657ffmr5796679wmc.16.1687811119406; Mon, 26 Jun 2023 13:25:19 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id f10-20020a7bcd0a000000b003fa99969e61sm3018272wmj.45.2023.06.26.13.25.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 13:25:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BBFB31FFC1; Mon, 26 Jun 2023 21:25:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Qiuhao Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Juan Quintela , Marcin Juszkiewicz , =?utf-8?q?Daniel_P=2E_B?= =?utf-8?q?errang=C3=A9?= , Eduardo Habkost , Alexandre Iooss , Peter Xu , Yanan Wang , Mahmoud Mandour , Peter Maydell , Bin Meng , Marcel Apfelbaum , Beraldo Leal , Richard Henderson , Leif Lindholm , Paolo Bonzini , Thomas Huth , Riku Voipio , Cleber Rosa , Alexander Bulekov , =?utf-8?q?Alex_Benn=C3=A9e?= , Radoslaw Biernacki , Bandan Das , Leonardo Bras , qemu-arm@nongnu.org, Darren Kenny , Wainer dos Santos Moschetta , Laurent Vivier Subject: [PATCH v2 6/6] qemu-keymap: properly check return from xkb_keymap_mod_get_index Date: Mon, 26 Jun 2023 21:25:15 +0100 Message-Id: <20230626202516.2507915-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230626202516.2507915-1-alex.bennee@linaro.org> References: <20230626202516.2507915-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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 which rightly gets flagged by sanitisers as an overly wide shift attempt. 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);