From patchwork Tue Apr 4 14:59:16 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: 670034 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp2492358wrt; Tue, 4 Apr 2023 07:59:55 -0700 (PDT) X-Google-Smtp-Source: AKy350YGEA9mUGX17JT92Ah6brFkHbypZ+mwrOEhT2Kc5IdRFrQdKRw53QObBb0gvPeX6+FS52YG X-Received: by 2002:a05:622a:1d5:b0:3e4:e4aa:b0c4 with SMTP id t21-20020a05622a01d500b003e4e4aab0c4mr3799757qtw.67.1680620395171; Tue, 04 Apr 2023 07:59:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680620395; cv=none; d=google.com; s=arc-20160816; b=zY9VFQ8MLx5sj73paR0Y46kiMOeuiuiB07pz9ak4kGcA2OsKhcyg7PUARfunBpIlAz YKCWWSXGlghM1S7KjyWc+BP/RzlAj+nOGvUG7oYohZluXsKaFwY6SNf/hurAAvOpxODB mQeZxH7SGlGA//bZ38qImsAjVpRVhUpqLQyNLSIqIUSrLrOohD8ySKVjL4AT1SXzUcg6 vtNqYP4u0EO/Zzrm0TZsyrakQV+vTLdR/TZXjAhOKXf0iCl3S8BQqk9Bn//dKgi58Evn fhSxy9142TehVU/duIvnOmLkqC4MTLSSxgjIPHCOJfJj09vjEZizqOQYtXP02yGuu14m v5pg== 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=0wPinvsk7vEdGY5KkltJh2yfDiVq++tbF2ZWCeEQzY0=; b=DSSeEbcc09dx964hgJpAhyPLfZbemvTYEelM1wIvFDVUngX4RqUgTvSw4NkYvk3Srm Ii3GsmvA7DQV5e3CSCooV5N+StiLM+vkUueysVA6uqQ1mdKG/ytBed6kX7rd4WVb1xTh vGZAteXN3x3e/GFb7ErtK1ILog340KZozfBneHMAFwGOQIUHDh+ZRHacPOxFsi8KUuXy HmtJY9MJHttAgZ90QAkLpXzz6rKXiZspi8NKr0pacu2zQAmgCd6RFTkCxsd9TImfKSjR tvAsZcZ8+QNfmbJgOqQ3LnOBqO7MsvR/Hpdtqp7jquzr9HWTgRjTDuF9q9sHBwweWoGp xTxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="AQiIE/Hq"; 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 a22-20020a05622a02d600b003e630c10a9fsi8217968qtx.497.2023.04.04.07.59.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Apr 2023 07:59:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="AQiIE/Hq"; 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 1pji8K-0004Gg-IJ; Tue, 04 Apr 2023 10:59:40 -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 1pji8E-0004DJ-OT for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:35 -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 1pji87-0005AH-WF for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:30 -0400 Received: by mail-wm1-x332.google.com with SMTP id i5-20020a05600c354500b003edd24054e0so22012778wmq.4 for ; Tue, 04 Apr 2023 07:59:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680620366; 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=0wPinvsk7vEdGY5KkltJh2yfDiVq++tbF2ZWCeEQzY0=; b=AQiIE/HqEu999x1122TC93rZcWcSNo9AhLhZXJIdi771f1vO+xVZQ9NgKcIBJKU3JE uXtiD3mCTdx8LjoYuyBOLo8sQUtVJTsfwjv87+JFXrZ4vb5MxYGEvEc4F+O9DEYWZ8ym AIKdxykb/lGe3MI7IubuN+u93JibFbmmsfFc2rYE9VBDlUDRHbFxhK/yrOKejv6yPUrL PUB3imVeQOR2DIN64YTCCOl8NSAjlGaLjIINDADAthMBpUlFi3GigBzbvk/TgVXRHalx DQLCwmxN7bPh2ld2gqSzZO8aOtYy/SVMoNWQQB63tRmNZrZjdwEoW3XGeI1jybfDsQhr VqYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680620366; 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=0wPinvsk7vEdGY5KkltJh2yfDiVq++tbF2ZWCeEQzY0=; b=edoXmuOsu8SsfRfe/mtYyUuAomCqoQFulT8PSZPcw0KMq6VTHBjhgJXnufN97iHEqn Se0ipwsFw4g1+NqcKkDrniJqCWdtkfqRnaiJCTKK9n6HJtHtd4DoODq5q6wncByJR29f +XBpZDzHzjDAeQSNAZq7SxEBwTP6EpaUHUzVa6QotT71knwviZtKbFsH3A7vdlxrc7LN C9V4fnDNMHPpFlLAax2NKjGjEANhN9NMh2omz7CnssfPajvg/t13muIixiNzuUMPt+LT 019W1abvWXL55ZXNXXWMh+NqNBrWRyyJdbcUQhraNCh6oAQJ0q5+KdVR3jZEcUWpyCu1 UGdg== X-Gm-Message-State: AAQBX9cZ8FuAVqpygnGuGrkLMO6tgx0fjsjXKDcPL1sceFx4EraWsrH/ Q5sQFcBSC1pwIIRHpgqshzFg8p1lHZNB8+YVnT8= X-Received: by 2002:a05:600c:b51:b0:3ed:2a91:3bc9 with SMTP id k17-20020a05600c0b5100b003ed2a913bc9mr2564726wmr.15.1680620365845; Tue, 04 Apr 2023 07:59:25 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 24-20020a05600c231800b003ed2276cd0dsm15456264wmo.38.2023.04.04.07.59.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 07:59:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3C33D1FFB8; Tue, 4 Apr 2023 15:59:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Kautuk Consul , Thomas Huth Subject: [PULL 01/10] scripts/coverage: initial coverage comparison script Date: Tue, 4 Apr 2023 15:59:16 +0100 Message-Id: <20230404145925.2638152-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230404145925.2638152-1-alex.bennee@linaro.org> References: <20230404145925.2638152-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 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 Message-Id: <20230403134920.2132362-2-alex.bennee@linaro.org> 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..1b92dc2c8c --- /dev/null +++ b/scripts/coverage/compare_gcov_json.py @@ -0,0 +1,119 @@ +#!/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 Tue Apr 4 14:59:17 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: 670036 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp2492528wrt; Tue, 4 Apr 2023 08:00:15 -0700 (PDT) X-Google-Smtp-Source: AKy350byhYqmhMp+c/gbwpVdyR/8veXjeCk8Rm8i3mRx++HsShfxyeZDvLspgdj1f39fJsH1Wpu2 X-Received: by 2002:a05:622a:1711:b0:3bf:d1b3:2bbb with SMTP id h17-20020a05622a171100b003bfd1b32bbbmr4157290qtk.13.1680620415162; Tue, 04 Apr 2023 08:00:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680620415; cv=none; d=google.com; s=arc-20160816; b=MNIIEIAo4O5j3McFgxpln0o18vxdsEAWH03e0Gvm4RkQ4t75V4jaREnKN0LNqestCx EhSBkuNg3lPrEIs5cTvTnqJUwXwRYiAaqdCRcwQdL8BaDeQv9b0pgOB68U4TC5WegCQd Wl1UfFxzwF+tUVh30tqtxYvkC6JoeJ/BsDiq3EukqOyanV19tbtay+bfv21uhsK7e/gE w/OGvTBn2JLfmVXzIyQCcFlJQYSbROHehZALPKhZN2Yg9C0p2lBjAEZ1S8Gk5fkIvN6L s4xQWPOUMzpQaudCp3euz76TXwUw1V7StwHWrWILPG3bSpMPR1qNw1xaCK8w49VI+Hvd E1qg== 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=Us25J4D0Q5rwDN9Lk3sXEJe0MV4QRphddeq5Ff9CS5Q=; b=BZYxj1wXZL3gT1bfzDp9knWHp4VLgBZ74lcmnf4RfuUdnomR6gpBR4dfH1Cjtwu2gH CyOaK95dD5JobeDrv6W9hDAXgz2YcioWSf+AHER2WWXo+JEbIorku66yU8LZ2GcO0kAa cMQ5ayh0TruocwthE4p/pQrWqE/qAWBZaaDw8RxTKcb+DIH42TzqvLoFOJdkhLqbZLay 0T+chXWC82rkX1N6ltXtz1vu4H5kFsx6jFqDZ2XMlIohyZAfsuh+Rt0ghVKa3ENeTdIS UeRZ0e1Ducj7gkLYFQSsxzZrs9ZLElpvS1K0FXTvCeqVXMRfyU/PNqOs9xwwtObuuwqT C52Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tXPmyD41; 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 f6-20020ac87f06000000b003e4f3f010e3si7862211qtk.675.2023.04.04.08.00.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Apr 2023 08:00: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=tXPmyD41; 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 1pji8V-0004LN-Sk; Tue, 04 Apr 2023 10:59:51 -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 1pji8L-0004Iu-AC for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:41 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pji8F-0005Ar-7I for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:41 -0400 Received: by mail-wm1-x32f.google.com with SMTP id n19so19229356wms.0 for ; Tue, 04 Apr 2023 07:59:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680620367; 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=Us25J4D0Q5rwDN9Lk3sXEJe0MV4QRphddeq5Ff9CS5Q=; b=tXPmyD414X79euJLAyvbW02rHCCa9Uzx6UPH+FLxBBBu/UNoVpGe2DKWikHEoJm9O7 XvQepEu9voA9rX341kng1CwN6HlHsGS9kPU7llU2Xd2CUIRzRjEd1FUZAbNHHUb3X/f4 KqAKrR62/JUkoNrm2h6Uq4yBGplywdsriBXsX33UdD58dWqvCqcL/talbu+NhYNtQaA0 VQGmV42HOJWrvHlpQjKTgpJHXUEhV7yus6j+f66SecHXmZfQsUj8eINty4/YBO9KLP8b 2tT89rIfTXlHFknrDFuGELuAzyJ9UiwTzW1zm7H3gM8vHm+wd36OVWELcqyFgkWQdwEY N37Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680620367; 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=Us25J4D0Q5rwDN9Lk3sXEJe0MV4QRphddeq5Ff9CS5Q=; b=68qsw6PThJMbMYoK3BYwh6Rt1ZWRa96WNbl0l3tljxMMcCIBOJLfIOT+UY9qrwefAd Ns35A6P3u+BXuseMVitgnTjYnNCypltqfqWOuUuJrcsbg4TDR5sbXB8OT//iY9Aq/J90 OOieaoXDZZqGVA6xrMVkLJzS7xu5kX7Rc1h5dzVAIc0njfoTD6wwnFFw7laUom4rficf 8He9PArpPE8zVNgja1KbcGA8wKolYqohTGTK7ZNFsJmbTI3KyZOIz8kV5/yvBAr3cXfn dZgwdY6DEch53bZ3vjhLmtwUZSxgroqDhR98Mus9zboZ6oAfLEOvz3UIGid53YD+r1a1 iHWA== X-Gm-Message-State: AAQBX9fpY0wW0DNYYpS0LUqe4+csgoph0KoyUP/zjNxiCmZ0Q1AohdoH UCSPrssgzXkx5qks9NVngFF5KA== X-Received: by 2002:a1c:7505:0:b0:3ef:6aa1:9284 with SMTP id o5-20020a1c7505000000b003ef6aa19284mr2478440wmc.29.1680620366956; Tue, 04 Apr 2023 07:59:26 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 5-20020a05600c228500b003e91b9a92c9sm15393696wmf.24.2023.04.04.07.59.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 07:59:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5200B1FFBA; Tue, 4 Apr 2023 15:59:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= Subject: [PULL 02/10] gdbstub: Only build libgdb_user.fa / libgdb_softmmu.fa if necessary Date: Tue, 4 Apr 2023 15:59:17 +0100 Message-Id: <20230404145925.2638152-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230404145925.2638152-1-alex.bennee@linaro.org> References: <20230404145925.2638152-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.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 Message-Id: <20230403134920.2132362-3-alex.bennee@linaro.org> 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 Tue Apr 4 14:59:18 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: 670037 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp2492680wrt; Tue, 4 Apr 2023 08:00:30 -0700 (PDT) X-Google-Smtp-Source: AKy350a1NngxXp8H7Kuu8su38sxeCoWYE8E3/2nLfBuvfglwT6JXkADLL47DjlbGJgo9jDJMEC30 X-Received: by 2002:a05:6214:408:b0:572:6e81:ae9c with SMTP id z8-20020a056214040800b005726e81ae9cmr41536664qvx.1.1680620429976; Tue, 04 Apr 2023 08:00:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680620429; cv=none; d=google.com; s=arc-20160816; b=tVRt3WxlavAY+7xKdpOkM0BcgC0e8nNnDlgiPMSbWC0NyG1TONHaNfreg/NJEgxwhq MLkGfGayycq35eVPCZooHmpf0e5ZWiyS+MBcR1k+Q1/6chd8dJJ5aP/D8WCr3Zo9Fq1h P5hax2ZTKzxvjrWuXZBftfNRPXCm4aTbz5AAObifPlKbxrh4+Zb0eofc/sy3NQzY3PxA tXWQJ17/N6tx0bLBXgiCr7iuCaI+7paUYTZwA+25N7Xfj4rGtf88VcPo4iL12+o/R9+9 2BkjQJjzj2avB9PGU/zo4d3k71g/kZbTl24Da9oIscxyS+KtQuafbE/Hn/u2VhNdVtGn dssg== 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=aAf+TE0WUqHD9GQJtq5AggVi3R+s0Li7ZN1ZFaHMUt0=; b=bpbl0TdhMyjcLVX2tTbuPT9zdVJRdRc/O9V+Ybv9NfZzrWjGfoi3VhVTfbjZLAsT/T aE9wKLkE0UG/zQ9K5f78+usrgJ/15mMbWhREGlJM5UgqAKAz5geyl3PCjHCxZbRUkDf5 PVT0v34LGKdJK3bY69wgd9uTUAbN9kg2JPtaDGsWUMs2cysf+JyqwFkk9jHcCZeTkjzM qJJt/8TU0EsCya1liHpP/MBuggvAj/6Jax9/j5qiXm7jMe1SN1AEWefGZVszYq9DpEDt rknfHpGUlLGV4mVyB7x+manLm6vQipoQK2zLxdvCBsbhXgqoEqRke5eA6NHj4sdZ9L4D TgdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ftp8OB1w; 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 e19-20020ac84e53000000b003e38f231618si8025335qtw.712.2023.04.04.08.00.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Apr 2023 08:00:29 -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=ftp8OB1w; 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 1pji8L-0004ID-5j; Tue, 04 Apr 2023 10:59:41 -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 1pji8E-0004D8-KZ for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:35 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pji87-0005AR-QY for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:30 -0400 Received: by mail-wm1-x330.google.com with SMTP id s13so19196228wmr.4 for ; Tue, 04 Apr 2023 07:59:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680620366; 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=aAf+TE0WUqHD9GQJtq5AggVi3R+s0Li7ZN1ZFaHMUt0=; b=ftp8OB1wIRjD4kMxXPqAODo5trzK11UJo9uxmhcNElR6hnQiEOQXjsp3ILYMaK1Jgb UFIeqb0bRGXV9PHmjKDzi6clodXIJj6pIn763a4KNt/GnWluvSw9XJQDo6LiWjccXU56 S/dOXpLEDRBYBgf/8pcAt/G2bZnf9r98FatEV+RVXwztoJYXpWDz3bhqZ460aaiBy+If f1nBAkXpan9EJzxAs0L2G2NwVC7cEmYac0BKrm6bNN/hDaqXH2Q7qIWFZHnu9i+EIlbM 5m0CHfhtzvhvDmE22ysiu4TcqTINcxRKarmaYIcP22w2E2SDvujYfK9JhCAJRphzx4gX Thyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680620366; 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=aAf+TE0WUqHD9GQJtq5AggVi3R+s0Li7ZN1ZFaHMUt0=; b=QzVI0A/JkyQq3Q+uQot31na8huweYgFOs40yUkkurNAmR7FFMlwEO1kVQ5wXOfR4u6 BV424AZ9Dq4O/9WNmfo1fqBl59g9lG1qJG6EfYnP9zICURZQKrcG8liFMnbu69JfqdB3 Mim3j8jF/a6bhvIrD0LyQ5S3v/tUBOno62t/xffSSR2ILRzHjOZFvzkuKbd5h4IbYfYE Bg1kzgIcrFhOYNL0pSHA4xYw4lP8KPligK7laOtyJiNLEGqW0u9mfuTtSCHo9yYQnv0c 7/Yu7rN5A8eR2daLjZiHTUM7lmY5SbST5gDlAOOgFyPaJ8pzHdflV0CUtJqeJ7URdYat nD+g== X-Gm-Message-State: AAQBX9cCZqSEJ1F2ZNqktLOQYjSBIi3KaqEtI5+lY+F/SvobyOrIr+vB QoZGeyYW8FqIWnYSFEu8iCI2MQ== X-Received: by 2002:a05:600c:4591:b0:3f0:3070:f4ea with SMTP id r17-20020a05600c459100b003f03070f4eamr14116162wmo.11.1680620366187; Tue, 04 Apr 2023 07:59:26 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o9-20020a05600c4fc900b003ef6bc71cccsm23234584wmq.27.2023.04.04.07.59.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 07:59:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6844E1FFBB; Tue, 4 Apr 2023 15:59:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 03/10] gdbstub: don't report auxv feature unless on Linux Date: Tue, 4 Apr 2023 15:59:18 +0100 Message-Id: <20230404145925.2638152-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230404145925.2638152-1-alex.bennee@linaro.org> References: <20230404145925.2638152-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The later handler if conditionally compiled only for Linux but we forgot to ensure we don't advertise it lest we confuse our BSD brethren. Signed-off-by: Alex Bennée Fixes: 51c623b0de ("gdbstub: add support to Xfer:auxv:read: packet") Reported-by: Warner Losh Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Warner Losh Tested-by: Warner Losh Message-Id: <20230403134920.2132362-4-alex.bennee@linaro.org> diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 2a66371aa5..0760d78685 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -1468,7 +1468,7 @@ static void handle_query_supported(GArray *params, void *user_ctx) ";ReverseStep+;ReverseContinue+"); } -#ifdef CONFIG_USER_ONLY +#if defined(CONFIG_USER_ONLY) && defined(CONFIG_LINUX) if (gdbserver_state.c_cpu->opaque) { g_string_append(gdbserver_state.str_buf, ";qXfer:auxv:read+"); } From patchwork Tue Apr 4 14:59:19 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: 670040 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp2493151wrt; Tue, 4 Apr 2023 08:01:11 -0700 (PDT) X-Google-Smtp-Source: AKy350ZwPrP4I5z9iE1BN6qS6aYhbMBL5oIfaoh0+6+Gd6/e9Y1Yxv/bBmv0VnWoIwPYCiwV+tYl X-Received: by 2002:ac8:4e4c:0:b0:3e6:4f7d:c9cd with SMTP id e12-20020ac84e4c000000b003e64f7dc9cdmr14917461qtw.7.1680620471348; Tue, 04 Apr 2023 08:01:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680620471; cv=none; d=google.com; s=arc-20160816; b=b7rwtkRionP948/qlItD4XL7IMILFBazDGgvS2O6fqirPhiuXTYhTxmiViYrAsmWwm jdnNZB4C/88BDAMnBulXCpgQR2kP5k4j7q0Uioqxep8ireiTU+hhlRM8jyo45LI4PjEY PcB71Zv5tkPWJx9kv3F8EDHeoCyjPrkoi68iDlsUAya3C+S/RRWsX+wwbI4FdAPbfwTl oXQaI2FQR+jtfVAO76EGJnvzV5rqLPr0tm2FDqQTOV3nGpZtChqRqRfYXxOEzAxjIGWk xf98bBd0dfLBxwvle3qKx0ObXwVDZpnjPGVKNAsB0tkfOn9hll6eLOHytCzYQIwH59JU +grA== 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=ephpmQKt93ZYQzGx2uBErwScg+gDyS6wyGuV7TyDF0o=; b=Rj71wBUqO4Yp0+mluDztoOXlNypBSrnA4/Iz07hcr3u7JhJT9Zm8KlCVJRWn5EDlhg IjL44QjIc7IbV2F+0R1YH2L6G12OYZWTFweoTM4me1HWR6FII+C1+rNs9JLfl1AY/U4b n5C/9BKHlBXgVDrsGwZvwZy09AUi7DqEtKQZIErnEzHw8hfKCuFOgcc4ml1PC6MfAXIY 4qMJ9TaGhFMyDYps+pudsulcQNsmb5ra5RMZltdeFrWN6nYYMWnFtwAt0YntArknB5a8 ZkAUDZAPtSOCAaYX8Cmt7iT3u+eCnf7fBBvckWNjH/iTKgBTeljDNZjqpMuRaY1ZxZu3 zIIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jSS38C7h; 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 bp18-20020a05620a459200b007302bb2a795si8139690qkb.458.2023.04.04.08.01.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Apr 2023 08:01:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jSS38C7h; 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 1pji8Q-0004K3-4w; Tue, 04 Apr 2023 10:59:46 -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 1pji8F-0004FO-Vw for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:36 -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 1pji8A-0005B4-97 for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:35 -0400 Received: by mail-wr1-x42f.google.com with SMTP id d17so33121909wrb.11 for ; Tue, 04 Apr 2023 07:59:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680620367; 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=ephpmQKt93ZYQzGx2uBErwScg+gDyS6wyGuV7TyDF0o=; b=jSS38C7hrPvrRpPrpsoCZlMrsNU2f+FV5jqtSIam4Ap1jcD4Of/50oN3wa+f/q/UNz Slmyv5KOxhWeKxKTWuNS038noxc7OVYQkycQHfsPGRwd4vbBEsBc0G4MjF+FuR/8agKc waAC9zzknl5Ayqe/saWxg/wp86BYIuvEMmKUFU33L0IzAmbctq8x9D5R345CISVO/GaI 2tBowGfvJBlg7ufLw5OPgdkIHbwIb2HLPMevp0/8HMMoH/SCvhEix1b3iXF0NeNkwNWS NhrI8T1VKmwKlKiLNEjDwhsCcncVK8La4GNIcXgLxRAmDVHbAMgpjZ9ARBvIOuDf4dHF mMFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680620367; 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=ephpmQKt93ZYQzGx2uBErwScg+gDyS6wyGuV7TyDF0o=; b=eD5hgP4cigmlHqtr1lTOJvvIhOSNA7kceC6V1S/xxVlP9TKn2qOAYx5GG7/IdrVUtO S7HsHZHE1u/W6S6dFF50CAJyYgH+LREZaEKOGqCH+DryoQlXTbULA5pB8cT35Z7MXdXs aI/v+vrYgAbaANl97NonjNi2j201o1okYI0KjzzkiFyE5CX5kHFxUmSE7OoyAldec1hq Dl3LgzV8ylzq2JE05AYVxKok3okxCmq+Hl6wNajBP4JdE/UoLAGTqaEVIUv+b7m80CJg h87/jYifqHAXs+AqH9d6oR8TqzZePAEVAtJsehKhoK5hDfLh+c2wO0R4LbDapydC0don OiTA== X-Gm-Message-State: AAQBX9cA4RUT++LbqHP6Ky8W7sQpVbiFIK7cReOKqQSDGdRcpmOgozQu 286m7r8zf/w8fUKTo91P32rAovwVVgRDNbXkZaE= X-Received: by 2002:adf:e2c4:0:b0:2c7:dad:5630 with SMTP id d4-20020adfe2c4000000b002c70dad5630mr1915815wrj.27.1680620367195; Tue, 04 Apr 2023 07:59:27 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z7-20020a05600c220700b003f04646838esm14222848wml.39.2023.04.04.07.59.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 07:59:25 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7D39C1FFBC; Tue, 4 Apr 2023 15:59:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Warner Losh , Markus Armbruster , Kashyap Chamarthy , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PULL 04/10] MAINTAINERS: add a section for policy documents Date: Tue, 4 Apr 2023 15:59:19 +0100 Message-Id: <20230404145925.2638152-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230404145925.2638152-1-alex.bennee@linaro.org> References: <20230404145925.2638152-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We don't update these often but now at least we have a few like minded individuals keeping reviewers eye out for changes. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Warner Losh Reviewed-by: Markus Armbruster Reviewed-by: Kashyap Chamarthy Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230403134920.2132362-5-alex.bennee@linaro.org> diff --git a/MAINTAINERS b/MAINTAINERS index 9e1a60ea24..2f67894604 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -64,6 +64,20 @@ 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 +R: Philippe Mathieu-Daudé +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 Tue Apr 4 14:59:20 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: 670035 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp2492500wrt; Tue, 4 Apr 2023 08:00:13 -0700 (PDT) X-Google-Smtp-Source: AKy350blp58xq65avoNM+e5DFV9ZAx15w8jHxTyDYvxmZX6Ragvogs1P9FYuOEn3RkMars4VAMMb X-Received: by 2002:a05:622a:15c1:b0:3e6:3861:b1f8 with SMTP id d1-20020a05622a15c100b003e63861b1f8mr3406497qty.38.1680620413217; Tue, 04 Apr 2023 08:00:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680620413; cv=none; d=google.com; s=arc-20160816; b=tRjiMYpUmusETXFP76VaF+qoFAIpjBQNA8SxV62GWbLvCuh1EfTojxgjS70p14ZmjM Eds9sh7AoFpYOCF72ilIxVU8UQmTd70rkne6m6ocJQ5olF73ytuS173iF3wTx20cbout fR2Eqzc+TR2UsbXEWFXZPl2cslvOOeGcvP5xf3WL/GU1+enkuS+cmpiOMJsi6GS/fRRT tdUtGe/Y01LCY0KHl7fjSHRvsztDU4ArnkCdh/Sl+tEBV6Yo0vcQkHDhXpJQpi1KTbij 5KFGTvDQh+7eIfwt3GDz6guL0EObjyZ0gkkHcZuPkZcvzj/1//sigkhfrH6DBUHJwWyl pcjg== 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=LjHLaVrEVQKJ9Md9w/twy+uhYkbwEad0mCPaPdBTuAs=; b=sLHxF2WzsyHx3oY4DuQcnonlDNh248Dvaqr33TsOfJm3NZMjdVQ9aEo08zAldzQlld dSoAXXKoBrJtFnI47NYr0JS541ZOTQcpb5VSVhveBRAqgiulFeIIMgnAjNmqqrFst96E SUEJ0JNSwF2wnVr4zBc/xBuZ+OW5vlhKrVLCw7Yee/kJ1Jd1gr8CMgjRBeGegfhnycdA KcwzUiAuVWUeV/YfBhv1Snbox1eBezCGEHLd9PA1wZ/U33YijbMG2RjaDzAJzG4ovrOQ QoTuJepi6MbjEMydk+xmMZht7/wHAuTtVxtBETvEHg0NKeO2rTBPzPbbBlsP0HQBbYVB c3Qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AT0nGEw5; 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 c11-20020a05622a024b00b003e4eaec2617si7796020qtx.792.2023.04.04.08.00.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Apr 2023 08:00:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AT0nGEw5; 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 1pji8Y-0004Le-Hb; Tue, 04 Apr 2023 10:59: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 1pji8K-0004HR-Pp for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:40 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pji8D-0005B6-TQ for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:37 -0400 Received: by mail-wr1-x430.google.com with SMTP id d17so33121925wrb.11 for ; Tue, 04 Apr 2023 07:59:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680620367; 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=LjHLaVrEVQKJ9Md9w/twy+uhYkbwEad0mCPaPdBTuAs=; b=AT0nGEw5nmeFBXg9FVoLQ+/xfbvylAyVo9vxqj0wM1wrdqrMVYpyInhiAK0Buo5o9q OJ85hpHT9AxkpM1sBrCPdRtZc5I5fEyQpPrBACGx/uxA26eyoMvdhIsIo71GU0K+xw62 OEtARa8LKnbAjGyM52jYY4uiW5OVuAHffnZ+6xZ9/zwiob9Hu9srGhbkDlghL+/csA3+ Ft9IxYdeh2O6IqcSJQ/ftSjzOxhjv1vVzit/zGKsj6ZVj8cDJtAA/pUcELrCwovkpeQz PmDIF85lyPqxpqR+y4b1TpDd4iv3mACVIyy/wwuxsOoYHdtxJgR6ib/R0LoluKa84X8U eF2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680620367; 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=LjHLaVrEVQKJ9Md9w/twy+uhYkbwEad0mCPaPdBTuAs=; b=qS8zsMJYhsrvvxNOK4fk0tWnco2JQ5iM2scLVzw1NjcGffsLj68jnLWvIDubPHPKOf dIm+3tM2edY2Z/+I2quCx04sY5plsQ+AUVJyJzsdPDXONyLOBYdNY2QAbPG3ijrC8KbL JHQAGuESnrxbNPCvjSq7ts4LqoX68gELegPATX6d5S6DJE8cAqYdD3LhBGe4rrItryKT 4J5IH6IJk5DNyD/YizL1Sn/XdX08/BpBs+buDwgKJEIkj1YRXOjZ880ccp+Ey1sdas4H 7WA2wDi/eUP6x22xN5PCCsjymki9OyGH8zxACag8RfocwpBDt2Z7gflXOFAsyDqaYTro vklg== X-Gm-Message-State: AAQBX9fl4EGHOcBtwQCB1i7cR4DKnn4V0sZ7FZuavlYJe89wRaqF5iHw syaY7iFkk8wstSgLqlzTj8upAA== X-Received: by 2002:a05:6000:10cc:b0:2ce:ae57:71db with SMTP id b12-20020a05600010cc00b002ceae5771dbmr2025455wrx.33.1680620367402; Tue, 04 Apr 2023 07:59:27 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 24-20020a05600c231800b003ed2276cd0dsm15456291wmo.38.2023.04.04.07.59.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 07:59:27 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 92B161FFBD; Tue, 4 Apr 2023 15:59:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [PULL 05/10] metadata: add .git-blame-ignore-revs Date: Tue, 4 Apr 2023 15:59:20 +0100 Message-Id: <20230404145925.2638152-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230404145925.2638152-1-alex.bennee@linaro.org> References: <20230404145925.2638152-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20230403134920.2132362-7-alex.bennee@linaro.org> diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000000..93718ef425 --- /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 Tue Apr 4 14:59:21 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: 670044 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp2493838wrt; Tue, 4 Apr 2023 08:02:06 -0700 (PDT) X-Google-Smtp-Source: AKy350bgZ0rJQtiHGJ0QvsLHNg41kvgCYHf1o9t9PkbFM9Ss5HTSCXZhBM8TxxTQmik3ukLKgriU X-Received: by 2002:a9d:7b55:0:b0:69f:578a:d1ea with SMTP id f21-20020a9d7b55000000b0069f578ad1eamr1335631oto.32.1680620526411; Tue, 04 Apr 2023 08:02:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680620526; cv=none; d=google.com; s=arc-20160816; b=t364E08Wq+KijLX/gzEOsg3PlJS3G25C9LdQFw3RgtplXu0YaWb0rYSNXUDTUDod1W Y2AprMXqPB6Do6Hd0dwqMiyEumpWLOxGfSuQzMriz71WaEEh10DUoWrk+dMQNs77hwwX vmmogLqm54907vd88QXx0AE1TE8Ru+Aq0E1y3asKHu9ND8OPPvYQaNlv0qkZmV9Np6+O yrFMZz228aozvIzHwx2BUkG+/aOTNcESsQ5OExxiRM1MbjegoR2/99PUccz23UwCtypa j/pKG+YTLstCRn8HexSQr/EdUL5RLMXbdy8RSQMPwW27L+CUej1GVwNHAn+PXxOvrrUB 7ENg== 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=HcRxyZn3FQlBOoql67WkillcPr6cNAr+lCrFgofptWA=; b=L+k/GV/LisYDqNNo63rtZoUo5i6fRsxMQowncUmq0M3vvVF2Dqp4braonnFMGG/llL gnXU3oIIwQD9SXhw0aeX4RpS+0xIKN82BCSRqRdUd9QbjQ0Cds64+qnegw9Dh2+MltK8 PVcuH1jiUI+qyxoRJ1JshvmzXFH2z3ByVJcw2mFPLVJ0hFzniKZwAsO4ZUrBA+N/lUUg a1IjsIowA++mxeIMmZ6p2hQLUsQ6E5cfOTp/W6jXpPMdAIOaTaEdRU1wiYdlULlfBpMC mYevH0XglpSvTg3LJOEfm7ZqI1PQdoI/Jge90Z/slBtEGvLS0waaoe3blZ3OXlDOYJ1f LrVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uKGnDmyi; 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 u4-20020a05610200c400b004123d13fb7csi1948620vsp.769.2023.04.04.08.02.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Apr 2023 08:02:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uKGnDmyi; 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 1pji8u-0004my-IS; Tue, 04 Apr 2023 11:00:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pji8L-0004Iy-EJ for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:41 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pji8F-0005Bg-86 for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:41 -0400 Received: by mail-wr1-x42e.google.com with SMTP id r29so33108612wra.13 for ; Tue, 04 Apr 2023 07:59:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680620368; 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=HcRxyZn3FQlBOoql67WkillcPr6cNAr+lCrFgofptWA=; b=uKGnDmyiQaoG5xBIVb50G9hpvbrCWXDpC9qdWP1VpqMwy7D12rq8BD2ahaQ3NqJh0h Oz+dCQuLA92U5KexmSBmEy61U7o6Wmj+MCg1wS9RJQInntOicmZVn/lcht8I7uKhkYJ8 agq5o9SDks95AbqPcOSI3KXrMOfH6kly/uoCjPucKyKf88HMGlK8wu2Njnmy2NJNUwvu mgy8Ff5PItfUDeU8XCyLp1dD9eyHd5RUjSGwDb4FNe4Eh9PogDNjLfj3TW45l+YHw1tk BrbCfnfu9PHQdS7bRlAubbNJaForsvy1nWOOjyq+qfTctCFuD6ULnXEovpnPZm2KNm6V 1V2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680620368; 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=HcRxyZn3FQlBOoql67WkillcPr6cNAr+lCrFgofptWA=; b=6+4rn5NqJxPCZzyrA8/WkXbPrhcWh2CZLFM0Vzue/Q2M8qeJLk/X/5TnjkD4hYvHVq qPKQY61suxaEBeRVki1LSUNfyH0fDSyQq8Eq0ewc8+7AcMxnCB+fZJM2GLVp8n71UfTv z3UWJ+9c4qh8iPi/HAiCGTq4Xw25YO7FxPEKME2O0YCPUC4iTYvBJBw3sWgBfBZclDiR weBeO51ywxhAvALwRWg3sBJXp/V0V7QngPG+msRNxFJhaTs+0gK2yET1mW73CsP9W+AC 15dG+zlQIxCvjQ1SwppWkejRQmmGFax7YU1oKPdSWTfZH7jRCr23znUC+67wCJwTEjEu 73Ng== X-Gm-Message-State: AAQBX9eeqAicXP086FoJ4WExZKxeTCbWN0JHgoaXXAi+ZaAoS+qWohyb MQpV8ofvHsKoc4qWJhgKe9Ke+Q== X-Received: by 2002:a5d:4573:0:b0:2e0:f63a:2324 with SMTP id a19-20020a5d4573000000b002e0f63a2324mr1805028wrc.23.1680620368158; Tue, 04 Apr 2023 07:59:28 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id l4-20020a5d6744000000b002da76acfee1sm12451408wrw.28.2023.04.04.07.59.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 07:59:27 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A87401FFBE; Tue, 4 Apr 2023 15:59:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Marco Liebel , Brian Cain , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 06/10] Use hexagon toolchain version 16.0.0 Date: Tue, 4 Apr 2023 15:59:21 +0100 Message-Id: <20230404145925.2638152-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230404145925.2638152-1-alex.bennee@linaro.org> References: <20230404145925.2638152-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-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 Message-Id: <20230403134920.2132362-8-alex.bennee@linaro.org> 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 Tue Apr 4 14:59:22 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: 670042 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp2493587wrt; Tue, 4 Apr 2023 08:01:46 -0700 (PDT) X-Google-Smtp-Source: AKy350anLyx12V03NEFlTRhZcFYaXpSJt0LmWdNvw112n1GMGN5h3hz/XvYxLe9BGrlEadDFKllp X-Received: by 2002:a67:ea99:0:b0:426:b0e9:b5e4 with SMTP id f25-20020a67ea99000000b00426b0e9b5e4mr1308053vso.1.1680620505854; Tue, 04 Apr 2023 08:01:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680620505; cv=none; d=google.com; s=arc-20160816; b=vMcryC9E2gSeghk87kyPZFlqQu8cRwhWhVSlb0lQHp2aYgT9Kc/gZvWz/ZzJ39d0cS a2QOaHzinaVDc1A2SiFnFebE+nTHiz9ujC/qnMEp8VTOmKFAOpLZMjRUHMyj+8J0jrFR nwC/ZQlqOrWLC8XwVsjh0oaBogwUtRCdbgqkaVRzw9gMu7DJpsnadcUBFZbP56UfWt4v l8jjNE7YbVJ34O+Q2JcVpe4IPzZsZOfYzKY9J8ehSRRinegiIK3jAyhWVy6IRaRC2LyJ 6/vF4EH6iTzkKZxbnlCauC5qGLprOx0iY+o+Km35YOIhLTih03JScinqssEMOkwLqTVG O78A== 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=VLjuwoI0tklS2lCWxChUrAL9FHWkh8xZZV4DuqjaNu8=; b=EGhfXchzK7Oz6PPO5q4UG8WMq7uvJSwUl5mIvXSt6bULSDJbns/giRFEGL8w3sbsC7 sAz+6AbrEnDGj7afdAW2W04si5vFFSBiPDts4GcqS3IvbmZB/M1K/L7UIWEC/9+olPwZ zb695kkGQAdzMEibx4H0lsch9t8r43ANgYdxYtsWP+PkR0irsOywlxS3wdaHf+6/6xhr ngJDSjrYJg+fzgVXrI2zGOs2fQP47klEmhvzwYVFjHckOWK96moh+vHcqTosMBVmhq6g zS4u+BNZ2lbG2XxRw52JaY3tOfPDRcJDC7s4GfHuXA7+LLfBUST/Z1GHrFM+KRNsInIT VyWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lix3cDab; 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 s3-20020a056102300300b003aa18fc61f3si1923856vsa.1.2023.04.04.08.01.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Apr 2023 08:01:45 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lix3cDab; 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 1pji8r-0004dW-6b; Tue, 04 Apr 2023 11:00:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pji8K-0004Hb-Sb for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:40 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pji8E-0005CP-NY for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:39 -0400 Received: by mail-wr1-x430.google.com with SMTP id m2so33142157wrh.6 for ; Tue, 04 Apr 2023 07:59:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680620369; 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=VLjuwoI0tklS2lCWxChUrAL9FHWkh8xZZV4DuqjaNu8=; b=lix3cDab6lA6a5zF/XVL/gEyA6yjcW8V29KxRtTplZ0Pfr/6E9jb66zb94lIUPEbOd wrP0TllA8lxVYTuvJd6FsDQSJu209dMmSEUdUn7Wp0QMw9eAVeyHyB8Qxb+ea8Q2604p oxpEd6Supc/kDgUVJq1MNH7F/MSXYdBP9hXTli1Ym9qFuVUv4iOMjCUIpTFfLSUdpoPf 6NMsTHSd8gi+RcJ3pNMV6f9ab5B2N9utsEd0/093S/h6rLPPSsEOc2q6swXLiHc8+Hty /3BMw+23FoXSR/z9sMwKV1G8oNg5GgAdrlPAbQCWDDGdnTcsdQrEvHUwhYP5Id5xEMf4 i6vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680620369; 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=VLjuwoI0tklS2lCWxChUrAL9FHWkh8xZZV4DuqjaNu8=; b=uW5mVhovV4yoIIK0a7ifkBntDe7tJY5crXl/E7PoB3z5EPbcxvJerKGfPCtt4nNe6R Ef8tMSaX0QQ9CHswMAQKMq+C6B9/YbILW1IdrfaylNTrRt7gK/CY1tG+iHNPXQOlhHhc Kp88CjcNpjO1a8EE3U7UGCJT+P8IR8EtSTL20BBkxyX8WYwfegLaubLWwlnTcP/Sq2pS lQRXKRsrZBLq+xE8QBqAPvN05JuPMy0EiyYnVmCFjVxvitut2vQLEC3Qpgmsc1515x3H hr3dSTbHBtgFbUbKFLAYN5qNt5nEXvrHrEPPtvOQtqdxmdMdPrvpB+fTnj5YZoUS5bSR 0+zA== X-Gm-Message-State: AAQBX9cxQER+QZ0A7R2XfjqOH/qtx1zkBHIQnZUi8STLz157d/UIJA8f ZDdrPcpPYiTX1pzZvgDrzeGqaA== X-Received: by 2002:a5d:5704:0:b0:2ce:a8e4:bb79 with SMTP id a4-20020a5d5704000000b002cea8e4bb79mr1882574wrv.53.1680620369265; Tue, 04 Apr 2023 07:59:29 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u18-20020a5d5152000000b002be5bdbe40csm12393408wrt.27.2023.04.04.07.59.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 07:59:27 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BECCE1FFBF; Tue, 4 Apr 2023 15:59:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Thomas Huth , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org (open list:Block layer core) Subject: [PULL 07/10] tests/qemu-iotests: explicitly invoke 'check' via 'python' Date: Tue, 4 Apr 2023 15:59:22 +0100 Message-Id: <20230404145925.2638152-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230404145925.2638152-1-alex.bennee@linaro.org> References: <20230404145925.2638152-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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é 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 Message-Id: <20230403134920.2132362-9-alex.bennee@linaro.org> 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 Tue Apr 4 14:59:23 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: 670039 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp2493074wrt; Tue, 4 Apr 2023 08:01:04 -0700 (PDT) X-Google-Smtp-Source: AKy350aEWLuZKi9gyZMTKkPtAYwswE4Tt00Kbr5wDZoS+qRpYNIBnI89Jkc+NTBTaJWyblO3b121 X-Received: by 2002:a05:622a:2c2:b0:3b6:8b52:1359 with SMTP id a2-20020a05622a02c200b003b68b521359mr5522259qtx.0.1680620464617; Tue, 04 Apr 2023 08:01:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680620464; cv=none; d=google.com; s=arc-20160816; b=Vv/rRDZq0zi0KqzASrw+MmE70c8RgY37cNbNVexSwBvVQZ0m/QcHuYMH/J5vm8GrL5 /ql4JbsEGSt3Qj9WGzIPnmLnNiciq+YZSA1R62Q/DWy+NltCxoHP5R9QzR0htJtBYDqZ xUYoVF2lT5+mxJarGM5SZT10VIUSqN0XEA30L6Mnz90mL9t+CXO1KvkHlTDo3zicMmv8 c7qs1004dos4DR55WIThhhapbDvw58Xje7FM88DLPwU5VL86NUzOlEKZ7+/eskCY2F+0 yF/C6pkNhs5mru7V1mSwNJaLHIiIMb3WrWg0NNXha5PeSo+Sg+JmXuhECwFCWT6OBdq/ y50A== 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=sB2ReJwCTUZnQ2bZlM/lAF1vxjy9hIECqbEXZz9U9CI=; b=CPz4UP1mk00087e4HZFRjJqTzenJQL/bydmgmmpyTXL6otCG/ot6EGeI2UbpThxjyN 1LjKY6FtYiBhakdS5ZzlaByzMecijDg8tbELQgcrImV1PmVvYhg/BQAYGRODmo0xBt2/ JhNRZFfEpNkNm/j7GUBSbLM4ZR1EztlVr5U2QBck3cmk3lQ5JhVZRB1g/ZZ3MkY7LjNi WhI9Gj0gsNxDqPw8hHnTlghmsX/sHGV4KyKXACa8/ZPFtubzhl3DOoOMgsMCmpLcWNLF 0l7efyjl+U1R7+lSTm94zYTBb05aJSnw7uPlbUbSiWHla2ITV8oitQYwayAhA2mw/F00 ZyGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U8jqb1lX; 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 f16-20020ac87f10000000b003e4ec4b5d7esi5559579qtk.30.2023.04.04.08.01.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Apr 2023 08:01:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U8jqb1lX; 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 1pji8u-0004nm-JT; Tue, 04 Apr 2023 11:00:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pji8Q-0004Kp-8d for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:46 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pji8F-0005Bx-7V for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:42 -0400 Received: by mail-wr1-x430.google.com with SMTP id i9so33153855wrp.3 for ; Tue, 04 Apr 2023 07:59:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680620368; 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=sB2ReJwCTUZnQ2bZlM/lAF1vxjy9hIECqbEXZz9U9CI=; b=U8jqb1lX2XH0ajWjrDMjLJRHpc9ca7r6getiSpN/dcliI7Mm02YynJzMRGBhKZzDOq KoL+s9EES9hKL8QhYMSGlaOt9yY2rfQoN8rJ1nKLjKLEPBTp/5EOb5faV7W72tHwWwm+ 0A1CXnRT5Ij6CdBu9TKxbv9YHZTE4OJt2RaknfTpko14KX8lhXA5MgtPwE1bdAwamsFs 9Hp6LTDu4OnqqIYPQ5JtspFmZsqn3V6HedT83qX5BOrdBEGgW1ntxwVcBoIybQOL/aVR fQlIG+FuKzllE8x3ONHGAbY5VdD/zeIUqVj3XxAak74BMqemRSQC/MggFV4wxYABjYmc WzHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680620368; 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=sB2ReJwCTUZnQ2bZlM/lAF1vxjy9hIECqbEXZz9U9CI=; b=3aKGNhe2rM7ZVmIy7LjD9r829aM0/fV4mGEGWykfgeVzbBAjW0AbJf8fosA5Tqco1r ClbmNXVUV1ug+OHIFhnG7N/K0i2w++SOp5kZ7nQfv4cwymhbnVAsixhRvwE2BpO0OOZP 37ZfoEqRGWogpCOA2++KLoOZn4gVh3sxQLIYuOpw6tfCdjY+x4lhCoXy8I1i3omU0AQm 9t1hn4NZQwi2tt2pq7/jp6NZZMjVTQW8jfQxWQU0JCxaj9h18u4515Fhh3ToTTIhqTWD xwJaG9Q8/dhROd4Z2ctSi1M0N0pVscN26azmhB/SCnP9BdLJ6LPl5oXy3uIyd8k/rZJu rCxw== X-Gm-Message-State: AAQBX9erYOwqUZbopWe5jfyTl6OHg4cNXWahV/Vp6JWK2UJJdm2Xi5iB 9QLUpMhAlgd4b7tamgCWkynL4w== X-Received: by 2002:adf:e5c6:0:b0:2d3:bde8:9ff with SMTP id a6-20020adfe5c6000000b002d3bde809ffmr1950458wrn.34.1680620368492; Tue, 04 Apr 2023 07:59:28 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id d8-20020a5d6448000000b002c70d97af78sm12434244wrw.85.2023.04.04.07.59.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 07:59:27 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D508F1FFC0; Tue, 4 Apr 2023 15:59:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Thomas Huth , Warner Losh , Kyle Evans , Wainer dos Santos Moschetta , Beraldo Leal , Reinoud Zandijk , Ryo ONODERA Subject: [PULL 08/10] tests/vm: use the default system python for NetBSD Date: Tue, 4 Apr 2023 15:59:23 +0100 Message-Id: <20230404145925.2638152-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230404145925.2638152-1-alex.bennee@linaro.org> References: <20230404145925.2638152-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-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 Tested-by: Philippe Mathieu-Daudé Message-Id: <20230403134920.2132362-10-alex.bennee@linaro.org> 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 Tue Apr 4 14:59:24 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: 670041 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp2493170wrt; Tue, 4 Apr 2023 08:01:12 -0700 (PDT) X-Google-Smtp-Source: AKy350YxaM2EC1SRD9ANiljH5/FLAHheOywnS0gdDIF/O18/mNZAT3ZuvEfE9QCkG7JtPrdb2wvw X-Received: by 2002:a05:622a:1206:b0:3e6:386b:2314 with SMTP id y6-20020a05622a120600b003e6386b2314mr4273436qtx.62.1680620472751; Tue, 04 Apr 2023 08:01:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680620472; cv=none; d=google.com; s=arc-20160816; b=xvg46SEZZoNmDjP25nKrgjrvAoH+4dlhVHxb7+dylbxAgEE0DuyZbDYzr2uoQN5eIf WuTYvJSRoccMn9d2/nwm+nv1GzWhFEFEEnYFg67G8SpmPW4X/bY1Ri422t2kkC94vrBP CK1h1i7yM98P+fZx1lR9vyMoM9oBPAiGWhBq/s7i9D1tglFL56Kg9l5mQVJgKNuqC9am jkguaLJYUc4aJ9nctGf9D+UcSXerKIdxib0+8RzjKI1BG9KvmnfisNNoDOwThFpQtx5+ IruXTxyHArDI8yCVLfOkN5eIlSObQjmgpmvBxwPjEBBbK998V7AEY24T3Nbq/cW5lPKe O3uw== 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=mPEptVG1moOKrND226B39dC48TdBlR+dJHFVa4gG/E0=; b=u5xVBjQ85PaVfe0Gz52nGbmKgi9+31UvaYtazkvqZa0YIJrayln6CZNLRAbAliETox 05mtjoxnwWrJ3ri0VfJie/RrO5IP7HZD+p3lwoxgkjnSNQYUMsI9ewmUvby+Es8WbDhH Qf6jIBULXe7GjZ3cmLTp/Ltos+mwTGj+PWBZvw3Br3rZnxXVFxkAQJAfYph2tX4DT6WT ATH5KN++fdLiBOOgeWKBKgOB4oQQtxLFXt2Cljnk7MikUbBG3bS986vomgs9ZVULMUee j9Jr5bg1ks4fAG0cbAN2w5QZScKx0xnBSCwmDVEwrewuWa4SIpl7YGXfGjMCBRxE9+pW Rt8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CsDrdwkb; 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 s21-20020ac85cd5000000b003e396bede6csi8374568qta.490.2023.04.04.08.01.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Apr 2023 08:01: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=CsDrdwkb; 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 1pji92-0004x8-M7; Tue, 04 Apr 2023 11:00:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pji8K-0004Hi-UU for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:40 -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 1pji8E-0005Br-Na for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:39 -0400 Received: by mail-wm1-x334.google.com with SMTP id n9-20020a05600c4f8900b003f05f617f3cso1138020wmq.2 for ; Tue, 04 Apr 2023 07:59:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680620368; 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=mPEptVG1moOKrND226B39dC48TdBlR+dJHFVa4gG/E0=; b=CsDrdwkb2dlug61gdJwqjCyOH+kZbNUHv+ACBFrHy1lumZq6K8JrFzp0NtyICkQSGs W+MA6Y6UuuxE0jGIsTid3ahEZmGdkfLK4dxUxS0p4MPOR1nVQu8fPzgkY7Xd9wm249CM Vn9sWstb/H50O1Nu9TzWYgr5ttzamzubMJ5fbleHBEym3w4HlrSqYjOGbrocSoM5uD5b TLzccJBL0V/rPVt62/WfACe3XwXCP0SLnjzbfL0fmSF6cqi0c3EkNXRD43lj3HjJue8t 8j3wOoHQ+8nNHmrRKfAB233Y7bo4jePON10ya4LcMYMKB7NzYWeNlzJVTvatfs2YDndu VWZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680620368; 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=mPEptVG1moOKrND226B39dC48TdBlR+dJHFVa4gG/E0=; b=Vhcd0IlQaC0sXc2SHLdf6MnHvyUF3RNI0cGo085zFLyAy1bisY+qlNSvyfDI+SfYJb J8+dx+Ag58VmLyEFe+ct1UIUzz2vXDZp1bbZw0/EOd/CG3RLBSEUJDsAn2vQMmSCZ509 3tzXV3zsBOER2iWzBhMXIgyREMrsYDTTOSggAkrqwHVLuLgF05wNDGEG/lrrbI2m8J2G DM5RZBZZsBTKOKsOaqlpmIPBUK/Em3nhTz2T4ILIJIrxHn9Ei0fVpinsuRMwGbpVGxp1 Fq5N3FLMNxXiB0ByThxw7wbHRvJMCmT0OdD9ntmjSwUJjbFuPSD9l85YIPTznGFSCCKi 5Uaw== X-Gm-Message-State: AAQBX9d/mPtXn6ynrdQPuPcExHRW3OtA8kw1Ft3o5byE87mF3HTq9Ude uS3EJ3t9rMvDccqb8SW3NnMcmw== X-Received: by 2002:a1c:f718:0:b0:3ed:4685:4618 with SMTP id v24-20020a1cf718000000b003ed46854618mr2418148wmh.34.1680620368308; Tue, 04 Apr 2023 07:59:28 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id f22-20020a1c6a16000000b003ed2433aa4asm15279812wmc.41.2023.04.04.07.59.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 07:59:27 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EB6CE1FFB8; Tue, 4 Apr 2023 15:59:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 09/10] gitlab: fix typo Date: Tue, 4 Apr 2023 15:59:24 +0100 Message-Id: <20230404145925.2638152-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230404145925.2638152-1-alex.bennee@linaro.org> References: <20230404145925.2638152-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 Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230403134920.2132362-11-alex.bennee@linaro.org> 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 Tue Apr 4 14:59:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 670043 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp2493646wrt; Tue, 4 Apr 2023 08:01:50 -0700 (PDT) X-Google-Smtp-Source: AKy350Yc8XCIoxpF0sTY2sDaxxdyCRGouguZ2bc+sKS9b/i+7z/AKGZ8DSOn46xk0Zs70g3K0/Ir X-Received: by 2002:a17:902:ce8d:b0:1a2:1042:cadc with SMTP id f13-20020a170902ce8d00b001a21042cadcmr3262638plg.18.1680620510420; Tue, 04 Apr 2023 08:01:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680620510; cv=none; d=google.com; s=arc-20160816; b=N6gna/DKzJvb9OGJQJGWLUOwVaGg1EO6vDVHp4YDi486Q1noL9nzeTikAaVzSx6X18 IwvFQ2nRKzWNPIj4ZyPjpr1Q0/NnEXhlN3ameInTe1ohsMWwToNCiXaeVWunCgKkE8tI JW9ofVWwZrWPg3RjFDRdcezBN2cNSWcTZuf4Klklfl93hKCiHEnENxnW+t5xDos55Rz/ U6QRvL33rBeNwpdSV41f2o8sxChLia4UxGvYG4hDB90ZRlJ1hEbPMgpzY2mz8tC+ZQc2 sNSK3UIpqVWQJf6qHkjAItoWKWDGfKMmwzuibojfTCKDxca2yVc/5z/2vlnT8kvwQHJS k+yw== 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=begeEv6PzHWw3JSOB2kgWACzTnnU0szOMJ+RXUWQ8A8=; b=vS5qM0w0UgFdls4/e8PdwQW8xl5+g9Oh7Q6AP/xBX9SiUZmEmVkWEMPUGefcfNUvN8 wMDOsInXIZZbea1ffxC987YSspVvL39dzDY+GCIK32Fk0yWeXIfbxtfTfC+mSyAHFq8B 110PmeYZ/ky/gb9XuBCXuV8yRNemw4yqdu1zgVwRuGtWUSTKtvDmNdNIRFRFqd/ZbZJt gswQMFcgEsfpv2Pe2rEuN5JK7B/u+ylycQBJLRD69JU43KNZueXnxnJ1Ax7e8f7m0xfP 8tYDy00Dq1NTxp41eerbKKu81lkPYWxfBVkreT9aFnbGRTjeg2MP6/x1vgcRrrRfVb50 +QPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="E/Ca0Bd7"; 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 k5-20020a67e3c5000000b00425a6c94841si2080331vsm.740.2023.04.04.08.01.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Apr 2023 08:01:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="E/Ca0Bd7"; 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 1pji8m-0004b0-B7; Tue, 04 Apr 2023 11:00:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pji8L-0004Jc-OF for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:45 -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 1pji8F-0005Cd-7F for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:41 -0400 Received: by mail-wr1-x435.google.com with SMTP id y14so33174157wrq.4 for ; Tue, 04 Apr 2023 07:59:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680620369; 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=begeEv6PzHWw3JSOB2kgWACzTnnU0szOMJ+RXUWQ8A8=; b=E/Ca0Bd7C4CXGFCDNsOJDB649tVI0gVBga77QPwxXTrFMx2LTp/uNm3f38qC6Zv8F+ w74iAgHTgiGHcbqenRue9Jidd+uWx0iI9nCCMLpDlsqnvow/co2U69LIy28979mZyKMX EJHV6QzHJ4VYDRgLucIfoIiyTnpfXqfQZRT+CfbEEN3tPJFiqvsf9gQ/+kPlIY53iLv4 E2Ew8+V5uLWeY0KvZwooepdGMTqLis8VnXPzVsR6tRNbuW1RcZ8itGajZDSItPltopnf vBJFYnEz5Q2EVQUjBsPFFpmh2JsUNHV4m/r/EEVoSOx7m9pmorWzOkPdS/nwBh1slRn1 Iueg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680620369; 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=begeEv6PzHWw3JSOB2kgWACzTnnU0szOMJ+RXUWQ8A8=; b=LqKe94nCiBtIrTl8cmVSX+7JQ3QrxR3mm+Q8brt54zBslK2gstTAmHloOouu7fW8al Gh3QDZ50uXYhDb155iKALpbM5S5XWYGM+DcmSHEG2SpCIE8f4UA1zMSNcXvclCf6uWpF 27LQy8Lsd9H60JLR7tPb63LzXiZ5VfrAwTdGF7hRtGz03FYsJHltXesKqlTpjApPeGQJ khU01ciGB5FTJecueNgcP6mTFQbrdaus8BkcGcPXRStABeU+bkoTJP0t7dWPbotFlLTJ Cn5YQwoHeYQ5vl0GGdGDbL3B9ZdAXYVTwKZL3g/JFXSuZdnwEKW2VyJMivTHM0JBQdBD Xykg== X-Gm-Message-State: AAQBX9eFpRee+UefpVQgT0BVjS8Z0grXan4IXhX47cLei/Y/lwmEeTUo w3UwnJiF0swuUdo8I3/9WsbNIQ== X-Received: by 2002:adf:dd8d:0:b0:2d7:d4b:b33 with SMTP id x13-20020adfdd8d000000b002d70d4b0b33mr1891316wrl.21.1680620369444; Tue, 04 Apr 2023 07:59:29 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a12-20020a056000100c00b002cea8664304sm12362109wrx.91.2023.04.04.07.59.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 07:59:27 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0EA191FFC1; Tue, 4 Apr 2023 15:59:26 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, David Woodhouse , =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , Paolo Bonzini , kvm@vger.kernel.org (open list:Overall KVM CPUs) Subject: [PULL 10/10] tests/avocado: Test Xen guest support under KVM Date: Tue, 4 Apr 2023 15:59:25 +0100 Message-Id: <20230404145925.2638152-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230404145925.2638152-1-alex.bennee@linaro.org> References: <20230404145925.2638152-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: David Woodhouse Exercise guests with a few different modes for interrupt delivery. In particular we want to cover: • Xen event channel delivery via GSI to the I/O APIC • Xen event channel delivery via GSI to the i8259 PIC • MSIs routed to PIRQ event channels • GSIs routed to PIRQ event channels As well as some variants of normal non-Xen stuff like MSI to vAPIC and PCI INTx going to the I/O APIC and PIC, which ought to still work even in Xen mode. Signed-off-by: David Woodhouse Signed-off-by: Alex Bennée Message-Id: <20230403134920.2132362-12-alex.bennee@linaro.org> diff --git a/tests/avocado/kvm_xen_guest.py b/tests/avocado/kvm_xen_guest.py new file mode 100644 index 0000000000..5391283113 --- /dev/null +++ b/tests/avocado/kvm_xen_guest.py @@ -0,0 +1,171 @@ +# KVM Xen guest functional tests +# +# Copyright © 2021 Red Hat, Inc. +# Copyright © 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Author: +# David Woodhouse +# Alex Bennée +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os + +from qemu.machine import machine + +from avocado_qemu import LinuxSSHMixIn +from avocado_qemu import QemuSystemTest +from avocado_qemu import wait_for_console_pattern + +class KVMXenGuest(QemuSystemTest, LinuxSSHMixIn): + """ + :avocado: tags=arch:x86_64 + :avocado: tags=machine:q35 + :avocado: tags=accel:kvm + :avocado: tags=kvm_xen_guest + """ + + KERNEL_DEFAULT = 'printk.time=0 root=/dev/xvda console=ttyS0' + + kernel_path = None + kernel_params = None + + # Fetch assets from the kvm-xen-guest subdir of my shared test + # images directory on fileserver.linaro.org where you can find + # build instructions for how they where assembled. + def get_asset(self, name, sha1): + base_url = ('https://fileserver.linaro.org/s/' + 'kE4nCFLdQcoBF9t/download?' + 'path=%2Fkvm-xen-guest&files=' ) + url = base_url + name + # use explicit name rather than failing to neatly parse the + # URL into a unique one + return self.fetch_asset(name=name, locations=(url), asset_hash=sha1) + + def common_vm_setup(self): + # We also catch lack of KVM_XEN support if we fail to launch + self.require_accelerator("kvm") + + self.vm.set_console() + + self.vm.add_args("-accel", "kvm,xen-version=0x4000a,kernel-irqchip=split") + self.vm.add_args("-smp", "2") + + self.kernel_path = self.get_asset("bzImage", + "367962983d0d32109998a70b45dcee4672d0b045") + self.rootfs = self.get_asset("rootfs.ext4", + "f1478401ea4b3fa2ea196396be44315bab2bb5e4") + + def run_and_check(self): + self.vm.add_args('-kernel', self.kernel_path, + '-append', self.kernel_params, + '-drive', f"file={self.rootfs},if=none,format=raw,id=drv0", + '-device', 'xen-disk,drive=drv0,vdev=xvda', + '-device', 'virtio-net-pci,netdev=unet', + '-netdev', 'user,id=unet,hostfwd=:127.0.0.1:0-:22') + + try: + self.vm.launch() + except machine.VMLaunchFailure as e: + if "Xen HVM guest support not present" in e.output: + self.cancel("KVM Xen support is not present " + "(need v5.12+ kernel with CONFIG_KVM_XEN)") + elif "Property 'kvm-accel.xen-version' not found" in e.output: + self.cancel("QEMU not built with CONFIG_XEN_EMU support") + else: + raise e + + self.log.info('VM launched, waiting for sshd') + console_pattern = 'Starting dropbear sshd: OK' + wait_for_console_pattern(self, console_pattern, 'Oops') + self.log.info('sshd ready') + self.ssh_connect('root', '', False) + + self.ssh_command('cat /proc/cmdline') + self.ssh_command('dmesg | grep -e "Grant table initialized"') + + def test_kvm_xen_guest(self): + """ + :avocado: tags=kvm_xen_guest + """ + + self.common_vm_setup() + + self.kernel_params = (self.KERNEL_DEFAULT + + ' xen_emul_unplug=ide-disks') + self.run_and_check() + self.ssh_command('grep xen-pirq.*msi /proc/interrupts') + + def test_kvm_xen_guest_nomsi(self): + """ + :avocado: tags=kvm_xen_guest_nomsi + """ + + self.common_vm_setup() + + self.kernel_params = (self.KERNEL_DEFAULT + + ' xen_emul_unplug=ide-disks pci=nomsi') + self.run_and_check() + self.ssh_command('grep xen-pirq.* /proc/interrupts') + + def test_kvm_xen_guest_noapic_nomsi(self): + """ + :avocado: tags=kvm_xen_guest_noapic_nomsi + """ + + self.common_vm_setup() + + self.kernel_params = (self.KERNEL_DEFAULT + + ' xen_emul_unplug=ide-disks noapic pci=nomsi') + self.run_and_check() + self.ssh_command('grep xen-pirq /proc/interrupts') + + def test_kvm_xen_guest_vapic(self): + """ + :avocado: tags=kvm_xen_guest_vapic + """ + + self.common_vm_setup() + self.vm.add_args('-cpu', 'host,+xen-vapic') + self.kernel_params = (self.KERNEL_DEFAULT + + ' xen_emul_unplug=ide-disks') + self.run_and_check() + self.ssh_command('grep xen-pirq /proc/interrupts') + self.ssh_command('grep PCI-MSI /proc/interrupts') + + def test_kvm_xen_guest_novector(self): + """ + :avocado: tags=kvm_xen_guest_novector + """ + + self.common_vm_setup() + self.kernel_params = (self.KERNEL_DEFAULT + + ' xen_emul_unplug=ide-disks' + + ' xen_no_vector_callback') + self.run_and_check() + self.ssh_command('grep xen-platform-pci /proc/interrupts') + + def test_kvm_xen_guest_novector_nomsi(self): + """ + :avocado: tags=kvm_xen_guest_novector_nomsi + """ + + self.common_vm_setup() + + self.kernel_params = (self.KERNEL_DEFAULT + + ' xen_emul_unplug=ide-disks pci=nomsi' + + ' xen_no_vector_callback') + self.run_and_check() + self.ssh_command('grep xen-platform-pci /proc/interrupts') + + def test_kvm_xen_guest_novector_noapic(self): + """ + :avocado: tags=kvm_xen_guest_novector_noapic + """ + + self.common_vm_setup() + self.kernel_params = (self.KERNEL_DEFAULT + + ' xen_emul_unplug=ide-disks' + + ' xen_no_vector_callback noapic') + self.run_and_check() + self.ssh_command('grep xen-platform-pci /proc/interrupts')