From patchwork Thu Mar 30 10:11: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: 668603 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp846540wrt; Thu, 30 Mar 2023 03:13:39 -0700 (PDT) X-Google-Smtp-Source: AK7set+cVTsbZ2YtaCFnf3Q9cxc+pJ6H2ck77XGwg6x/ISftzW7qzfkZuBo7CjUh2ZcohMKiCq42 X-Received: by 2002:a05:622a:1193:b0:3d5:3a1b:61c8 with SMTP id m19-20020a05622a119300b003d53a1b61c8mr35997329qtk.44.1680171219380; Thu, 30 Mar 2023 03:13:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680171219; cv=none; d=google.com; s=arc-20160816; b=kRnZCimMP6rgYpPXYP3mNu4xBX6fJQglIJpoS4fpUcTNvnwlg7+lFkbaU56Q2eEDuQ Ihd6LpSOcEy4GKsIx4v1h7SNhLi0VKMKBujah4JQ3ya/4hZ/sup6J29hUHjhJ5hJbovE lgigMdlbwsKtONFffI2URl/CCX2KERpPYDqSFNXHtUA9EXZ5e5VzqEa4r8zQSRygArfc IQzIWqavTfsubhq/hdoGK3dv/2kkYFshoBG9LOpdx+K+Y1opgYTyGwzWzG+6a0xxEeWZ OlGR1f+ucjO5g6CpyQP64//wqrczitBheygqbxAsLipzeWebkVQOHNriQQZfpkKj6mAz KGfA== 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=pw6jPJryQU4Hi2TWQbCO6wgO0LKOGybnyV0PPfRx55k=; b=fZlIaHw1b3qU76SVKmDdyfez/eOmTN0rEfl8cwl9QSeSUi6vHibhLbGU2X76WycvpW tzNnJGHKMY4HhD5b6K95YHRRy2NE8/y0DM4QZn8eYswR1g6qZkTQ/FZDY9WYEzZD/1ak xfIqPXaJOxBYqaa5S85Ghm5qJYGOggyeHj1S4EqxXDGc/XaGJnw5291O1m++QO//45K6 rp83CZX3tUdmBVjp3vvta8o14JxE83nTYn0ew4V33IDaMLsarBw+wis2aIDCWZb3fjor Ff2a8O1S18RjtsfzifSD2F/NRXLihVQ3J45jauPvht3uCj64vxZ2eohKKTKlQncGzwJc +2eQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lkqPKwND; 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 o11-20020a05622a044b00b003b8685dfa2bsi17517315qtx.386.2023.03.30.03.13.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Mar 2023 03:13:39 -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=lkqPKwND; 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 1phpG6-0007Wm-DO; Thu, 30 Mar 2023 06:11:54 -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 1phpG0-0007Td-7u for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:49 -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 1phpFw-0000H0-Iz for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:47 -0400 Received: by mail-wm1-x32b.google.com with SMTP id s13so10542748wmr.4 for ; Thu, 30 Mar 2023 03:11:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680171103; 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=pw6jPJryQU4Hi2TWQbCO6wgO0LKOGybnyV0PPfRx55k=; b=lkqPKwNDmg+UG9IzrG4YkOoZgYMcrCHCjnYLbteEL/fQsRbUoVtixN42H2J8FPjEmG N2JlifGMMdnvP8eZHiprnejbBosirRqTHlHhqyZg7Kv+rCPYm/0MdPqKeMPyeSahUxKF 8dIOVJTAVkLwI1qM3BCmjw6FuS+OpErrukpzeJ7KFYV39GPfWWrDn4NB1s4Q28nT9KyR 4lx8/R5g3Y+NS1T24wm146fgxHf50j4c9B+t0ZnUlQUfdlI/4BpD7qv8B4jTJAqTNnM+ deY0+mFnZvGfZEx6p3bHdfScobAAN/qjorUPG67Am5E80NuzmGmcfuUDy0xcTMaSh+EJ 8JYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680171103; 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=pw6jPJryQU4Hi2TWQbCO6wgO0LKOGybnyV0PPfRx55k=; b=lQz1bi4X4kqvDkAt20t9VidYvzhZ88Imdpbv2VfiEBkLU8vEzn6yOZfFkRYy7xMLcP h5S6Wx6CpggC/zhGTqNVGLYAV3ctrQpsHacIXCpBizdnjJVlbm9KuEhV2fj9nlKBdrN5 fpSTjMQBdyMx3iM3WKIu1dLf6mNnf7CwxRqQqAK6rlmtRL4ufn5p4A0avsKJHZGa/xac jUB4WN5NaeqSck0zh+t7sqMPkm7uv6eWgVLWytm7FC84J2zQz6a4khlACHOKMrzkV/BQ nLxP1UsC3cXQZj3JJun9XD/U5t1UvesrFyaUZZpQLSPQ0rlykdh3myiNNfApVW8V2DXp WtpA== X-Gm-Message-State: AO0yUKUStG0+HyKZDdfgHyrS72GcYLkQtCJFACQnS2G7nzfGzBKUojGr tcgtmGao3nyAulgIlPGIEwnWnA== X-Received: by 2002:a05:600c:b54:b0:3ee:36f:3485 with SMTP id k20-20020a05600c0b5400b003ee036f3485mr17582082wmr.8.1680171102954; Thu, 30 Mar 2023 03:11:42 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m1-20020a05600c4f4100b003ef5b285f65sm5633643wmq.46.2023.03.30.03.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 03:11:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 39B6D1FFB8; Thu, 30 Mar 2023 11:11:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Ryo ONODERA , Kevin Wolf , Beraldo Leal , Wainer dos Santos Moschetta , Hanna Reitz , qemu-block@nongnu.org, =?utf-8?q?Philippe_?= =?utf-8?q?Mathieu-Daud=C3=A9?= , Kyle Evans , Reinoud Zandijk , Kautuk Consul Subject: [PATCH 01/11] scripts/coverage: initial coverage comparison script Date: Thu, 30 Mar 2023 11:11:31 +0100 Message-Id: <20230330101141.30199-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330101141.30199-1-alex.bennee@linaro.org> References: <20230330101141.30199-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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 a very rough and ready first pass at comparing gcovr's json output between two different runs. At the moment it will give you a file level diff between two runs but hopefully it wont be too hard to extend to give better insight. After generating the coverage results you run with something like: ./scripts/coverage/compare_gcov_json.py \ -a ./builds/gcov.config1/coverage.json \ -b ./builds/gcov.config2/coverage.json My hope is we can use this to remove some redundancy from testing as well as evaluate if new tests are actually providing additional coverage or just burning our precious CI time. Signed-off-by: Alex Bennée Cc: Kautuk Consul Acked-by: Thomas Huth --- v2 - add MAINTAINERS entry --- MAINTAINERS | 5 ++ scripts/coverage/compare_gcov_json.py | 118 ++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100755 scripts/coverage/compare_gcov_json.py diff --git a/MAINTAINERS b/MAINTAINERS index ef45b5e71e..9e1a60ea24 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3908,3 +3908,8 @@ Performance Tools and Tests M: Ahmed Karaman S: Maintained F: scripts/performance/ + +Code Coverage Tools +M: Alex Bennée +S: Odd Fixes +F: scripts/coverage/ diff --git a/scripts/coverage/compare_gcov_json.py b/scripts/coverage/compare_gcov_json.py new file mode 100755 index 0000000000..451e2f8c00 --- /dev/null +++ b/scripts/coverage/compare_gcov_json.py @@ -0,0 +1,118 @@ +#!/usr/bin/env python3 +# +# Compare output of two gcovr JSON reports and report differences. To +# generate the required output first: +# - create two build dirs with --enable-gcov +# - run set of tests in each +# - run make coverage-html in each +# - run gcovr --json --exclude-unreachable-branches --print-summary -o coverage.json --root ../../ . *.p +# +# Author: Alex Bennée +# +# SPDX-License-Identifier: GPL-2.0-or-later +# + +import argparse +import json +import sys +from pathlib import Path + +def create_parser(): + parser = argparse.ArgumentParser( + prog='compare_gcov_json', + description='analyse the differences in coverage between two runs') + + parser.add_argument('-a', type=Path, default=None, + help=('First file to check')) + + parser.add_argument('-b', type=Path, default=None, + help=('Second file to check')) + + parser.add_argument('--verbose', action='store_true', default=False, + help=('A minimal verbosity level that prints the ' + 'overall result of the check/wait')) + return parser + + +# See https://gcovr.com/en/stable/output/json.html#json-format-reference +def load_json(json_file_path: Path, verbose = False) -> dict[str, set[int]]: + + with open(json_file_path) as f: + data = json.load(f) + + root_dir = json_file_path.absolute().parent + covered_lines = dict() + + for filecov in data["files"]: + file_path = Path(filecov["file"]) + + # account for generated files - map into src tree + resolved_path = Path(file_path).absolute() + if resolved_path.is_relative_to(root_dir): + file_path = resolved_path.relative_to(root_dir) + # print(f"remapped {resolved_path} to {file_path}") + + lines = filecov["lines"] + + executed_lines = set( + linecov["line_number"] + for linecov in filecov["lines"] + if linecov["count"] != 0 and not linecov["gcovr/noncode"] + ) + + # if this file has any coverage add it to the system + if len(executed_lines) > 0: + if verbose: + print(f"file {file_path} {len(executed_lines)}/{len(lines)}") + covered_lines[str(file_path)] = executed_lines + + return covered_lines + +def find_missing_files(first, second): + """ + Return a list of files not covered in the second set + """ + missing_files = [] + for f in sorted(first): + file_a = first[f] + try: + file_b = second[f] + except KeyError: + missing_files.append(f) + + return missing_files + +def main(): + """ + Script entry point + """ + parser = create_parser() + args = parser.parse_args() + + if not args.a or not args.b: + print("We need two files to compare") + sys.exit(1) + + first_coverage = load_json(args.a, args.verbose) + second_coverage = load_json(args.b, args.verbose) + + first_missing = find_missing_files(first_coverage, + second_coverage) + + second_missing = find_missing_files(second_coverage, + first_coverage) + + a_name = args.a.parent.name + b_name = args.b.parent.name + + print(f"{b_name} missing coverage in {len(first_missing)} files") + for f in first_missing: + print(f" {f}") + + print(f"{a_name} missing coverage in {len(second_missing)} files") + for f in second_missing: + print(f" {f}") + + +if __name__ == '__main__': + main() From patchwork Thu Mar 30 10:11: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: 668599 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp846358wrt; Thu, 30 Mar 2023 03:13:15 -0700 (PDT) X-Google-Smtp-Source: AKy350bdkG9HWbrn4ERfzM1JwBy+CG+3bkOhlSRxWhhtjVT9Frxfw3t0ol1FJxDUQzpagrBVNKwn X-Received: by 2002:a05:6214:21e7:b0:577:6271:a05d with SMTP id p7-20020a05621421e700b005776271a05dmr7742793qvj.3.1680171195553; Thu, 30 Mar 2023 03:13:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680171195; cv=none; d=google.com; s=arc-20160816; b=TEypj0qHzEQF8z0G44Tog4dFR1o/R9Z1wgKHHB0vtnnnuNmObZuh3xAmcsTi+mHu2o 5p0siRYuWrAd+iuYfWsTrBA3CvxayG7IuPotPMdXNcbRQxtuj7FIolHdWTKH51vD1Tjb IeGv7VWyKTGyIFKEoylWdAJbjciCy5PwHaekH2IhenSh3IJGRW3hPNkplLKvc2oHVzc8 TScoIFnZKxIq9bILRyXTvhEx3+Kjv3fyXKIUO/HG1njRKoCTNYSTVPPQM79aIsQImIFh PN9bqiiipeEChCIi4t7sIJ4zULoybZmi7YqWNyc4h0ZEkPYb+ssg2o2BF89mc0eiqzkO W9DQ== 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=9EeSooF4vWtasfO3UieZQyg/ZkCQICRVf9Cy1Gc/nIM=; b=rTXnOuwnlNs9eTvGXGO91z2PPi0fcIfGWVllBKME5Uyo5H/lOwh7iTqA1khAsUsbmW M8qH/cifRZqHJNRvUl6IlhFNpIcA5OD81NiL5AgfcJyy78KyAhu1GVZ+Jfk13x1PaSgh C5ZL+q8Ku+DEVm6HS4BrQhKTfquHIkMLZqqFRhpL3FpJ60Hb4umB2vYHn3Fpw20KarF/ g4c0m+VieIqPY1wYMpt0rbHa1+bynJBkmVZZtyeNEJAk8rOZa71DvO2sgQF3jD1o8A4C /byxVu1HWcnbuS1HatLpF43NVQeVwf7413Qh3uZd4NobBj/ZVTRoZx1t4vF3tcAQer6U Xp2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=L3uS5Wou; 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 b6-20020ad45186000000b0056ee955106esi23312971qvp.260.2023.03.30.03.13.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Mar 2023 03:13: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=L3uS5Wou; 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 1phpG6-0007Wh-D3; Thu, 30 Mar 2023 06:11:54 -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 1phpG0-0007Te-8B for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:49 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phpFx-0000H6-K5 for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:47 -0400 Received: by mail-wm1-x32d.google.com with SMTP id bg13-20020a05600c3c8d00b003ef90adc168so3626697wmb.5 for ; Thu, 30 Mar 2023 03:11:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680171103; 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=9EeSooF4vWtasfO3UieZQyg/ZkCQICRVf9Cy1Gc/nIM=; b=L3uS5WouIDODBXjnB4XpitUQTTWK8HPvEU6wSV1m9m4gKlzgSzERTQkqFVDl4aHuRd gvogsYDpjMEaWgfXj9g1t4lODyvJmotdAAGc5ZCER0sB5WSv/W86qWDWE9oRHAaP6d+l zC+/H+AQbmvGgG7efISh3wQCnJqh5G02x0YLRBxfpCahREyXEkGsDDDKLf5jeQgU4Y6R diwcoZVgumIoZzYZtz2oHNjSsGIu/7S7T/WaWgbFMcp15xbmY9YsPRN4FZ7bN6unsSS1 1rObsC4IzCKmO1lF8rSdpNhVRAwUtsbdArWRDGg6r+Y9eZdPQ5URBB3WpRKASU+wrcdc Cmiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680171103; 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=9EeSooF4vWtasfO3UieZQyg/ZkCQICRVf9Cy1Gc/nIM=; b=bvkzFEswkXNQU8QnK72aJhzrwrkFgxpwB67cvU0mNrFd6brCnFx4S/n6/SykbDsoS2 qVzFCXTsRb124hwDiWP+S9HW3jeCekMR8BFI4Z5Iy9K+6Px5DGcn1ZLV4sZD1Tv9gGjt 1N2pV3yiP+zigO6KDoQtRGjKSUv7yTkHBaJ7EP9/5OoQ3zVqq+dUY/wWOYCRY8XQTG2N Muu3T/36zDyDy7y3F+y7IPAefUHY5U3OK2VNKJzcFcbzMmha4+Su51o2NfCyqpfdSbgN xd0SerZ6psXsa+uanqffUpdV13iPtAC5k99MM2xfaLuo1mfphPVxRzgHnJnOwbzfDJtM XqBg== X-Gm-Message-State: AAQBX9eSL3iqHl26I9f7AylMj1h/eNKA8mHolqB0n7m2rzesPW5wDeHG wlslOzHxnRr/b8VNmBY43cDEBQ== X-Received: by 2002:a1c:cc1a:0:b0:3ef:622c:26d3 with SMTP id h26-20020a1ccc1a000000b003ef622c26d3mr13900587wmb.35.1680171103174; Thu, 30 Mar 2023 03:11:43 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id h16-20020a05600c315000b003eda46d6792sm5679332wmo.32.2023.03.30.03.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 03:11:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 50ED01FFBA; Thu, 30 Mar 2023 11:11:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Ryo ONODERA , Kevin Wolf , Beraldo Leal , Wainer dos Santos Moschetta , Hanna Reitz , qemu-block@nongnu.org, =?utf-8?q?Philippe_?= =?utf-8?q?Mathieu-Daud=C3=A9?= , Kyle Evans , Reinoud Zandijk , Richard Henderson Subject: [PATCH 02/11] gdbstub: Only build libgdb_user.fa / libgdb_softmmu.fa if necessary Date: Thu, 30 Mar 2023 11:11:32 +0100 Message-Id: <20230330101141.30199-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330101141.30199-1-alex.bennee@linaro.org> References: <20230330101141.30199-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé It is pointless to build libgdb_user.fa in a system-only build (or libgdb_softmmu.fa in a user-only build). Besides, in some restricted build configurations, some APIs might be restricted / not available. Example in a KVM-only builds where TCG is disabled: $ ninja qemu-system-x86_64 [99/2187] Compiling C object gdbstub/libgdb_user.fa.p/user.c.o FAILED: gdbstub/libgdb_user.fa.p/user.c.o ../../gdbstub/user.c: In function ‘gdb_breakpoint_insert’: ../../gdbstub/user.c:438:19: error: implicit declaration of function ‘cpu_breakpoint_insert’; did you mean ‘gdb_breakpoint_insert’? [-Werror=implicit-function-declaration] 438 | err = cpu_breakpoint_insert(cpu, addr, BP_GDB, NULL); | ^~~~~~~~~~~~~~~~~~~~~ | gdb_breakpoint_insert ../../gdbstub/user.c:438:19: error: nested extern declaration of ‘cpu_breakpoint_insert’ [-Werror=nested-externs] ../../gdbstub/user.c: In function ‘gdb_breakpoint_remove’: ../../gdbstub/user.c:459:19: error: implicit declaration of function ‘cpu_breakpoint_remove’; did you mean ‘gdb_breakpoint_remove’? [-Werror=implicit-function-declaration] 459 | err = cpu_breakpoint_remove(cpu, addr, BP_GDB); | ^~~~~~~~~~~~~~~~~~~~~ | gdb_breakpoint_remove ../../gdbstub/user.c:459:19: error: nested extern declaration of ‘cpu_breakpoint_remove’ [-Werror=nested-externs] cc1: all warnings being treated as errors ninja: build stopped: subcommand failed. Fixes: 61b2e136db ("gdbstub: only compile gdbstub twice for whole build") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230329161852.84992-1-philmd@linaro.org> Signed-off-by: Alex Bennée --- gdbstub/meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gdbstub/meson.build b/gdbstub/meson.build index bd5c5cd67d..cdb4d28691 100644 --- a/gdbstub/meson.build +++ b/gdbstub/meson.build @@ -20,11 +20,13 @@ gdb_softmmu_ss = gdb_softmmu_ss.apply(config_host, strict: false) libgdb_user = static_library('gdb_user', gdb_user_ss.sources() + genh, name_suffix: 'fa', - c_args: '-DCONFIG_USER_ONLY') + c_args: '-DCONFIG_USER_ONLY', + build_by_default: have_user) libgdb_softmmu = static_library('gdb_softmmu', gdb_softmmu_ss.sources() + genh, - name_suffix: 'fa') + name_suffix: 'fa', + build_by_default: have_system) gdb_user = declare_dependency(link_whole: libgdb_user) user_ss.add(gdb_user) From patchwork Thu Mar 30 10:11: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: 668597 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp846333wrt; Thu, 30 Mar 2023 03:13:13 -0700 (PDT) X-Google-Smtp-Source: AKy350aTptsm7pBchUq3ZcJTbpXNctw7WB028ocX9wPU3c2OUKfYxf7MhvvW+fCheTHS2nS1zJSi X-Received: by 2002:ad4:5aa5:0:b0:5ab:d9a4:f438 with SMTP id u5-20020ad45aa5000000b005abd9a4f438mr9182935qvg.1.1680171192970; Thu, 30 Mar 2023 03:13:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680171192; cv=none; d=google.com; s=arc-20160816; b=HpU1eFzDx0w95GFD9BODEVsulKAeHwWhH34UGSxKh1NgDj3/AIXAknElpE8OA+TCNu unwFEmOfsqAvCrbjoWx6gZM8KaZRG8dixI3UTYNb2nm2Wo5nGMtvQxk/4i9yYcj0iQck IY/vBu3pozIPKIBX8a74PQgaaOgBv/AsVDdySUcDW5GjgAwZJXOY2kogzSuxPKXgP+T1 Rcr1OuOK3jj/PPt5QLSr8eggRo14z8Hjr4r3uNlkDOa1JXlyKoIcZf/tlAvn8IRb1+te gxy5F4Uk9JCasS9DVB9EYqF8mlw5S+XPGjKkQ1N81aFvxYPG4fKf/lmDNDISI+BxGX5w t7NA== 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=zX7t1hjrNQN5bWms8POybgyQ5IrIeHWd2pMhMMEcBY8=; b=qNpoE8mBOdGsKyLVdHyGtQ+lpWTyOikQzbb3FTcnyiByhCHz38cIYvKqq7YiOhBvd9 c9RR0gjej+fg75psvQbtJVTjri2kyNDM4IuU1nwkKfD6h1zitIZAklRdsp9sO3WRs8YN BMrhrxhYpWAUzd0H/W8FJ/SOSM+Ttn4reQjLtsKXiHFWhSycZ9/qmggZx4qGNUYI/6K0 bcXWPSrSHs+R0Nrpd0tDwrNTOx5y8L3R2aYnJKbcEaYRcijp93eZb1e8c7W25HrjLinA Rk4w1Tvp5rEccMGDQe7RZd9zzRNK/8NIqAxvj3W/hIyNGPvCi9Np4Dnjy/jNWvF0uWEL voxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jXGMFO7Z; 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 jl7-20020ad45e87000000b0056f014fd470si25816155qvb.360.2023.03.30.03.13.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Mar 2023 03:13:12 -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=jXGMFO7Z; 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 1phpG7-0007Xj-5C; Thu, 30 Mar 2023 06:11:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phpG2-0007UT-6Q for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:50 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phpFy-0000HK-2T for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:49 -0400 Received: by mail-wr1-x435.google.com with SMTP id i9so18497715wrp.3 for ; Thu, 30 Mar 2023 03:11:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680171104; 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=zX7t1hjrNQN5bWms8POybgyQ5IrIeHWd2pMhMMEcBY8=; b=jXGMFO7Z6+wn7pljfk7ZJHJNR6flWaNrCUsDIGG8SP0BHiX8f8pTiaYnkin+ReJnlt /GncTQ/Zf66Leayu6vIy2sltq0srpUtFkgjwRVzmh7UDrQNEyOA9k7vFWyRRX4swAL0Y AJQGjuC3v0DhhHY+qEiVsc0bGQHjRHe0L5vuVCv0DfXSNgT09qCRcGIc58q7VYpY9Enp HLClYCAzF2xeVsmNlvmuu7pWo2SBfbHz/beuKJvYH9Ump0V3x9dYJAypnc67HIW1ajJY 3IvT6I0oAy+sXOjmgbicEmeFjVYVxVdFsNdUekI2pUEjr7Jculg/B2fO58aSNVcciwNf IgmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680171104; 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=zX7t1hjrNQN5bWms8POybgyQ5IrIeHWd2pMhMMEcBY8=; b=SMv0tsXdd2wY8W78KzU0UEe1+XA9SNnleo9rJf73hWqLQRQsk1vv26WaXpYFieJat6 Y663cMbMlgiTplt/pKVJpBLh+10ZRNMLNaxl92ZmP3Ct2LIZdPIHpBi+Z+kzmasxApqO stiKeKjHPjEgouA0K26fmUUAWGyCAurRuI/xys058buAhAiwhENH1LsdikBTyyx3B/2f CRN06C5ziqXcTGaccPwb8QuOOTrdafB1kDyoKoXzVQV57O6+M69kjbNNLDkAp3vRvfKF 9nE4mLj1/HS+tTQHf/UA/bD2cWaVnl8U3f+ORuWzkyNP/F3gmI6Rcm2yXkBG7uhVWQEh eqCg== X-Gm-Message-State: AAQBX9cHGVdgbTC/ZqCCTWnZ64fJAWRNkhOqwRK5ROb2PurPEdRuBMhC MOiUgo0xFGv62p8+aSMPMOnV1w== X-Received: by 2002:adf:dbc8:0:b0:2c7:a3c:5bd6 with SMTP id e8-20020adfdbc8000000b002c70a3c5bd6mr18714624wrj.52.1680171103956; Thu, 30 Mar 2023 03:11:43 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v15-20020a5d590f000000b002cfec8b7f89sm32582420wrd.77.2023.03.30.03.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 03:11:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 67E161FFBB; Thu, 30 Mar 2023 11:11:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Ryo ONODERA , Kevin Wolf , Beraldo Leal , Wainer dos Santos Moschetta , Hanna Reitz , qemu-block@nongnu.org, =?utf-8?q?Philippe_?= =?utf-8?q?Mathieu-Daud=C3=A9?= , Kyle Evans , Reinoud Zandijk , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Markus Armbruster , Kashyap Chamarthy , Paolo Bonzini , Peter Maydell , Bernhard Beschow Subject: [PATCH 03/11] MAINTAINERS: add a section for policy documents Date: Thu, 30 Mar 2023 11:11:33 +0100 Message-Id: <20230330101141.30199-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330101141.30199-1-alex.bennee@linaro.org> References: <20230330101141.30199-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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 don't update these often but if you are the sort of person who enjoys debating and tuning project policies you could now add yourself as a reviewer here so you don't miss the next debate over tabs vs spaces ;-) Who's with me? Signed-off-by: Alex Bennée Cc: Thomas Huth Cc: Daniel P. Berrangé Cc: Markus Armbruster Cc: Kashyap Chamarthy Cc: Paolo Bonzini Cc: Peter Maydell Cc: Philippe Mathieu-Daudé Cc: Bernhard Beschow Reviewed-by: Thomas Huth Reviewed-by: Markus Armbruster Reviewed-by: Warner Losh Reviewed-by: Kashyap Chamarthy Reviewed-by: Philippe Mathieu-Daudé --- v2 - s/your/you are/ - add some willing victims --- MAINTAINERS | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 9e1a60ea24..2c173dbd96 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -64,6 +64,19 @@ L: qemu-devel@nongnu.org F: * F: */ +Project policy and developer guides +R: Alex Bennée +R: Daniel P. Berrangé +R: Thomas Huth +R: Markus Armbruster +W: https://www.qemu.org/docs/master/devel/index.html +S: Odd Fixes +F: docs/devel/style.rst +F: docs/devel/code-of-conduct.rst +F: docs/devel/conflict-resolution.rst +F: docs/devel/submitting-a-patch.rst +F: docs/devel/submitting-a-pull-request.rst + Responsible Disclosure, Reporting Security Issues ------------------------------------------------- W: https://wiki.qemu.org/SecurityProcess From patchwork Thu Mar 30 10:11: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: 668601 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp846436wrt; Thu, 30 Mar 2023 03:13:28 -0700 (PDT) X-Google-Smtp-Source: AKy350aXzyXfWUg6u6NKBz5czC8qPzuGBFn73mTZC07gbAbbF7HOG0GoK6S1V42n5C7iHALItYne X-Received: by 2002:a05:6214:c2f:b0:5a9:e0eb:1958 with SMTP id a15-20020a0562140c2f00b005a9e0eb1958mr39629293qvd.9.1680171208473; Thu, 30 Mar 2023 03:13:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680171208; cv=none; d=google.com; s=arc-20160816; b=RsTbOzuKkCZeUnOCS99w/evw1o6zqEUwaIydahUwabUfVNE2/PGuO3nT+kySNoZC4X LZM2+5S8XOTzikje3cvYutVuJbTJ/wuXYR4ya1+Pl872uETPu6ek+uhsueMXf9qkHLnB 1sS5QJ8ARzYox9ifUb1udXrUCmWCrSp4MghIibcSl2HOvWCEGlC2LeHmO2LI3t9TM8Zs uGZfsa18n3avJWT7roXpWRsAgVn1exT0MGlxaenS59+ysboDQb8oL1blAzwJVRnW5E17 FqO8NyelDkZWLmg+aPar3A8W5tBc6nbQvFcp6g1AONivwLnIAKGkp+DxGDvLuErBpV0t yWcA== 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=N6sz1M7T3yD0wZFnzMX54YCnX2Tqb42vTWqBIcF5gCE=; b=S2Xq89UXxV70ywc5nj7DS2fkT3IJQjXfEQLUuh7RCoQEVjDgCk5nrVwZ4muMyBMN5X nparwioBeOAZQuca/NdTBhY/M11kcHJkuZdXF9JI6tFgx4/sGwUH5CznMTnz0V0nUJ0S y/WSFgirIPkLIsJt26RpSvpJYLMk/sPey7fBDOwZGcpD4hXgtu08DrXficELsXbVtBjo uoOQIKhsj97kZnAPET5l1r7rY//ETZ35uu26/Qdy4Oz2R/xrDh3mpAzNPueKSR2nmliO 5MA7V3+51FxrO4J+OE5sQ5HTx16ezwLT/2CyJUrkE+dLyD9OtwYY7L0TW6y/Fvn+TQSI iryA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Bdjj8WKr; 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 i3-20020ad45383000000b0056e1a624256si22488531qvv.459.2023.03.30.03.13.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Mar 2023 03:13:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Bdjj8WKr; 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 1phpG8-0007YL-5q; Thu, 30 Mar 2023 06:11:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phpG2-0007UU-7M for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:51 -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 1phpFy-0000HP-2c for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:49 -0400 Received: by mail-wm1-x334.google.com with SMTP id t17-20020a05600c451100b003edc906aeeaso3036001wmo.1 for ; Thu, 30 Mar 2023 03:11:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680171104; 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=N6sz1M7T3yD0wZFnzMX54YCnX2Tqb42vTWqBIcF5gCE=; b=Bdjj8WKrzy6Wdg1DGEaGjGZqSRqCX4DgewBrwqWLgCJfv7taZDI5horHeWiQ/SzUbW KUw0qONWZ7GUfScfifJfjJBELg9DRU3pNKA68IvNJA8yDF24yTw5S0fqUPCwAyHavis6 4wMMGRPEo61C2jcj1SNVFjlPKi1/B03K12kIx5SNHB3Jp+EL2Sv5w0Ej0z8SobzUEGp+ neL8EvuF26pDUFmjW8AfJXIXt7ELFgT87rThfLQMIbYCBteJbQy49TNalCmFoOvXFcP4 1DzzL3GU0Kv8FMac39kqMMgC1Xx7gmZIdlBF9V0OKxcrK1y651ssQswBfS91N2EWzA+J HAvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680171104; 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=N6sz1M7T3yD0wZFnzMX54YCnX2Tqb42vTWqBIcF5gCE=; b=za282lpb/Qcz91SKehwDvq9h/vSR5g9X+iVjgpKn2BYK5bUKKdKhSqTJdIDqXkAGw7 kiM5IpACNrNDVX/icHcQfrQqWuSQuIY3a/6v9Dy8Urx0yyi/XNSG7AUoadj0GUnUbWu6 S7NWP+5gFxn+fe75Ly/j1gtztTGWWlJ2wQKhK9hsLjJlWn5BY7fD8KaoCWBt+/H2OIln uTIAaEzq12KVZx43lC61nfe8Wj/LQlTblTjKo+PJ/e2E9Rybnt3flZCh9SpjBWwcOzgR dd4p9ObiUvDXGKCiiJqP52kekwX+d7NB6CFJyyQPWEezufw+aHTATmVExl7ygqQTDvqb SGSQ== X-Gm-Message-State: AO0yUKXaSM0OCF2Pqwy9DHE7A0XowugpPY/Pjv6FJo2GF1+ryAJOg0k4 jxG+KV+C+s/5PzkFJPUpwEtjKQ== X-Received: by 2002:a05:600c:21d8:b0:3ee:5d1d:6c2d with SMTP id x24-20020a05600c21d800b003ee5d1d6c2dmr16597876wmj.35.1680171104125; Thu, 30 Mar 2023 03:11:44 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id iw13-20020a05600c54cd00b003ef6988e54csm5414825wmb.15.2023.03.30.03.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 03:11:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7EB4C1FFBC; Thu, 30 Mar 2023 11:11:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Ryo ONODERA , Kevin Wolf , Beraldo Leal , Wainer dos Santos Moschetta , Hanna Reitz , qemu-block@nongnu.org, =?utf-8?q?Philippe_?= =?utf-8?q?Mathieu-Daud=C3=A9?= , Kyle Evans , Reinoud Zandijk , Michael Tokarev Subject: [PATCH 04/11] qemu-options: finesse the recommendations around -blockdev Date: Thu, 30 Mar 2023 11:11:34 +0100 Message-Id: <20230330101141.30199-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330101141.30199-1-alex.bennee@linaro.org> References: <20230330101141.30199-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 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 are a bit premature in recommending -blockdev/-device as the best way to configure block devices, especially in the common case. Improve the language to hopefully make things clearer. Suggested-by: Michael Tokarev Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Michael Tokarev --- qemu-options.hx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 59bdf67a2c..9a69ed838e 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1143,10 +1143,14 @@ have gone through several iterations as the feature set and complexity of the block layer have grown. Many online guides to QEMU often reference older and deprecated options, which can lead to confusion. -The recommended modern way to describe disks is to use a combination of +The most explicit way to describe disks is to use a combination of ``-device`` to specify the hardware device and ``-blockdev`` to describe the backend. The device defines what the guest sees and the -backend describes how QEMU handles the data. +backend describes how QEMU handles the data. The ``-drive`` option +combines the device and backend into a single command line options +which is useful in the majority of cases. Older options like ``-hda`` +bake in a lot of assumptions from the days when QEMU was emulating a +legacy PC, they are not recommended for modern configurations. ERST From patchwork Thu Mar 30 10:11: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: 668593 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp845863wrt; Thu, 30 Mar 2023 03:12:31 -0700 (PDT) X-Google-Smtp-Source: AKy350ZgMrzrXBMyM0hRRSh+CS2O0cE1NT+7QA+j/hM6bcXkBROCVm6jo+iBh2B2kh6UF39jS8mH X-Received: by 2002:ad4:5b83:0:b0:568:c5e3:a0ce with SMTP id 3-20020ad45b83000000b00568c5e3a0cemr32057263qvp.20.1680171150862; Thu, 30 Mar 2023 03:12:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680171150; cv=none; d=google.com; s=arc-20160816; b=occqoxxB+evsX/Nm1yCBreIOsTcV7oI5EssDtze3v2IYGdIpsibDtczQR0vXj6ITmo gFlEgfE+NODVD2pf5Hkdu/wsSaDuQmAy08ST/WXGjsOl93UmIke8738b1hE/kTWg8RIN /DEEd7RGfKSaJ9jrXULXaT/QB8om+BgymSL66aTd17BK84pzdxEIj89Vm+Ipf/E3+Cxo JBkoLKxpfrLJDcOVtj5J2Wp0RPfw3ZGM0RFPRhlID1M9925crNVrqNqU2oUwAVs8yr3F SmQQtgZoDw3eW0vSUMpLAWx5WXkLQNe9HWGQI4PzTPb4IhM/IX2HHSEq3FhoEdEEMRTK hVqg== 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=Gey+X0Dy+O+Kq3MElEFAXcP1Z2iyav7fvJs9uGtJ488=; b=eNR6+Ovs+6me7JHsWDE7H+Ie30k+60MnSVSMtbLZv8OWXIwZLsW9voZMFtlawMHkt3 B/wBgRkfDsbqg0yyRiLpceh9yVS33S+lm6ZSm85ABqES6sHhIIL0kJnNH3T/hBd5WJQR MjnX4npTBqGe9XBWKVF1n7fs5k5Z48QC8WRGLApnnzM15BIHP0FgglVG2LPKhpcnZFVP 1zOtBZWjKEwj+rQSeiWqC1YW0mDVMnyzc/VCVKoeLL0mSMfOGIBhCZlCVqPd2StZ6J2e u9BVlr6ydBHEik32rUvPyJ1jM6Ie3A5BjVsiTJ/f0rIBSX7aglq+VfUZGZmlPksT5aza yKdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=psojH1qr; 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 y124-20020a376482000000b0071f20e57ebesi18642976qkb.619.2023.03.30.03.12.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Mar 2023 03:12:30 -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=psojH1qr; 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 1phpG9-0007Zg-CF; Thu, 30 Mar 2023 06:11:57 -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 1phpG2-0007UP-6I for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:50 -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 1phpFy-0000HU-2A for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:49 -0400 Received: by mail-wr1-x42f.google.com with SMTP id d17so18465769wrb.11 for ; Thu, 30 Mar 2023 03:11:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680171104; 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=Gey+X0Dy+O+Kq3MElEFAXcP1Z2iyav7fvJs9uGtJ488=; b=psojH1qrds29B92CVLslgMX+0lW3Aa+6vRupIGoTAAccMLJw5ewWp96B6rBZq6oDMS ff4rpSbnE8CG0tabKbEh7/Nyp9WrkfJkMYYLrKuVK9pcHx5ON3ZQpWtLUNNe0tGqnAco YAiHiy9k94oXSNa5DU2JnASLahDM0zN3+Tu3PVl3bK7/PDgQImIHbN3erlSVIusVcAcB s2Yf760aut/zuR6hy/4XHl3Loon6MlSpTkJiNShG8FokDeb/VCZX4FQsIakr/hePrgRu LmvY3bRCDZwC37Qc3DL3pqH8Jg75dBGN0lFf1RO+bYbLFzDEaNRrprcYf6HN2mJ9UKKs jq+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680171104; 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=Gey+X0Dy+O+Kq3MElEFAXcP1Z2iyav7fvJs9uGtJ488=; b=tLdCzUMk8/e2WUUV1y9is3wy6RH4OTuQ7nz3qhD5gsXYVoTbqqYZWakGtPN+ctgGIV iHyeZbID8Y3rsYdz2r0xegCeOwjCXm6a1VmG4kVcpwEbpct2mEniYYc3i6nkvpC3ziNn E0niPkJSjYSvq5tvDJ7rI8Vhc0lskTf5qxEH3vpqHdwu+nWcC5zl0zORqx2w6ET7WZzy KW+HcaVxuUd8xhsNg5OkWsAyqbRydRh+TTsZ6HTDwk50laycmabvEdsmrCIq/DR0lEdN XNt+xiHaQw72IZSQi+j25jSi0gLRNq2NqoAJ5Sdsva2l2LnC38o6oR4aKvEAbCXasnBY ppQA== X-Gm-Message-State: AAQBX9df0DsVDi7+LLnd7zkXEwKQga5rhszPz5zTEEzVuCJw0uUTINRx HhaJCqG8FFAK3hi9VVxYFM/R/w== X-Received: by 2002:a5d:4009:0:b0:2d4:99f:66fa with SMTP id n9-20020a5d4009000000b002d4099f66famr17959815wrp.14.1680171104457; Thu, 30 Mar 2023 03:11:44 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id e4-20020a5d4e84000000b002ceac2ccc4asm32554544wru.23.2023.03.30.03.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 03:11:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 957E71FFBD; Thu, 30 Mar 2023 11:11:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Ryo ONODERA , Kevin Wolf , Beraldo Leal , Wainer dos Santos Moschetta , Hanna Reitz , qemu-block@nongnu.org, =?utf-8?q?Philippe_?= =?utf-8?q?Mathieu-Daud=C3=A9?= , Kyle Evans , Reinoud Zandijk Subject: [PATCH 05/11] metadata: add .git-blame-ignore-revs Date: Thu, 30 Mar 2023 11:11:35 +0100 Message-Id: <20230330101141.30199-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330101141.30199-1-alex.bennee@linaro.org> References: <20230330101141.30199-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Someone mentioned this on IRC so I thought I would try it out with a few commits that are pure code style fixes. Signed-off-by: Alex Bennée Message-Id: <20230318115657.1345921-1-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- .git-blame-ignore-revs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000000..fa01e77a1e --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,21 @@ +# +# List of code-formatting clean ups the git blame can ignore +# +# git blame --ignore-revs-file .git-blame-ignore-revs +# +# or +# +# git config blame.ignoreRevsFile .git-blame-ignore-revs +# + +# gdbstub: clean-up indents +ad9e4585b3c7425759d3eea697afbca71d2c2082 + +# e1000e: fix code style +0eadd56bf53ab196a16d492d7dd31c62e1c24c32 + +# target/riscv: coding style fixes +8c7feddddd9218b407792120bcfda0347ed16205 + +# replace TABs with spaces ++48805df9c22a0700fba4b3b548fafaa21726ca68 From patchwork Thu Mar 30 10:11: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: 668602 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp846454wrt; Thu, 30 Mar 2023 03:13:31 -0700 (PDT) X-Google-Smtp-Source: AKy350bpWm0BqURJf7fndKhbYnqGV4T0remp2vBaBb8xpF6wb80Qrcf/NpUP5cqDtbIuzo9ImSiz X-Received: by 2002:a05:6214:e47:b0:56b:eb9d:4342 with SMTP id o7-20020a0562140e4700b0056beb9d4342mr31206899qvc.49.1680171211342; Thu, 30 Mar 2023 03:13:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680171211; cv=none; d=google.com; s=arc-20160816; b=B4bO4ewSjK4rT5oO5cOPuk3rsFFgVpF2P1Py/yFkvEZW2eCXN4J4MB61aCPfDIDGlw Pg6sDoqS5Daqo00TMU7GDsCNtlj9rEpesc4uyJt3sFAZf/z434LvK0yGnU8h6sCv97jH StpOpfcc/Tx+Ac7vrMFTMMY6W444iPqbrVDvRYT/BenDXOouhV1/1wpaFhVL7xl5dkXT Z05dGk3hW6U2Iqt7HiYV7jyNI9kaDLHD0WVTqNOMY+k4OK3HwGEuYcZhw8ZQ1xrrR2dT zrtaphZP6hhTtzpjmaULm5taDfaHKMEW22ZEhpH1nD+X8w+XZoPcHoiRWMR6NUjB0Ouz bQOA== 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=Lyj3DcfgcaLVAP419C5Q+1AY7dlGAjTujgK9jYBedDk=; b=XUyfWlvUmjZgehSnkACU2U+nunq7FFjWYOKr2GqmUt8pTwbnciQb9/5gYH7fP3crNQ qF4j60tRPg4xw3C9BcKCgZUthQLDnJLI0SZcEKt4ptaRrfO9AvhZ5Hi9CgN+//u+r59M oeZY9+IbRhhyNrPCeVS2EDea5/AXaTSOh3datXYaSyIBkRd3MKTQQy4EXTQkr2qYD6Pl K1L1CMuI3i0ZcxQChYRs8e7IyWmH9KHnc1WRea39O0ecZ9i9IEkg5OuZnN8SyWk4CrxP u7tHqFj5t/Y+ezF9BvenhDPs7XOCDByQlPyvjofvUYKqzEep6iYkQWeNy/l3nWwOMPLM l6Fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jPcRwKl6; 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 bu17-20020ad455f1000000b0056e9cb06e56si23592617qvb.322.2023.03.30.03.13.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Mar 2023 03:13:31 -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=jPcRwKl6; 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 1phpG8-0007YH-01; Thu, 30 Mar 2023 06:11:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phpG6-0007WR-6U for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:54 -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 1phpG0-0000IH-0s for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:52 -0400 Received: by mail-wm1-x336.google.com with SMTP id u1so10538828wmn.5 for ; Thu, 30 Mar 2023 03:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680171106; 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=Lyj3DcfgcaLVAP419C5Q+1AY7dlGAjTujgK9jYBedDk=; b=jPcRwKl6DyEmfb52jjAFkxt6QDXhrbD9TF2IUtPRCP1KFl5du6CCTZitoczMEcq86R IRGwaT4DOVdp10oB5ZyBoQ2s350yrrPmnUIZmq+T2pQKe1qzkpIg42taguqYzap7Rug5 i+L9ojmHQIUCcNxZXxZWMvKQQQGAFpBiy4nylR3D7Q5ArY6fT7/l22zceHVdlAzx1N1h iRji/MyNBjo9EGH9foctW5HdhSNU6yBzqE2lJLO+RqngtC3DSW/z4YFcFYqUjHc7TqSX cZF75dE5KsQhObGW08d8pq7UQu7hA4vxS/0V2eIFvWHj2uX11ud5Q8LLPGfPgjlL1Mtc c2MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680171106; 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=Lyj3DcfgcaLVAP419C5Q+1AY7dlGAjTujgK9jYBedDk=; b=i9vNt7oqP5TlsnG4D6mhj6ZA384vX/fjujDGwUjEKDciTQp7y5A2CYrnORBLapDKaQ ihArWQffCN9dc8LyJSy0OEzvAcKHw00osfTcj1uhbFIe+AfFnzi/gfTYZyleBYcT9Tv7 djJnzfI9o+MBuHPmurc2RY7nldSk1oKnRPn1WYx1Dx6233n5AGJLwf5oni2qr+vHJb5C eRgYWX7wP77XcMhdzc5sx+Zoy3SyI35t+I2KOdY4FVCE/wdXgIotil7mc8j9gUhiduFc /cz2pVrSxe7K247+9MvZsFRjwTo/O/fnLbZc9MtjeBEHn0HcMMtSoSMnr4qrpno0YN7J nXYg== X-Gm-Message-State: AO0yUKWep/ohUy+zLDCAFtlNg3blC0+JrqgUw8sOeoHUw4vwm0U3hNyC UH5pI0wwBQc7egY7M7U2nQymUQ== X-Received: by 2002:a1c:7c11:0:b0:3eb:399f:6b70 with SMTP id x17-20020a1c7c11000000b003eb399f6b70mr17277173wmc.31.1680171106620; Thu, 30 Mar 2023 03:11:46 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m21-20020a05600c161500b003ef4cd057f5sm5184135wmn.4.2023.03.30.03.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 03:11:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AC1EA1FFBE; Thu, 30 Mar 2023 11:11:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Ryo ONODERA , Kevin Wolf , Beraldo Leal , Wainer dos Santos Moschetta , Hanna Reitz , qemu-block@nongnu.org, =?utf-8?q?Philippe_?= =?utf-8?q?Mathieu-Daud=C3=A9?= , Kyle Evans , Reinoud Zandijk , Marco Liebel , Brian Cain Subject: [PATCH 06/11] Use hexagon toolchain version 16.0.0 Date: Thu, 30 Mar 2023 11:11:36 +0100 Message-Id: <20230330101141.30199-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330101141.30199-1-alex.bennee@linaro.org> References: <20230330101141.30199-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Marco Liebel Signed-off-by: Marco Liebel Reviewed-by: Brian Cain Message-Id: <20230329142108.1199509-1-quic_mliebel@quicinc.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian-hexagon-cross.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker index 5308ccb8fe..b99d99f943 100644 --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -27,7 +27,7 @@ RUN apt-get update && \ ENV TOOLCHAIN_INSTALL /opt -ENV TOOLCHAIN_RELEASE 15.0.3 +ENV TOOLCHAIN_RELEASE 16.0.0 ENV TOOLCHAIN_BASENAME "clang+llvm-${TOOLCHAIN_RELEASE}-cross-hexagon-unknown-linux-musl" ENV TOOLCHAIN_URL https://codelinaro.jfrog.io/artifactory/codelinaro-toolchain-for-hexagon/v${TOOLCHAIN_RELEASE}/${TOOLCHAIN_BASENAME}.tar.xz From patchwork Thu Mar 30 10:11: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: 668592 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp845759wrt; Thu, 30 Mar 2023 03:12:19 -0700 (PDT) X-Google-Smtp-Source: AKy350blxZePD1mjUmVQk5n2+OSSF99KQ5g4Tz7B54l2TvnCvAe0nDoSBp76S0sR8iqFlWjckLJN X-Received: by 2002:a05:6214:f22:b0:5df:5167:c420 with SMTP id iw2-20020a0562140f2200b005df5167c420mr9616564qvb.38.1680171138869; Thu, 30 Mar 2023 03:12:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680171138; cv=none; d=google.com; s=arc-20160816; b=e+P03Z027vUQdQ2UIhZ7guXMFNqvc0bPBQlutQlfjFzziuxFRHx+flwwIFpzoiO311 oi9gcc1kPkZKIfu2ylRcEpWIVv9fkw+OhWWQzqcqEfghCrpwlnI9QqqtoDYPJB0PhJ5y X/qqzzLyH3SYnX37VtP3Ja3rXXsj4xcWB7nwhdjddqqGqWY2LDTMPVOV75dHRXGV85uy K8YlUSDE3AtSG8/0H3sULQHDt22yT1YKXQqFHNPnGFkxjBcv4+wMRNn1FpTviwdY92wF CUdqAPHKiLZNJwUklk1wgiH2bHsQ3PJYJ0l13opfCkdPuY1wurP8W+HXwApqNIC/wAQB HUnw== 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=xJESc3vRxMeUkJokIIbDRbo6dBnH1WDID4CWuuBjrPc=; b=JXherUEU2s7raDoEKkjlk4h9Zbn9zwt2mgQdqrdUzWSnVmnUIi4HVD1yfimI3I3Gj9 KaTzi92e64HqT+Ap93IaJrEpZWPXcSNw9xCZYR7ag0C0d6gPsCOLU3tDK44wR5iJi+QU Zs+FmDWIqL4rLbxHqyDD41OYivPg/E+nwX4tI/VqwVqyTkg8Rx5RK1qWLGMkDGyiRGcs fMqsDUKg0QAWZPRZOOwvrRz3cYqN2utQkugosCz3yFADbcjpSF9A/XXlPg4z2Jdm5Iqj xvED5flAEsxpwxy2zenScGKxgLhiRLtGyb4Mq1k+HNUWRLvcdOwWHktT+aC5XgDGdsWw gAYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=y4WJhZMe; 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 d129-20020a376887000000b00748492ce727si11388049qkc.418.2023.03.30.03.12.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Mar 2023 03:12:18 -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=y4WJhZMe; 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 1phpG8-0007Yv-QF; Thu, 30 Mar 2023 06:11:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phpG6-0007W7-4T for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:54 -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 1phpG0-0000ID-1d for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:52 -0400 Received: by mail-wm1-x332.google.com with SMTP id v20-20020a05600c471400b003ed8826253aso3172141wmo.0 for ; Thu, 30 Mar 2023 03:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680171106; 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=xJESc3vRxMeUkJokIIbDRbo6dBnH1WDID4CWuuBjrPc=; b=y4WJhZMeMc8S6zRFYuAO1yg8qQeNukRifQTeynVVGg33Q86rPnl+9tQ0nUXUhrq8TX c3bihTW0U61yPcRdTTvZ3PQPoH85s5Y01Po0lnO6diiM2SuCwK0XqgYN2wvsmPh5kHKL qY/PLb5hAo4eS1PqsjNXJwcuG2M7zqCCmLzxx+sRt8yclcu4owjiIAQG4zuvBkPBdYNA lAvzwlGTDe93x+WQL71uFrvrTLWZgVA2WSmWfbHqmOM65oBNHNLCgeo+0SKwcKC8RZpI ntaEMUSCIMdbhSIdZ4p44cUu3KyHphsa4tcSuT9InGiNyUzEM1U/cWJ74LusLMWIiSIf n6Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680171106; 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=xJESc3vRxMeUkJokIIbDRbo6dBnH1WDID4CWuuBjrPc=; b=oWK5Ayg7LGjq+Qjpi3ADMy8bbFcNNUeiYTivOe0VpAqnzEase62uhSnBBRThnaXLgc Hq7kkA4HEJWPu556Sxf9/ThHkk5V7d5fbhNPsaEBwAXjBG2CCzzdpm9mmBrdclVRgHo6 fhsPpZYRgLuLu1SrU/JOScZ4dI4YK1D9vII2M5pGl7o097lnnKpGzmRce0YZbeaCW1LE eoWE7hgn+XHsIvntGwr9EAx5tw8z501hp89cTf9A0jtAp8TZ9fb3+VEizHKsLXgnHKJv nqhoWAJCU2lHMoYOVzWQaoTy6tGlhPS70R5sMP6Yz0foxM3Fb4iyo8tiHqLJFPQVZUVQ 4R2w== X-Gm-Message-State: AO0yUKVQRzO3E2r53/vz7lkveBRRWuFLmyfpA6eaxbZHQdpX/EH1Td3D 2wIryqDJwfLCDWGY4UVZu6RyiQ== X-Received: by 2002:a1c:790b:0:b0:3ee:7022:5eda with SMTP id l11-20020a1c790b000000b003ee70225edamr17455877wme.7.1680171106468; Thu, 30 Mar 2023 03:11:46 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m16-20020a7bca50000000b003ee10fb56ebsm5370560wml.9.2023.03.30.03.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 03:11:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C33BF1FFBF; Thu, 30 Mar 2023 11:11:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Ryo ONODERA , Kevin Wolf , Beraldo Leal , Wainer dos Santos Moschetta , Hanna Reitz , qemu-block@nongnu.org, =?utf-8?q?Philippe_?= =?utf-8?q?Mathieu-Daud=C3=A9?= , Kyle Evans , Reinoud Zandijk , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini Subject: [PATCH 07/11] tests/qemu-iotests: explicitly invoke 'check' via 'python' Date: Thu, 30 Mar 2023 11:11:37 +0100 Message-Id: <20230330101141.30199-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330101141.30199-1-alex.bennee@linaro.org> References: <20230330101141.30199-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Daniel P. Berrangé The 'check' script will use "#!/usr/bin/env python3" by default to locate python, but this doesn't work in distros which lack a bare 'python3' binary like NetBSD. We need to explicitly invoke 'check' by referring to the 'python' variable in meson, which resolves to the detected python binary that QEMU intends to use. This fixes a regression introduced by commit 51ab5f8bd795d8980351f8531e54995ff9e6d163 Author: Daniel P. Berrangé Date: Wed Mar 15 17:43:23 2023 +0000 iotests: register each I/O test separately with meson Signed-off-by: Daniel P. Berrangé Reviewed-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230329124539.822022-1-berrange@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- tests/qemu-iotests/meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index a162f683ef..9735071a29 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -47,19 +47,20 @@ foreach format, speed: qemu_iotests_formats endif rc = run_command( - [qemu_iotests_check_cmd] + args + ['-n'], + [python, qemu_iotests_check_cmd] + args + ['-n'], check: true, ) foreach item: rc.stdout().strip().split() - args = ['-tap', '-' + format, item, + args = [qemu_iotests_check_cmd, + '-tap', '-' + format, item, '--source-dir', meson.current_source_dir(), '--build-dir', meson.current_build_dir()] # Some individual tests take as long as 45 seconds # Bump the timeout to 3 minutes for some headroom # on slow machines to minimize spurious failures test('io-' + format + '-' + item, - qemu_iotests_check_cmd, + python, args: args, depends: qemu_iotests_binaries, env: qemu_iotests_env, From patchwork Thu Mar 30 10:11: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: 668600 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp846377wrt; Thu, 30 Mar 2023 03:13:18 -0700 (PDT) X-Google-Smtp-Source: AK7set+JrpsI7f8kiRMn47LVPcwIJywGznVylWZYEVAsDgrSsrDWx9/XpCScjypbWyD3xR+fM5nL X-Received: by 2002:ac8:5cc4:0:b0:3ac:fba0:cde with SMTP id s4-20020ac85cc4000000b003acfba00cdemr34519743qta.22.1680171198332; Thu, 30 Mar 2023 03:13:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680171198; cv=none; d=google.com; s=arc-20160816; b=Aw0GIxhDHxnPYLPnzrA5K0jr6fEpzKTTMuXdiDlY2nnSCwdEsRvSqejoLxJllqlOOT RnNCv7boO1pA16KOU1kViboag0J3twS+tojw/BSH4i1Wok0/O4vQ3yMol+XjPWYPKHWt VNhnwYflYFEN5te/ev7eMPoCto1NP8VLnVMIP6eVKUM0HiOq3Wctr31ybBihTO1J5h6E DTIGhZnre4oFQc//XHyNar5gbo8HAXsib/AFYpRgpZyubDdBhjBJRfpgpAXVO4ZQ1lGY eLtmuW9Kq8O1wX2YYGS/t9zlJWS/R7dhuc1Oja3JhTIpoBXlGwHNKX7lFsj1a1KOKDXr XpcQ== 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=Xd+c4zabwyb7xGD9uAvER3pOoTrVCKuRGDPiXh3afWQ=; b=bgzwE/ePzlJBbUb4oRLQSU1MXR3sOxSBWZFM0e2JYtTTHyDAgqECuweNqZDkcy6XjW wD3f0Okwl1qYgxEvpe+IOIuLjylI1le8BpE0ryjzViFW4jANRvgAsRDzwJIvD8X87Hsx deb0+6+arMq5K9XVTdsM4wULJy0cOnDKfcate/M1n3PWDFlCbpAtUXMZ7MY6s6Ugki5Z 4c8R8OwsCLWuSKgVCMwk8fudIBehADzlGd8NGJMF23XrPGcmscKafduE6J6TcrIC3sgu WK76TldIAu3sTgqvLVNvZwcGZdk962vb23P7vz2Xym1W16bY9eJ5zaO1l9go9pyQQOes X8Uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H8SwpM8A; 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 7-20020ac85947000000b003e38fa14dd4si14880874qtz.402.2023.03.30.03.13.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Mar 2023 03:13:18 -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=H8SwpM8A; 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 1phpG8-0007Yg-KY; Thu, 30 Mar 2023 06:11:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phpG6-0007WX-MX for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:54 -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 1phpG0-0000Hq-1f for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:52 -0400 Received: by mail-wr1-x436.google.com with SMTP id j24so18526875wrd.0 for ; Thu, 30 Mar 2023 03:11:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680171105; 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=Xd+c4zabwyb7xGD9uAvER3pOoTrVCKuRGDPiXh3afWQ=; b=H8SwpM8A9l9/uSh6k2chd9RsGke0LgQu00yElKovUo3t4+1j9couU+k22g7Z6g7aqF kK/u9y8COP2CSx/Qb0Nn9OmdIf77ARzAPToWgHgySRjLk9VHgjLDJMByvmOpkZb3xWak GwrIIyyUpzM/NfTJBXPtS8ovZl32lR5msy8aJ4jjiMshU6Q1yuWWGREgfaPilEEgfVME s4gM0YrIg5Uf/06vIDgWPXXQSbol+/VZXvuIeo0okAi8aw0mBA0ygpkZRGyyl+q92iV3 JRRCtcTOIxcyfMlq3eBRxxDonnYOykUiL8C9GT3nUTiFCigJhpFwwmYChCBLszfmM9wh T/vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680171105; 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=Xd+c4zabwyb7xGD9uAvER3pOoTrVCKuRGDPiXh3afWQ=; b=uLWC2q/9xoynyZQn/aq/fU0XySUj2SJ5eELaEUv9Ibnoi5+fXEICzygA2K/nXNYtX3 JHjxy7zngDLPfhkDaU7OVTwYbIdD1IsJIqZNzKPfIvGY84ic7wostrtmhsDXOAc/YCuf jma3GX++ckrHv0yGlCAbmkBgFzTVVGNC1B7Nsqa2dw8Y2PnOO+845kPBrHA2CaXBluQ6 76ozLwREJVToSmMydhn7iPZLr4SmKUOCRTEbIlvMJPz2PhcPLgUpj65QdCJhBD5SerWA EoIWLWVaXvf77GR1CYU8iHIr3oMwk4UCT7SLOZoZzsXrifxAQFC0MZv5UT/o8PrKIMYm M2Qg== X-Gm-Message-State: AAQBX9eKbcC2zEx8IrXTlVa8pMDerFUSk90P+Py5MvM5t55zUmLshWZ8 8ihrznCHvlg/WwrY6GQOfRDE/Q== X-Received: by 2002:a5d:68cf:0:b0:2d6:adfe:cea5 with SMTP id p15-20020a5d68cf000000b002d6adfecea5mr16670360wrw.68.1680171105613; Thu, 30 Mar 2023 03:11:45 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id b7-20020a5d4b87000000b002cfe0ab1246sm32462194wrt.20.2023.03.30.03.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 03:11:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DB3371FFB7; Thu, 30 Mar 2023 11:11:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Ryo ONODERA , Kevin Wolf , Beraldo Leal , Wainer dos Santos Moschetta , Hanna Reitz , qemu-block@nongnu.org, =?utf-8?q?Philippe_?= =?utf-8?q?Mathieu-Daud=C3=A9?= , Kyle Evans , Reinoud Zandijk , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini Subject: [PATCH 08/11] tests/vm: use the default system python for NetBSD Date: Thu, 30 Mar 2023 11:11:38 +0100 Message-Id: <20230330101141.30199-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330101141.30199-1-alex.bennee@linaro.org> References: <20230330101141.30199-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: Daniel P. Berrangé Currently our NetBSD VM recipe requests instal of the python37 package and explicitly tells QEMU to use that version of python. Since the NetBSD base ISO was updated to version 9.3 though, the default system python version is 3.9 which is sufficiently new for QEMU to rely on. Rather than requesting an older python, just test against the default system python which is what most users will have. Signed-off-by: Daniel P. Berrangé Reviewed-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230329124601.822209-1-berrange@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- tests/vm/netbsd | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index aa54338dfa..0b9536ca17 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -30,7 +30,6 @@ class NetBSDVM(basevm.BaseVM): "git-base", "pkgconf", "xz", - "python37", "ninja-build", # gnu tools @@ -66,7 +65,7 @@ class NetBSDVM(basevm.BaseVM): mkdir src build; cd src; tar -xf /dev/rld1a; cd ../build - ../src/configure --python=python3.7 --disable-opengl {configure_opts}; + ../src/configure --disable-opengl {configure_opts}; gmake --output-sync -j{jobs} {target} {verbose}; """ poweroff = "/sbin/poweroff" From patchwork Thu Mar 30 10:11:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 668598 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp846348wrt; Thu, 30 Mar 2023 03:13:14 -0700 (PDT) X-Google-Smtp-Source: AKy350YMLpNRnpGPnBLE67Qey9DWfgKN6nq+IvPOMohF9Wt7fQA+WMPss1NV9uAJ4azYjyvCnjWi X-Received: by 2002:ad4:5dec:0:b0:56e:bdfb:f4c5 with SMTP id jn12-20020ad45dec000000b0056ebdfbf4c5mr37118341qvb.36.1680171194482; Thu, 30 Mar 2023 03:13:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680171194; cv=none; d=google.com; s=arc-20160816; b=KF8nMo/eo2vkgTpPGvUBW1SAag8iWaafyV/dOym8VKePoisYocMSWK1sE8qDLrusOh aYxt/Hlh1gjOh/czTeJltHlLweDPXSrhFpZjYannzGT4Rh9HBtPu7kdkoCBCe3emRMIb x56jkbi2PXhZA5olNlueK0G1cbFM0VX1c7NPEqBZGVUTnqQXvyBS15NZ7E/GwKoUFBHr wZZV0iI0QbbyyZ555dHhPvqJU4JpJYBp6y9etA7sBSkLHfiz4Z5Z9llqynMdh0pkW0X1 e9Qbsv4WCTH3Bod+p5O9WFeSJUq8lWssZMe1wBGBWloD+5BSz+aO9Zd7IvyW15FZjgOm FhqQ== 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=DSpoqIko9lkJ1FYEf4OS/seXi4zTLld6phvSoMKotZg=; b=VnLrYVFTT7SRYhDCIFnmCF/vVMOti4PGHSB3Y+nKHP9ayHYawzrgI3WoH76fKiybqJ vRmsnK4izqm0HZ7+nEtfOdHogYC4EzP+T/YOjroTt+jgQpuw8LGy/reSMHbnAPiTXpyd /utTKen9Vjc3WzlLeOz8SCPynSsxAF5m4K1jlzpDBj3nWkJO/SWei51a+V8IV+Dp2Wos Vi8LVVvVbfDqdITuv5c0CU9jLDwO9fUL2V0tHvrpjJiql+TfhVJEMWw4oZdq1eiFAWwQ SslPIK3iAAaKbNDUiZg1a/PJz1Oh9ruRmkKbaoAlLmEziGEHAMSi9ry8yOxthquEcO1/ OJmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WB7h6Vrn; 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 et20-20020a056214177400b005c0875f36b3si21764290qvb.140.2023.03.30.03.13.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Mar 2023 03:13: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=WB7h6Vrn; 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 1phpGA-0007a7-80; Thu, 30 Mar 2023 06:11:58 -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 1phpG4-0007VQ-86 for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:53 -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 1phpFy-0000Hm-Nn for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:50 -0400 Received: by mail-wm1-x32b.google.com with SMTP id p34so10550172wms.3 for ; Thu, 30 Mar 2023 03:11:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680171105; 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=DSpoqIko9lkJ1FYEf4OS/seXi4zTLld6phvSoMKotZg=; b=WB7h6Vrn7wMsdPeKfDuZwWMTZP8assCSflyxJXVlciE1rlxqCxAid+Biqqd11XYHE1 dWNKRMkze8s/GsedQ9dXwd3MdJcN7fgwcoyng7ZesBneQOp/W5HV0R2hzzwe1NOlNbEM smwWeVOq/IvECdOZoTcNfey9vIilpA4NtivhLopGCrIHI0liF8felpCa6MVKtDXZtd3c Bg1YeTHj5wm+m3KGAQtEiVROMHU8Ao070F557RMSr5Z34qMSxpTqVanyZAnLuHAyM5iR 5UQ3QvQARm323Rvww/KG1aPWro3PCtg1ZgJTEtUbxFN1qTV5E4IS7Tan4q7Z889dYXoM bkww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680171105; 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=DSpoqIko9lkJ1FYEf4OS/seXi4zTLld6phvSoMKotZg=; b=YPfojX+UBmiOjiNYYq2nzAlKqTYM2W27e3lSXyb9BJOPt3O/VIBtTOEbiJn1wGb1NV Vbvbe81NjO27emW23eBwyvwplS9YPN7iC9BY/FWxzBN0NS1HfJuI/CpVKxFNo5Z3hDzW 5sAiQYS149COdpuwRTJ2BKb2P0eC05MSr8W0ru9VeryDCaiw9P+YqwECw5WtQ+z602gg 0LqhuoSFp8C3VCHXt9l+QnC7VCi2L/jwybQpAB7NqnTPB1oDX5PXRHQTl7FKVsO+WyC+ ZwKJAOVamZH7jlWz4OY3A9EaLSZGFwfBq5+oUGHPku4Mr/u9EgQvyFZlzZf0uxCV/iAH w9Fg== X-Gm-Message-State: AO0yUKVvBGrukJq6Gg/S4OxbgFI/YNF1/MkxdXuzfA3JHvlH7xRt6cm0 ob6ySwtt95WsJIxQNhByQAuTqld+ChQP+gTu/6M= X-Received: by 2002:a1c:7207:0:b0:3ed:2606:d236 with SMTP id n7-20020a1c7207000000b003ed2606d236mr17014619wmc.38.1680171105431; Thu, 30 Mar 2023 03:11:45 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id w20-20020a05600c475400b003f034c76e85sm2315656wmo.38.2023.03.30.03.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 03:11:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F39AB1FFC0; Thu, 30 Mar 2023 11:11:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Ryo ONODERA , Kevin Wolf , Beraldo Leal , Wainer dos Santos Moschetta , Hanna Reitz , qemu-block@nongnu.org, =?utf-8?q?Philippe_?= =?utf-8?q?Mathieu-Daud=C3=A9?= , Kyle Evans , Reinoud Zandijk , Kautuk Consul , Hariharan T S Subject: [PATCH 09/11] tests/requirements.txt: bump up avocado-framework version to 101.0 Date: Thu, 30 Mar 2023 11:11:39 +0100 Message-Id: <20230330101141.30199-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330101141.30199-1-alex.bennee@linaro.org> References: <20230330101141.30199-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Kautuk Consul Avocado version 101.0 has a fix to re-compute the checksum of an asset file if the algorithm used in the *-CHECKSUM file isn't the same as the one being passed to it by the avocado user (i.e. the avocado_qemu python module). In the earlier avocado versions this fix wasn't there due to which if the checksum wouldn't match the earlier checksum (calculated by a different algorithm), the avocado code would start downloading a fresh image from the internet URL thus making the test-cases take longer to execute. Bump up the avocado-framework version to 101.0. Signed-off-by: Kautuk Consul Tested-by: Hariharan T S Message-Id: <20230327115030.3418323-2-kconsul@linux.vnet.ibm.com> --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 0ba561b6bd..a6f73da681 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -2,5 +2,5 @@ # in the tests/venv Python virtual environment. For more info, # refer to: https://pip.pypa.io/en/stable/user_guide/#id1 # Note that qemu.git/python/ is always implicitly installed. -avocado-framework==88.1 +avocado-framework==101.0 pycdlib==1.11.0 From patchwork Thu Mar 30 10:11: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: 668596 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp846223wrt; Thu, 30 Mar 2023 03:12:59 -0700 (PDT) X-Google-Smtp-Source: AK7set9/sVTzP2S3rPmo101zuo+lta3OC/zcdULJh0GfUv7UgoJwb4vcyNAH+myMqbAPm3bUUg1D X-Received: by 2002:a05:622a:60c:b0:3e3:9036:8d7b with SMTP id z12-20020a05622a060c00b003e390368d7bmr34434493qta.24.1680171179344; Thu, 30 Mar 2023 03:12:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680171179; cv=none; d=google.com; s=arc-20160816; b=KZxwWQD8OlkxivQpBvspjlrOTCCesVF5JXu1VJBS+eQj9KQFDDt36iqRnx1nv2TCSl LbeBJARClmU7bKyQUu7gx4kfB2yaeFuAIOnLy7ZTRCk04OCszKu3eZK2k9GTM3i4Vb4M kgB42ebKsttD4Hs4V+PSnSMb+jDDtIb6qn7G3xo/15UK+axACazl50/5NL0ODunJYkvk C0xKilGV4pxsQ3BXos7FArwY3gYkLOD6QEGUJ5AtlLcQ1HKp9+lSbPVfMQmkyFcADABs 19X5qWq2ogKLFX85PjKqq4riqfaJOpx+Vd8SciUFnB5OAeqJ2CWITdw3SHLw7QKMCdyT fDRw== 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=aAQgJCH18/CDlsc1qwu2JEm4YqYOxyDBS+oIfEkPhU4=; b=TY6vwNGZ4WxmcIlb+QQvK4h73RYSJz/ZIjX8pUJAWDpZogFM6SBvI0TByUd/ZKY3tY YrE6LEgC2mKsjXX7gN/n63cIuHKuaqtujNYeQA2d/0uvXaIYcQpVQlRMimNUcBzCaVpR qAgvMZ++lG/KBRky4GK4Ew4uKST+9T6Hp4A/lfXPTwzUn3KCAgp2Ipt9jidBDXjfZZsK uHVK2U3QSNhc2wmIs2Tw5OPZYeYXLubxHCIEFwfgGbvZ2NSWUrjB96/+8APfGqvVxpuf /nX2jNXK4XZxS+M0JEgL+W2DzyTQLp7Hd0554TL2U/QWZu4wSaXaWTWrCKU+oL2piDC7 lARQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ijq24rLb; 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 h4-20020a05620a400400b007476aef58e9si12420032qko.160.2023.03.30.03.12.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Mar 2023 03:12:59 -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=ijq24rLb; 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 1phpG7-0007Xs-Iw; Thu, 30 Mar 2023 06:11:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phpG4-0007VR-86 for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:53 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phpG0-0000I8-1l for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:51 -0400 Received: by mail-wr1-x433.google.com with SMTP id h17so18467945wrt.8 for ; Thu, 30 Mar 2023 03:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680171106; 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=aAQgJCH18/CDlsc1qwu2JEm4YqYOxyDBS+oIfEkPhU4=; b=ijq24rLbw9KB7Ngpuo9nzmlgr9AH/Q+z70z73FtVBz3eEZWNULgLQX3F7BfS/cCMcv LFceQ8MWV5+ltBHlq5FpZ4hN0TBQYeArPpVRxb1KatMskcUh1EjMPDkxUpiaiJiSiLeS TQ0NM4D1vWhWRESMTUyf//HpY41lt4AAoAEAroyVFb5msn9pBokNptAogJHH48SxVJh/ Jo5jyEXbH0ivTIXKItOsUo41YjdqUpkuW7S5QseJAh4QFTTuUMwULMOw7XQIMuwYM+PR zA6sWXJi4pGDWYtGdtuUZySCgZprTxF4HS6TdggiWsy+VpFA6+/jYPJx+HvH1u6YhAiX rdvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680171106; 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=aAQgJCH18/CDlsc1qwu2JEm4YqYOxyDBS+oIfEkPhU4=; b=zSltP/P0bsJlaMpppRB3sDZx4B8cjgs4DbOF3Yu9pp5Az1WB5gE2qVtVuLc6F4b2EP pu/hGwwJ9Oyp3VEWH6PH71T4XJG6IpYo1uu1bukvouFam07t2wfcMVkl/JPCmg9LIFtq cUYGyY6WNGEkufFu3I2Gs77sC+BSD+ViqjyqkMsA1HHnD8X3HFpIPQSMfvog/t8Q1d+G L7DC7dY+DEulAUQ3mrEx1KQ9xEvas5DaxuOohbaUO2QfDLSPtyGNSHH5u/DqwLg+e2+u 2Wbn10yvtbbwzo2UBAcniGcbmcFDwtGe2UhS6cVByjBL4tlZLRcoJFthtdspgjSAlnMB Enqg== X-Gm-Message-State: AAQBX9e7gkpX76ows17llkP/Tt4POjxEY6Gl2C3fON2utQwbXFCOLmpu fsXucVU7rS350rtTha66IPuP5Dxo8qdK8RBK0FY= X-Received: by 2002:a5d:4b8b:0:b0:2d5:a170:839d with SMTP id b11-20020a5d4b8b000000b002d5a170839dmr16514004wrt.25.1680171106299; Thu, 30 Mar 2023 03:11:46 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id s11-20020adff80b000000b002d6f285c0a2sm26315520wrp.42.2023.03.30.03.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 03:11:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 161811FFB8; Thu, 30 Mar 2023 11:11:43 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Ryo ONODERA , Kevin Wolf , Beraldo Leal , Wainer dos Santos Moschetta , Hanna Reitz , qemu-block@nongnu.org, =?utf-8?q?Philippe_?= =?utf-8?q?Mathieu-Daud=C3=A9?= , Kyle Evans , Reinoud Zandijk Subject: [PATCH 10/11] gitlab: fix typo Date: Thu, 30 Mar 2023 11:11:40 +0100 Message-Id: <20230330101141.30199-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330101141.30199-1-alex.bennee@linaro.org> References: <20230330101141.30199-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- .gitlab-ci.d/base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml index 0274228de8..2fbb58d2a3 100644 --- a/.gitlab-ci.d/base.yml +++ b/.gitlab-ci.d/base.yml @@ -75,5 +75,5 @@ - if: '$QEMU_CI != "2" && $CI_PROJECT_NAMESPACE != "qemu-project"' when: manual - # Jobs can run if any jobs they depend on were successfull + # Jobs can run if any jobs they depend on were successful - when: on_success From patchwork Thu Mar 30 10:11: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: 668595 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp846029wrt; Thu, 30 Mar 2023 03:12:55 -0700 (PDT) X-Google-Smtp-Source: AK7set/VgOByHiV2Cs7cayBHh+cq8c7IwgiH6dN1ZcYN0oqBk7zJjeAifULc47FRCxKU9bQUhwZb X-Received: by 2002:a05:622a:343:b0:3e3:9175:f71b with SMTP id r3-20020a05622a034300b003e39175f71bmr37735966qtw.39.1680171175566; Thu, 30 Mar 2023 03:12:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680171175; cv=none; d=google.com; s=arc-20160816; b=lMjd//O6UcK13CgVOKeWbhCg2fkNFlauIYreKK9mhkHJ+evp6FOSSecwHKwT78/Y53 BVxkFePKO1URsl1/zsmMpETkZlYDZjXiDitBlL3JBsu7vlYJd+YT/Wl1e+AT7YbxGTJa tU/c37KfWQWpua33tK+S9jMKMbqCXBxZhb9ltlryDrGJKta6nDI63CNpaaBMl4TO5qnw Li4ZOYZV3cBpkTbB+EQIZTcPjljtEZEb6VvtvmJz0CZfiIooFD14oTwp6ZNURueSWfvw 1z15ZS9Xmu1tAMqqBcJ9ZoK1msAojusZRW4q1rlmEVoL+eJsDkNDuWqwTKyClQK+XBXs nTnQ== 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=G9GbMYvAaWW0oOBX4NN/Uf9OJgdDvvjHPBRD08CBk9g=; b=pC7v2G4RMTHZHUuM2RGlsbwYNoSUf1zhzWAhCY0oNwnqlKTx4ydM7w8e0TsTPthMZ8 lWdXVj9v1q0NeGwGq59GBScCt3UJW3io5w03+eZAWHmOZM4eLa71607xTDh6RdlbLn5T 4azg/0HwiDXnDGReAg2D+D3Olqky/cCTYyR8IA+dyTdeXok7ExV1UkIs6F8n7xBys22P NCmsJOHX7GtNl0LBt9UM8f5uMGuL7qB4Nz3hCWbdKdv8Lwk3D4oDmjNA8Yhq061obtid WXIiHLG/IasTbSoMfh/h9CCzN2XwOztWvAsYEW+W/7wge/ssnZhYXJjdFjDU3R9B2ysx C72A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r8Tl2Xr9; 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 d2-20020a05622a15c200b003e388b3400fsi1477684qty.176.2023.03.30.03.12.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Mar 2023 03:12:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r8Tl2Xr9; 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 1phpGB-0007bb-0x; Thu, 30 Mar 2023 06:11:59 -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 1phpG6-0007WY-OV for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:54 -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 1phpG1-0000Il-8a for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:53 -0400 Received: by mail-wm1-x32b.google.com with SMTP id n10-20020a05600c4f8a00b003ee93d2c914so12771640wmq.2 for ; Thu, 30 Mar 2023 03:11:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680171107; 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=G9GbMYvAaWW0oOBX4NN/Uf9OJgdDvvjHPBRD08CBk9g=; b=r8Tl2Xr9YELbpFcA6fCKKZQzbDwA6NAThE/yqJ7HVsERf8swaDPtXtWhu6w9gO0qjD SRrO1DCNI9XRS5qzZi1fS/L5wbjqKZhAyXgUMawY3rbhQCRnEZIaz8KHwK4QmUf7/AqC BuYLiuaA6fHgbXDERRg1daKEOugBEERn+owVxxbL09VOfdE2XVpo0fOa2Y15Citrl7yZ EVWmY2z46sKktdHuv7iy8bZESN03SDjflLXfAJDE8rEdqe4FeU3VrqVGGYi2yek1dcgp w5m4SKUDxbwDadgvZAQkzouZc8c3OuYg9HHFZuToIv/6+QI5YR5utXiFdUhSAtpyYhwD HQ/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680171107; 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=G9GbMYvAaWW0oOBX4NN/Uf9OJgdDvvjHPBRD08CBk9g=; b=OAl4V6YjjhVSeBvNy2luzSdQmVVLTRdskdGR4ZLOrUDmGhYrGzLT4OL+OqQz2+J+vd s9UUPnKyUavKBRyQhfAjoPmQ+ocwY1rAZbUQs5O1vowl5+5wqsPge3UdUoK9zMLN+hE7 WNjwBgcCLNfMcohY6fxzVNYaKznUB7FwLYcAaPj7qkLHG/+LU+kFgADrYKDqWM8LpmXa XESp7VfZMp8Inj+3XmY5FHyZfPmwddaa6H7npiHdWIutgPuWMiJ5UtMrkJLGUg/Sbtz9 Z8OGzvGYwmVBhA/haTjsHM3jTqkmUjeb/WY3Cc+uhIBOa+a1g82fyYUQouXgNVdXOWkI 7hBg== X-Gm-Message-State: AAQBX9e6yqGNlhA91eKWo3vURkriUVJymvs+puner9RcXQpBNfXCrHL8 gzMoW8BNXph/Sx/YIeqwFR8IzA== X-Received: by 2002:a05:600c:2198:b0:3ef:61f6:d7be with SMTP id e24-20020a05600c219800b003ef61f6d7bemr13838630wme.35.1680171107586; Thu, 30 Mar 2023 03:11:47 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id w20-20020a05600c475400b003f034c76e85sm2315703wmo.38.2023.03.30.03.11.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 03:11:47 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2ECA91FFC1; Thu, 30 Mar 2023 11:11:43 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Ryo ONODERA , Kevin Wolf , Beraldo Leal , Wainer dos Santos Moschetta , Hanna Reitz , qemu-block@nongnu.org, =?utf-8?q?Philippe_?= =?utf-8?q?Mathieu-Daud=C3=A9?= , Kyle Evans , Reinoud Zandijk Subject: [PATCH 11/11] tests/gitlab: use kaniko to build images Date: Thu, 30 Mar 2023 11:11:41 +0100 Message-Id: <20230330101141.30199-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330101141.30199-1-alex.bennee@linaro.org> References: <20230330101141.30199-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Apparently the docker-in-docker approach has some flaws including needing privileged mode to run and being quite slow. An alternative approach is to use Google's kaniko tool. It also works across different gitlab executors. Following the gitlab example code we drop all the direct docker calls and usage of the script and make a direct call to kaniko and hope the images are cacheable by others. Signed-off-by: Alex Bennée Message-Id: <20230224180857.1050220-8-alex.bennee@linaro.org> Acked-by: Thomas Huth Signed-off-by: Alex Bennée --- v2 - add danpb's --cache suggestions --- .gitlab-ci.d/container-template.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-template.yml index 519b8a9482..cd8e0a1ff6 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -1,21 +1,19 @@ .container_job_template: extends: .base_job_template - image: docker:stable + image: + name: gcr.io/kaniko-project/executor:v1.9.0-debug + entrypoint: [""] stage: containers - services: - - docker:dind before_script: - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest" - - apk add python3 - - docker info - - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" script: - echo "TAG:$TAG" - echo "COMMON_TAG:$COMMON_TAG" - - docker build --tag "$TAG" --cache-from "$TAG" --cache-from "$COMMON_TAG" - --build-arg BUILDKIT_INLINE_CACHE=1 - -f "tests/docker/dockerfiles/$NAME.docker" "." - - docker push "$TAG" - after_script: - - docker logout + - /kaniko/executor + --reproducible + --context "${CI_PROJECT_DIR}" + --cache=true + --cache-repo "${COMMON_TAG}" + --dockerfile "${CI_PROJECT_DIR}/tests/docker/dockerfiles/$NAME.docker" + --destination "${TAG}"