From patchwork Mon Apr 3 13:49:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 669778 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp1895160wrt; Mon, 3 Apr 2023 06:51:46 -0700 (PDT) X-Google-Smtp-Source: AK7set+T4+qbg7EU+L6FOIKwhExTOHislNw0VNBXwT3pup7gWV97o3aCveYLZQC7reNaevswRnGR X-Received: by 2002:a05:622a:1195:b0:3e4:9f9a:54c5 with SMTP id m21-20020a05622a119500b003e49f9a54c5mr65199053qtk.54.1680529905842; Mon, 03 Apr 2023 06:51:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680529905; cv=none; d=google.com; s=arc-20160816; b=PS8oyPfdMfymBFo+gi3nLYWUDWdCXqdriRzXSZnF+ZYNsSBs+Sp2rBUqJmklnF/ubK 7Lj8kPWUOdh+6YeoGk0uADfHcmb3kkQCxNfVkKnRMpmrlW4DWAoDQ0EOhtwbYvr7HMVL BnDQi9n1vk6iDR2LWE3t2aZtYyBbuslojMy8YxtbNHQFvkaysZvwqDVJG2vzafYSmtce WEK/BpkknDIfiAG/MFTLAn3A5qlreDZTp2jRgJsnfvbqbfxVk91GTUXWjmYQ/H2KpGeQ FHakcbzkT9fX1eWKxqqHl7xsitDI0uMfc84TmOc6YP5J5nhI+53XC3n+iOOpfyQnQ+jb lgig== 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=VBQGpqWmgJmN3spJtbY9ofJJqcdbpRTH4FCdiaUq178=; b=kszqc9TkhOK6WUGQ3wa786XYyMooTDxzuib6/sw9ZAhPtzdN/J3BHRRIb+RVyv/u0F sb3OTboIjxa+vJ+e0mRY28aRZQFk/9OyUsI/bwBlwO+Pztw5kvX0EFnmsgd0ti6pncor 0AfX1/OIq4kzDR+H0izUX3ipTXt6/iqud2OObVdMCoNct+mCX2fKWE0ReOrqqmCLnNvf cs4IHWv6uWwWJuivW85/Rmj8RLPZx7wh37pEoIxITsP6jFe+B9Cf0par2UbGCFC2yb1f PWdHPs85SgeIHYgicfMIOc4OKiNBQt9fN1M+2ubkPUyPx/si24RjrYyg0qqA6KH2mbWs y7Dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="H4QstZX/"; 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 v7-20020a379307000000b0074860014f61si5587862qkd.674.2023.04.03.06.51.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Apr 2023 06:51: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="H4QstZX/"; 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 1pjKYs-0002xP-Ga; Mon, 03 Apr 2023 09:49:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pjKYq-0002uY-8s for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:28 -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 1pjKYm-0004tC-9j for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:27 -0400 Received: by mail-wm1-x330.google.com with SMTP id m6-20020a05600c3b0600b003ee6e324b19so18179980wms.1 for ; Mon, 03 Apr 2023 06:49:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680529762; 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=VBQGpqWmgJmN3spJtbY9ofJJqcdbpRTH4FCdiaUq178=; b=H4QstZX/rS1x1LifCE9PcChSlhTKrXM1xvEbZTlLirjUI/RKnVpIUf5i0ZDtBZYRX+ BXEEzSG+k9s3MkHeQnsexzyaMFuT5wqn3PUAKKS9MMVd85bE5Ghku89tTedIx1ORbbDM 7fwKLJsWRHoy7kj5r53uVIdQMKNChX4p9mxE0hlNr27F2Xq/Kxz1SheWm1TF89jS0sKs Yqyy3YdqRE12hYcOnLu65RT52HTSpbHmN9laA5R8bbWO1YP9xrbfcJJHnYZsC/AKUSpU eUGnAGbALhvUf6T5fvwIYkh1Wxw0u3qoU6hFrEA8L1jCb1mFb2u7gOxGANgT5+MLZPRL vV1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680529762; 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=VBQGpqWmgJmN3spJtbY9ofJJqcdbpRTH4FCdiaUq178=; b=GkjjcAbAo/6kHv3evC0F/2DdvITbf2PtkLf+E1txqQM3wb7rxLQTY8v3lKduB/YRQq xTRO2tAIsTwA4EH2mA0h09K1MTskxteWaxKl4okyWUy9cttjTDWW/sH2qDanTx+QjBMt +LCBEUSpWkKaM+nxvNU/+6hpUY7QkTejyuCb5dfGp+DTNL4NUxkMOiDMmGeTlfZySKMb h+/F9Kys+tOx5U1PSVIBtmSPIQkh187Zu93McPuaiGI7Z6dl+/hEPkA8vjMCQmqGHqtP YYBPQ9TIeL0RBsZny5ss/Nnkn2O6+xn9xwU2t3uNsdvWZcW1WHawQTrz1rYva9JYRtPP HD5w== X-Gm-Message-State: AAQBX9elf8RgNDg4NgZ8QpK5CbCmyxwDtYDfV/MDeHnnBv9xtQCVe+0Q jUr6SWMgAKEPcE1ZPb77a5nRLg== X-Received: by 2002:a05:600c:220c:b0:3ef:61f7:7d34 with SMTP id z12-20020a05600c220c00b003ef61f77d34mr22447919wml.1.1680529761634; Mon, 03 Apr 2023 06:49:21 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id t14-20020a05600c198e00b003ee1e07a14asm19528903wmq.45.2023.04.03.06.49.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 06:49:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CCCCE1FFB8; Mon, 3 Apr 2023 14:49:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Reinoud Zandijk , Ryo ONODERA , qemu-block@nongnu.org, Hanna Reitz , Warner Losh , Beraldo Leal , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Kyle Evans , kvm@vger.kernel.org, Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Thomas Huth , Kevin Wolf , Kautuk Consul Subject: [PATCH v2 01/11] scripts/coverage: initial coverage comparison script Date: Mon, 3 Apr 2023 14:49:10 +0100 Message-Id: <20230403134920.2132362-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230403134920.2132362-1-alex.bennee@linaro.org> References: <20230403134920.2132362-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=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 Message-Id: <20230330101141.30199-2-alex.bennee@linaro.org> --- MAINTAINERS | 5 ++ scripts/coverage/compare_gcov_json.py | 119 ++++++++++++++++++++++++++ 2 files changed, 124 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..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 Mon Apr 3 13:49:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 669776 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp1894899wrt; Mon, 3 Apr 2023 06:51:14 -0700 (PDT) X-Google-Smtp-Source: AKy350ZWt7rGu59K5h5d8Vy2gTvWArQEpOXcjQbBnqHRctXaHBj/I5mEL6bs7eFxCocTHZrJ7GwL X-Received: by 2002:a05:622a:2:b0:3e4:dfb6:29a8 with SMTP id x2-20020a05622a000200b003e4dfb629a8mr51071871qtw.44.1680529874298; Mon, 03 Apr 2023 06:51:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680529874; cv=none; d=google.com; s=arc-20160816; b=IJ6nueRx1x/McVaCMeIHb5KiyWRZ1nmDX7vnoOix1r04IR3X6v28oe0ApsJyOuVGG3 48dfmGrdA8okIGhybf0FvH7ViwxC4N56ckCylihP/38ZGyqyY9hx9+84/k4DArfZMGYJ Zy3oTihF8TqqpoDrWuU84KWChERN0PCNuOkx5HSq8PQqLWZshI+7dF0z9SvZUTLv0uBa MWMO22zGvgIKPOAVwNhI71nC2KGtL/JC7Hf27ns/ussrkN/Y2qmQxs8B8reqNzIe41bY zYnb9uWWbO5sPknvXJtyRBhQuakfdYVRrK3ULMenwWN9obUGRsUIGSdyVl0hEc4QcH6p sZCQ== 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=mN816sNtX5Vdj2G92pvv8I3i5QnGeNTrX25n5LbvU4I=; b=IPkeNqqSxxEH3mmGI0Nhqeh65PiEL9YrNGdrwQXIGQJnUoILfA8tdW3KLTZZoU48Ie xyGbeX0IHLA5WXeE50DT3fc0qe0XvqMiD5TD6yVlg/EfH5Piskt71rtNT1KVGUUufG9a TnNst+s+kzSy6W9Ad+MzAWdK4AzqCPIy7bFR3FLgQabwMyhEb05QJ96wHM4+bnsFZ1W0 BpcwUBDdZVzduMVq1+RlI97tBgsH3/N0wg755U24RtwXl9dXRs8+QFBw+I3tAJGgYMhw oB8JBAk8k64rFJKSMP5//d1QvFZ8PIBn0G5aDT7Mf1/ShdRhP5k+G56glKcWSYPdbPYX 0pAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O5sLqRX3; 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 g16-20020ac85810000000b003d2f408a002si6282853qtg.218.2023.04.03.06.51.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Apr 2023 06:51: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=O5sLqRX3; 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 1pjKYr-0002vs-DP; Mon, 03 Apr 2023 09:49:29 -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 1pjKYq-0002u2-0G for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:28 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pjKYm-0004tH-Ad for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:27 -0400 Received: by mail-wm1-x331.google.com with SMTP id hg25-20020a05600c539900b003f05a99a841so240154wmb.3 for ; Mon, 03 Apr 2023 06:49:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680529762; 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=mN816sNtX5Vdj2G92pvv8I3i5QnGeNTrX25n5LbvU4I=; b=O5sLqRX3o8wg3JSEuHWQfk7e53SjZslyalKpbNubzgxabPQbImJEAab9cWKIwTylAL WgcyZqFlockFyY+eZ0Bf7vXgYjz2ZTwNjuS2v73b4lgsIVnXRvHaM3qr2WnHPKUdJAQI 5B7WEues0f+SO+CL77LGCSGQrN7h0W/Tk+GIroANmG1yd2r3D4iFC3sC8EHZrTpiedQM sCILzvAqFtezCm6x72Z0UwzZmMlakI+VNU2GyYzB0Ne1NYLNF4GJQVY+tueL2OS5ZQkU bx43IXHTD/y2FJ9UOtFFsIU3eYKPZNE6kaHy0DTyMLxFc6WvKs0qn0lonWM8EUzREfvE 2wSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680529762; 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=mN816sNtX5Vdj2G92pvv8I3i5QnGeNTrX25n5LbvU4I=; b=0OiRLCRsYem6KPfZy2SlMw8t3M2fukc49xL8UcOX685K8dIBavZfBGA/61m7il2ztW 4YbjIqRX9UrQ29jJJYYJXLAiIWs5x9gtx7siUKJvWmpxtRSjzMLZVAdeuBkSYJ5CM46y RiWO7/XfkA/YbCi+gG3REaIYhtMJD4ga2bygtMpANLXZ1JW+ZFFh75zXqpldDb7TPO8g fUKQY2yuMmSqHOfhbpW2uLN6L/Vxg6OxefjqaJXiuebWrJ2wd2GRYxL/47ADdz1ZoMwb 5HVPTG8J7Tu/OUMp07TuYNaaCjj9hi0PjBGS58Bj/NwGmAsE6p1t20U5o+BAQ4/Vhzdn lSiw== X-Gm-Message-State: AAQBX9d88S9o/uG0L9N3wNxjMmjTCClMNxpmxOPzI8heVB42fOTp4+/a D8ERIVLQH2Ra0T6BKjH1u1AKjcZ5aDojsUpDnMk= X-Received: by 2002:a7b:c045:0:b0:3ef:6fee:8057 with SMTP id u5-20020a7bc045000000b003ef6fee8057mr19211144wmc.25.1680529761833; Mon, 03 Apr 2023 06:49:21 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id l7-20020a05600c4f0700b003ef5deb4188sm19526828wmq.17.2023.04.03.06.49.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 06:49:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E356F1FFBA; Mon, 3 Apr 2023 14:49:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Reinoud Zandijk , Ryo ONODERA , qemu-block@nongnu.org, Hanna Reitz , Warner Losh , Beraldo Leal , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Kyle Evans , kvm@vger.kernel.org, Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Thomas Huth , Kevin Wolf , Richard Henderson Subject: [PATCH v2 02/11] gdbstub: Only build libgdb_user.fa / libgdb_softmmu.fa if necessary Date: Mon, 3 Apr 2023 14:49:11 +0100 Message-Id: <20230403134920.2132362-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230403134920.2132362-1-alex.bennee@linaro.org> References: <20230403134920.2132362-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: 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: <20230330101141.30199-3-alex.bennee@linaro.org> --- 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 Mon Apr 3 13:49:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 669770 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp1894379wrt; Mon, 3 Apr 2023 06:50:07 -0700 (PDT) X-Google-Smtp-Source: AK7set8MTBjUxuHRPFN68+GSIqmudqVHUDVqFPDgY81t9rgLSW11ucbMpOoRhr5eTaB32xfVfy2I X-Received: by 2002:ac8:5702:0:b0:3bf:d35d:98bb with SMTP id 2-20020ac85702000000b003bfd35d98bbmr63735622qtw.56.1680529806879; Mon, 03 Apr 2023 06:50:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680529806; cv=none; d=google.com; s=arc-20160816; b=u4pVPhkP2CYux0XCmq4PJSDJlerk9PU2sFASGFVD5k35mww1HbqAMcI2X614F5siBt MVHcBHCWNyZnu4zECdkaCr2w7e9oZEtrANy4D7s9jDshnfvXpRhSBz7fy+9tKDVT0yKa Ak50dIonunWB+vHTy8+OrEg+aFSvyPykXiFNgLahnKyrwqUHehDMVbw9XPLiRAdPVBnN +L2e8nk6bYgE0ZNrhnJbviIGGAOLc9NEV+SR/FSAPwL73I8//KPJ5b93oq0HvQy1Ev2/ WiYgdLm8IyMI/GQGZ5VZByZFi2bQEh6BOkiP/KlQ9eOsUmz74TvZerj6Nm0bLZk5xkS1 W2Xg== 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=dHHLYJ1Q7CDYpzOnQyJie+UJ0r74Mi54/+ouByLjk3E=; b=nDSaox5VIRaxBXs6Eq81feo257U+ldz2vl1tMMAluOrbCbzlGsMm3LIxeFgWDh6E3m KJCi4IJ79rkKLdCZKCRA+7JapTyT/7UNrzWkGYhoL7Xh5QkJDW/Gm9zc2VQaZJBqrB6n DUCTK/66166evMFOmJ8Hr+VRu55EpJIAPyM/mkzIkAowEGbo5YOPbW1aXNT42kYjbRGP i4O632XLJQAmfikszVlwWrdUN71zUtEDLOvePhIpopApeM+jN5Q0TYDno4Wpvocpxb/1 oeoNnKQ3lNz33s8+NgQV1ygLPaCUC7X06Sn+3V2iCNVER73kHFqK+T8hc6X3VdWog2Hz Fcdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CWzuya7J; 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 t10-20020a05622a148a00b003b9ec33eabesi6006076qtx.463.2023.04.03.06.50.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Apr 2023 06:50: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=CWzuya7J; 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 1pjKYp-0002ty-Ma; Mon, 03 Apr 2023 09:49:27 -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 1pjKYo-0002t0-Lx for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:26 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pjKYm-0004tX-6v for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:26 -0400 Received: by mail-wm1-x333.google.com with SMTP id hg25-20020a05600c539900b003f05a99a841so240162wmb.3 for ; Mon, 03 Apr 2023 06:49:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680529762; 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=dHHLYJ1Q7CDYpzOnQyJie+UJ0r74Mi54/+ouByLjk3E=; b=CWzuya7JW2bY34opxAKYIrNfyS65J2Ve7Op8RUvVCTJWgo8mFVV0WttZ5XTBIOpOuw qEc0uVEkLj4BSXrkGYzQuo4l+mgtk1/Cg5F8oZdEugZIT790Y3kd7/R/ROH79z7UrZQ0 v3Sn6tKQEDY9L3zgiYs7vsdbe8VCOYPEkeTzMCKl6g63yKNr+tFOllZTZi0lmaKWowSm PARwtkZgJ1mpnizEjF6BHJMoGJzl5i5cHzOy7KasRbZka01wrMHVeI0zfyoEPcjqUfVu oF/kl0e4k2mu2v96VOyu3vif1056EhDnaETNYv0h58W43SS6YkTyw2bu6X5j4qNswFKj vOHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680529762; 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=dHHLYJ1Q7CDYpzOnQyJie+UJ0r74Mi54/+ouByLjk3E=; b=I06xUuPu0UDUOxMDH3/LQDW17aYDXsYCcxJnqLpWgJo0/c9VWyRTxDibKOR2p2i7eU j8LfITFajPwYyFR6fOGZ4omLyNV2JGGivqr6R50O1hKTttK40UNn0I2W+flS5HvSACVW E4b24vt2nCAULWNca9JJ3RfX0PktsHXgswvdE+NNEMLkyiB9yVjVUWTBPo56Jr21LUKB KWyvaD82bTmMwKv4REF/uuxe36y8IumHyH3G3yxAIs5L6gHlzmzjawHuyvUEUEC5hS0V cMb73M37SK1kiAlj8cIbDoAvUIESSuUI9PQrOZEchvCU4Suw9IoniQumtNtbfa8jSP/4 u+Xw== X-Gm-Message-State: AO0yUKXdzopt+7xjQeXkmdEtGk106xpti100Y/j5/G3kfzUHbrZ1vHlI P4QQp2r1klSUj4mroTLiNbsONA== X-Received: by 2002:a05:600c:acb:b0:3ee:4f92:907b with SMTP id c11-20020a05600c0acb00b003ee4f92907bmr26589298wmr.14.1680529762237; Mon, 03 Apr 2023 06:49:22 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id iv19-20020a05600c549300b003ef69873cf1sm19941464wmb.40.2023.04.03.06.49.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 06:49:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 05D4F1FFBB; Mon, 3 Apr 2023 14:49:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Reinoud Zandijk , Ryo ONODERA , qemu-block@nongnu.org, Hanna Reitz , Warner Losh , Beraldo Leal , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Kyle Evans , kvm@vger.kernel.org, Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Thomas Huth , Kevin Wolf Subject: [PATCH v2 03/11] gdbstub: don't report auxv feature unless on Linux Date: Mon, 3 Apr 2023 14:49:12 +0100 Message-Id: <20230403134920.2132362-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230403134920.2132362-1-alex.bennee@linaro.org> References: <20230403134920.2132362-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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: <20230403120250.2071560-1-alex.bennee@linaro.org> --- gdbstub/gdbstub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Mon Apr 3 13:49:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 669775 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp1894883wrt; Mon, 3 Apr 2023 06:51:12 -0700 (PDT) X-Google-Smtp-Source: AK7set8eAX59o2CaQ6LDw1qQl7CfaFtY08ibd9DG5kBFDRW3DWyZD333Z+eFJGH42AsoEOQ2BwBP X-Received: by 2002:ac8:7d45:0:b0:3bf:bdb8:c64a with SMTP id h5-20020ac87d45000000b003bfbdb8c64amr58758793qtb.49.1680529872183; Mon, 03 Apr 2023 06:51:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680529872; cv=none; d=google.com; s=arc-20160816; b=ioRBM6LVscqDko7CsPm76iyOcrB0Fm7wGICxWe9KUm5y+HUATsH0LpS7hjlpWUp3Mm Iv4S/zSQXeUkc2Sl7+NdeKAUR/W8nGwWL1dqLZ4nzqOKtAApF7+tjfMJgRyAN/mBAF7y I4EvSXtRePShAPxcXW9VBIXnznzzE0JaCvY5RznfjOBcKWIZfSICwl2ypkCa7uPyxNCk OGSMFw98VJnpEMoPwYdEnjOi3ofcM04V4k9PdatF5NXb2FM/FuqVntG2Os9pk3AkrXRI KHXigQk87A0Ot+mW+OT/XZHw/X6hi4fSuJmtLBDh4NTlT8EiAxqVJ++MzyvW8U84QV46 k/Eg== 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=b5aVTp29ura2AnXi+mbMTi4HjJNdcHU6J80+OlMAlxY=; b=V6XW2ZG6NseGphAP7QNXYlS8Q+FvCAuA6sHMthYUTwkY2DtNAYxBc6hfpzApAbM9Ob zjaPB5y6G6lbvZfhZO3f83AnZXdbAKNRrFS9HUYXZJJEPZp7I9WUf8DRiq2S0cZFLkKv mt/Id4kUuwiPTFFTjtYAIiD1EfPKYX848tfWFYtQ/HhdxkvqvJBHY2o4fCnQucq1+ZFx vb/7pSlHNppr8DmYzandzphnc7z9n5x5SyTpp76dHPiXA5Jzv6sIPocwwCGoFAklDvZd JVj8I4SzfnL6iMLL8sb3aDXM6jafKlXeMC9i4OXr1pTY2Iouik8TAWTiB+ducC2KnUPt epwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZHIf9dTR; 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 j10-20020a05622a038a00b003e4ed7e3817si6197100qtx.56.2023.04.03.06.51.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Apr 2023 06:51: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=ZHIf9dTR; 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 1pjKYs-0002xJ-2p; Mon, 03 Apr 2023 09:49:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pjKYq-0002uF-55 for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:28 -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 1pjKYm-0004u8-FA for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:27 -0400 Received: by mail-wm1-x332.google.com with SMTP id l15-20020a05600c4f0f00b003ef6d684102so14580060wmq.3 for ; Mon, 03 Apr 2023 06:49:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680529763; 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=b5aVTp29ura2AnXi+mbMTi4HjJNdcHU6J80+OlMAlxY=; b=ZHIf9dTR9loLxTXKZEIR0EGR/ksvgHBfh1pbCJ0NAkJGnCKcyHG7CzrW/CiT/e6zrH c5PIqG8eRCQSzO+W6MlMgOpUEKLOlaONVz+0y/Ie32Pv08zCE9wv5KII/7LySQ9cSifv 0VrF88QHDe1uAetUbtrP+UgQGfpltXIh8k2NUcHjpHKnuEOzeGy0++076bIUD5CfPngY HxCpv57KPdzbJm73+iwV28AthNhhn3UrMkEROc9b4h6AZbsBiXpFFs5jAPNRM0gFsHDG Li+H/g22R0opKVbB3rO6gqSRAFd5djOPW5X0t3kyLNzlJi89cuEmwvGDtGR/ciSuieM3 R7bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680529763; 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=b5aVTp29ura2AnXi+mbMTi4HjJNdcHU6J80+OlMAlxY=; b=wICBvoy1vlk1lh7ZDbXRC6uLbQ52tpXGkNmX43GdxBr5DCmmBLYmPaqRUBzXRFvwLV l9hhjV9IQhf48c9JkMc1KtUr6T0f61BpVPxhLO3bjqdpe5pJcU7y1HZCv75BLhqmjl/1 fcVpBALdlaFocmeoyIcXlj2A2qDAaDDqZ3Nyd3MByYZOGACNMKbNzqr/E50YY2UAGB5S aonxPMgA01BlMMkaZRf1K8ElQ2TeLvoCcS+zwi46DsxnnDHWu83L7g0RuW6JrsM4BMq0 QinFX3BY3wL8kLO+2LoP+hA46Juoc2D+xlX9ChULWU152MGJC9DdVXmZrb79gB9HJKCu 1Abw== X-Gm-Message-State: AO0yUKUdq3wbqU1eFqbEcF2OZFf6eYktp5RGuan2lx3J57nocBenRoW6 TcmwKcUNVA24UPDrQUng5lsLcQ== X-Received: by 2002:a1c:7516:0:b0:3ef:3ce6:7c69 with SMTP id o22-20020a1c7516000000b003ef3ce67c69mr27186739wmc.8.1680529763045; Mon, 03 Apr 2023 06:49:23 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v20-20020a7bcb54000000b003ed2c0a0f37sm12120590wmj.35.2023.04.03.06.49.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 06:49:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1C5EE1FFBC; Mon, 3 Apr 2023 14:49:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Reinoud Zandijk , Ryo ONODERA , qemu-block@nongnu.org, Hanna Reitz , Warner Losh , Beraldo Leal , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Kyle Evans , kvm@vger.kernel.org, Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Thomas Huth , Kevin Wolf , Markus Armbruster , Kashyap Chamarthy Subject: [PATCH v2 04/11] MAINTAINERS: add a section for policy documents Date: Mon, 3 Apr 2023 14:49:13 +0100 Message-Id: <20230403134920.2132362-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230403134920.2132362-1-alex.bennee@linaro.org> References: <20230403134920.2132362-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=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 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: <20230330101141.30199-4-alex.bennee@linaro.org> --- MAINTAINERS | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 Mon Apr 3 13:49:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 669771 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp1894597wrt; Mon, 3 Apr 2023 06:50:37 -0700 (PDT) X-Google-Smtp-Source: AKy350Y1IfH7+LW5ZbO6r62pycDD+2QZH5vXu7x+jA6CACrn/CrL5vJrkex58O1RfFtHtX0r/YHa X-Received: by 2002:ad4:5d45:0:b0:5e3:c84a:9422 with SMTP id jk5-20020ad45d45000000b005e3c84a9422mr5572412qvb.2.1680529836991; Mon, 03 Apr 2023 06:50:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680529836; cv=none; d=google.com; s=arc-20160816; b=IzFHOs+7zGSEZsecEITUfzxNMvHJ6+pfTTx1bU0EpoZTT/3Y9I6Hb20ndTJwUqwazb +lholwiks7lKXxImsH4h/nls1/Uh8FsoYX/bEJyugrCRuZU4NvXVDGbCIKofKEzBlM6V kX+sJLtaeeFd8uKJEOH3r4BenCrEsnWBsKX9jwO1zlDraXbmm9vlENuA/YWR0XX3TvUg hCDCqAcDbvxE0yKH/VAZdboqBpiEvX/PE4I5ePPI4vn2OVo4P6fQtnuZiIub2/bvvWRI 21/fUqAg/IqjL1pxkM+gfhj1/cl1gPA73L5A1rItBFMd8UfXueDPOfKKFDL2h2tur9up kN+Q== 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=QIAbN9ckX3lGfUzvEPz/vzPNYZxaSL+GVZgf5wv9fMw=; b=YnLgfFd/SN/qXDRhIx2PIRgBOUiaQogNakxw/L6QtTCfQuDI4ERTboiNNVIvCAWXd0 aowmIpNQIp0o0WU4cy0ZuGvPpTSZzYPq29zjGa/FqPpRPg/+SuVlbFNPQJj2dbpz1Qqp VP5E+d53tGL79D4l6DZXcZBobaz7qA0YUvekCKEaCZFoebpwUEW7b5UwJnJGFrpo2pzm fhhyxB1w7qkRgJwdo6hxrTsJELE90t1yHWQWoQi0M44nMje1QERMs8xdU+JltSLlFoa0 N+q0/Ve3QgndSzMG5X9E2vuY5hYdaoGC9Qocpb0j5oPblWf7jgjThV0VuF5KcTe9lbo2 1HSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LWUprjAC; 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 br7-20020a05620a460700b007468cbaaefdsi6444348qkb.378.2023.04.03.06.50.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Apr 2023 06:50:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LWUprjAC; 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 1pjKYs-0002xp-Pm; Mon, 03 Apr 2023 09:49:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pjKYq-0002vJ-GY for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:28 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pjKYn-0004uV-9V for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:28 -0400 Received: by mail-wm1-x32a.google.com with SMTP id m6-20020a05600c3b0600b003ee6e324b19so18180052wms.1 for ; Mon, 03 Apr 2023 06:49:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680529764; 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=QIAbN9ckX3lGfUzvEPz/vzPNYZxaSL+GVZgf5wv9fMw=; b=LWUprjACAXh+rLjO+aP8mffyvPwH4ehS4JZikFQAibUBF0T9DkF4kdhb7lHWFZKQRr /4ALZYok7J+Boq7MVhqfKjWiCieBWXUjgeEJGbFtw1Gds6GKdMxi9wLJzMjrcdJqohlV OoEZ8CMWkpf2UDeGOvCGc6UJHpsMgIGU8iejcuZl1+Bp+OKnTfv1/AYDwIGGA9ZYn4bB DVlZHzvRpSe45DYQHZsUV8HowyoYF7txt7KNlkEbkUdkQFEt6b7odwVWcP7zut9mXuEF BU32cAEjuwEi2re9se/CocXw7PQ4xlznkJFvt9jpcG88WWkCPUHT2fIj0ckekv1APwPG 2xtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680529764; 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=QIAbN9ckX3lGfUzvEPz/vzPNYZxaSL+GVZgf5wv9fMw=; b=auxNn6wa2yofFMcAS0fKTYSNZSyFpQf7jYKmdD4bDiv1RAvxvenEEePFAhBAjKdqqQ VcshBDe7u/2Kwx8dE3nmvi8eRm83kWRvXoyiUXJEpAc/tDSkanPmiNs4+ndm3/YQLVpH VhrUNy+3r1lPZI1K16u1HLO28DVH3F8+B+f9CTC8FEPqiMBgz67XCMRD7V4chVzu0cNg EVMBNg+y1IjmFhE0hrwtEAVXPW7VYQZvFPnMNUJ1Vl1Dpv6+0LmOlNxhC4yvk8Xgv/6O MxLj8R6QugdIyBNLp379WHfP8ubIdoSAZ6P2Wivd7Los2y+LjZ90956c8PfyQGDBauo+ RhIg== X-Gm-Message-State: AO0yUKVLbWbU3gIgGR8OnF8qqLtMBPyxnNmj339mUG32PikidiWZpiIx x65oSwYpJGEbOKJtF5b9N9EkKg== X-Received: by 2002:a05:600c:ace:b0:3ed:98c1:2e5b with SMTP id c14-20020a05600c0ace00b003ed98c12e5bmr26622637wmr.9.1680529763808; Mon, 03 Apr 2023 06:49:23 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id l7-20020a05600c4f0700b003ef5deb4188sm19526847wmq.17.2023.04.03.06.49.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 06:49:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 329FE1FFBD; Mon, 3 Apr 2023 14:49:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Reinoud Zandijk , Ryo ONODERA , qemu-block@nongnu.org, Hanna Reitz , Warner Losh , Beraldo Leal , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Kyle Evans , kvm@vger.kernel.org, Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Thomas Huth , Kevin Wolf , Michael Tokarev Subject: [PATCH v2 05/11] qemu-options: finesse the recommendations around -blockdev Date: Mon, 3 Apr 2023 14:49:14 +0100 Message-Id: <20230403134920.2132362-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230403134920.2132362-1-alex.bennee@linaro.org> References: <20230403134920.2132362-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.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 Message-Id: <20230330101141.30199-5-alex.bennee@linaro.org> --- 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 Mon Apr 3 13:49:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 669774 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp1894849wrt; Mon, 3 Apr 2023 06:51:09 -0700 (PDT) X-Google-Smtp-Source: AKy350ZaNVuVtZjDokLVqDGCGlQhJ+RO+zzUUcmZazo2gU+BLy8zYHTKA1JS5QNQaGziHDe6ahW9 X-Received: by 2002:a05:6214:29cb:b0:5cb:ab2e:b15c with SMTP id gh11-20020a05621429cb00b005cbab2eb15cmr52641309qvb.30.1680529869503; Mon, 03 Apr 2023 06:51:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680529869; cv=none; d=google.com; s=arc-20160816; b=auQbeNs/JqOkOaB9qh2excmcItyRIWNpU1J+dRH/x3BgRm84QlmgTvk5J/uUO6YRcK umoaJ/E/UeuMsxyvvmeO8mhG/NNwcpFG+/NW0Whoa3CKBnRka6B9bTOLJf2yRZBWVzM8 wfD6eDuk6/TeWyz7SXIaFwlsknkntSxMQWcocu2F60klknXTwFNveBqbA1HQIbvNoyKG Dzl2wpyKl/8PlF9qnkzOBW/EVF5mtXd6PXZlvCuAhNECkjFngup7NObmo8T3utsVcrLY IsbOHX/HGJg2M5SQKhcYGqcNeJZJ3fpQ3zwJ6mAuZNvk47orWlXmWlqsAgFXD79YRH6V 6Ntw== 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=NTOWIebDq0xH5MEdgwVyuiNxE4JxhgEfL/zEAMmcLTQ=; b=HyNTr1JbUCie7P10WAuK9bMK0AJZBqwPx3uNqLFZvF4RshX9KoDelR3/ZRkwY3i3XF DWFJbahD16qo4YoBg7SHIKOeysLlUY37IcTjigMOlZSLz8o1wPulurOealtmjSiZLyVw oqXrPD5lB3kLDlDX8MwUjOROjVHIFeikTdIXTDT3qE65aGJbY9+/LZmosRLtDtM8cU7F IZ0DW9Tyhxmc1H3FkmpHngLYelwmfu0k1Bi3R72AGHY3vKGf95TNXUY63cfvadIDnJ7p 6kRwXbB+YkhSHME7HlSt6PZIPjfTYZi4NldBnMlOzzZJltXsasODaHMDLb9mCs8WeyJ5 NffA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Pd745bmn; 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 jv7-20020a05621429e700b0053538910039si5801669qvb.316.2023.04.03.06.51.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Apr 2023 06:51:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Pd745bmn; 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 1pjKYt-0002z4-J5; Mon, 03 Apr 2023 09:49:31 -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 1pjKYr-0002vq-B0 for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:29 -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 1pjKYn-0004um-Hq for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:29 -0400 Received: by mail-wr1-x436.google.com with SMTP id r29so29388040wra.13 for ; Mon, 03 Apr 2023 06:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680529764; 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=NTOWIebDq0xH5MEdgwVyuiNxE4JxhgEfL/zEAMmcLTQ=; b=Pd745bmnXlfs4LJh75sVHpdsPA+xhcR3XlKK3TosfuE1r4GmjMcCMK//Sg5U8B9OCy QApDpXjTidsFf6gSbmq2SgYwstpQ7u2awLYYx+4Vk6KUWZCwSWqLUJc+NeSG8H+V/dcS Dwbel5nNX0LpskAYoI3JNAv7Z3EznmNWbtxvBkjFqblsWce7z949QLS4zc79G8/BxSbl QSU/Lc8ZBOAeIZwJ/NOLRhqcgUAl4KP04pfjAGGX6zJyVB8QT3D5VkPhJV6sx3HNLe+I Jc9DoN1KL+ilRkw0P1VXc/p4l+WpoPVl1zCyAStMx/mXL11fRlcfkeTPV+1SMtDRrmRW LP+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680529764; 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=NTOWIebDq0xH5MEdgwVyuiNxE4JxhgEfL/zEAMmcLTQ=; b=tAiKtnL2uTNoZnqthWYcgG98AdIKGiNt8KvABLCzQMO0kFDopQdY9sHSIC0TtWODMU jCqwY7IXkRBp1RzemGJBnyss/VVjnO+COgUNhWx/4Fnj6Y1EyLkrIb0XCpGhyVfx4zUa ExkGyuiQuqse5ssSsE2/pF9oHhedb8PNy4s4jRYL+hl1E3fxdN+3lfvY2uePCEsdllrl OomN72RSVU1L0ZEgiDnBe470WJEXT7y7XxBKmK2ooRLhBRwQDGtzFjcfya93BrvwICpz tbBWxXZ4Cg79WA1vQXM8uREMKEIn3iCXybARGoJxjTvTBoaT8Oo7rz7uXCBuXYmysaCf at+g== X-Gm-Message-State: AAQBX9eJpQBSi8XUuwN3DPRCYDswY43AHtRlzBnN0T7j9cw+yth/9suj GE/bqhFIarDoHCDVhgvsUVBpNg== X-Received: by 2002:a5d:408b:0:b0:2cb:76d4:42ea with SMTP id o11-20020a5d408b000000b002cb76d442eamr29007696wrp.36.1680529764015; Mon, 03 Apr 2023 06:49:24 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id e11-20020a5d4e8b000000b002cde626cd96sm9760207wru.65.2023.04.03.06.49.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 06:49:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 51E3D1FFBE; Mon, 3 Apr 2023 14:49:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Reinoud Zandijk , Ryo ONODERA , qemu-block@nongnu.org, Hanna Reitz , Warner Losh , Beraldo Leal , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Kyle Evans , kvm@vger.kernel.org, Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Thomas Huth , Kevin Wolf Subject: [PATCH v2 06/11] metadata: add .git-blame-ignore-revs Date: Mon, 3 Apr 2023 14:49:15 +0100 Message-Id: <20230403134920.2132362-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230403134920.2132362-1-alex.bennee@linaro.org> References: <20230403134920.2132362-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 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é Message-Id: <20230330101141.30199-6-alex.bennee@linaro.org> --- v2 - rm extraneous + --- .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..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 Mon Apr 3 13:49: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: 669772 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp1894801wrt; Mon, 3 Apr 2023 06:51:02 -0700 (PDT) X-Google-Smtp-Source: AKy350ay+BzdlgyGYop6uNl/WsA3Gwdy3nawp0RYlfshNpf7b9XyeU+amzHffaRZ2hG5UvNzRBv3 X-Received: by 2002:ad4:5f4b:0:b0:577:5ffe:e0ce with SMTP id p11-20020ad45f4b000000b005775ffee0cemr58320493qvg.25.1680529862526; Mon, 03 Apr 2023 06:51:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680529862; cv=none; d=google.com; s=arc-20160816; b=aT2MgrTQpefIvZFdz0I8nqosPVmGY1oRY7Y8zy1MiAWgNNWjMMNs/GDND+3oiwMsoU Y9u0AS89n6ow33pu18/iAgtLr7GS/FBx0ntH6f2W+DUCPnXvJeIPtsIUlbTivS4mGvMc iDNP1IjSHLlQFbX2aXx7ULUxP5YJt2EpC88txv8i0xHu21rwUr1E2/qah1mJgbE0cgPH VI4DA5/Up1gdPYhWy2L0gzRdzG0GZQTviI416S1PqssLXJg5Rqy6JobtqnwvduJG8qlR nvvcwO3HLIPbVoaWHpA/RD/1UMEnsYqCSLk9L07RHwBn4uiYcGfqTJv2Y5E67Y6Fz/MU FMzw== 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=GjJ0WrIm2Di0AKuPGaQhGuqTtmI2bcqfL0u1knytYyA=; b=ILPDZTQXbc2rnSy9IXdZSt+jUvHHoWKffgX+vt4yYKNOiyKioZeBfofiSmxKTd7QYg XRW8yWVrzk/1EDMTBr/gWwooDHNrvkIRderT2iluk57Lu7L4vQSRG2qqOVzEn4ad8x/n 2RVNFEqwycx05o+i5NDWsMly0fSBD/fERpUmNF1PPBY3x7oMsNoIn3TnwVtIT8X1aXwF HeYFnCnLseG/XPsC4rSalw80bz0mMrtsd2e0XLsqLc7kiKZKgc/OOvoNV9w9FAUlRpU0 3hFVKMNoE6wC7jPEfIVArOo0DHfj+H5EHI7hxSU4L5Z7uhhjiubxNCyV5OvzrCBolACO l/hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JaVTpA1W; 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 jv7-20020a05621429e700b005af6096a810si5737029qvb.273.2023.04.03.06.51.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Apr 2023 06:51:02 -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=JaVTpA1W; 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 1pjKYu-000308-DT; Mon, 03 Apr 2023 09:49:32 -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 1pjKYr-0002ww-R1 for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:29 -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 1pjKYn-0004ur-Te for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:29 -0400 Received: by mail-wr1-x433.google.com with SMTP id y14so29447002wrq.4 for ; Mon, 03 Apr 2023 06:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680529764; 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=GjJ0WrIm2Di0AKuPGaQhGuqTtmI2bcqfL0u1knytYyA=; b=JaVTpA1WR5Yo7HRGCieD9YHpHG6U+azsDNIGhcFsSoWXaTyGJ5nteWKiXEEwk/kw5K 4z/HoY6XttEATEGH7ML2L997lwjyaICp58vZdfBt7Ul4c19wLOOL8BaRtOmvSRUuhed7 F7xab7P0e5GN5SX2AiIVAfbcRe/dg27YalMfRch9sGsLGTKbnuA8YicvcomfH+IfCH9r yVPY/U2gVCrVeue5OHDtNrUdHp/MGzzkoCWB1mxWhuzHAzkS8TVmgzbRXCEx5/h5OI/5 cq4Yc7i4nLK00nhoQn/G9sEJn3XzQD/Ddu+otDQolTbDvgrnOtmxHCp7MTofBVl/bMtO ZnpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680529764; 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=GjJ0WrIm2Di0AKuPGaQhGuqTtmI2bcqfL0u1knytYyA=; b=GQOXwIWfzN2uWnOXV9P5sAiQuR4S/Q1vml/jQGnout/eEzyZnbs329HWvxuV/erRrx OhZY6Xnb+fK1TmjPyCcm4O1HuujRQBWYaU2CgtRj8fC5TFcLRoWdpt9yxNf8osWRfBM1 lPiDbSFMSmCucbm2RY37aVp/Ff+Yz9fyCDnb1X1e9ALyN4FxzLVHcl6YuyOP/7Ca5HGA oKprnsCyR0rsKkUnjCbwO+FOLJM48aJCgjsRb4v45UeesYabb1IdPKUx/M05T5oVhtuV HyxVGSjxJMjUIKL5QdMZGWxzMFAwiGNyZGhxQUbrbFox4KDQi4HE8WTVGQFx9j0V79Dv 72ig== X-Gm-Message-State: AAQBX9cjlnHRTNp7l0XhIwuQpmMoqMpOBqNJyA97osfXrargt7Ui5F03 +zDWfLTLF3wzlO++dUniF7PqhQ== X-Received: by 2002:adf:ce02:0:b0:2c7:cdf:e548 with SMTP id p2-20020adfce02000000b002c70cdfe548mr27185931wrn.71.1680529764201; Mon, 03 Apr 2023 06:49:24 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z6-20020a5d4d06000000b002e6d4ac31a3sm7433916wrt.72.2023.04.03.06.49.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 06:49:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6799D1FFBF; Mon, 3 Apr 2023 14:49:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Reinoud Zandijk , Ryo ONODERA , qemu-block@nongnu.org, Hanna Reitz , Warner Losh , Beraldo Leal , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Kyle Evans , kvm@vger.kernel.org, Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Thomas Huth , Kevin Wolf , Marco Liebel , Brian Cain Subject: [PATCH v2 07/11] Use hexagon toolchain version 16.0.0 Date: Mon, 3 Apr 2023 14:49:16 +0100 Message-Id: <20230403134920.2132362-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230403134920.2132362-1-alex.bennee@linaro.org> References: <20230403134920.2132362-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=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 Message-Id: <20230330101141.30199-7-alex.bennee@linaro.org> --- 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 Mon Apr 3 13:49: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: 669769 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp1894376wrt; Mon, 3 Apr 2023 06:50:06 -0700 (PDT) X-Google-Smtp-Source: AKy350Y4cXo5+wboVdBE0iklxTktsc1K5s75BZp6aYucTtnuj850AYBKXdfbz6LuBq7qfngi2hVC X-Received: by 2002:ac8:5bd0:0:b0:3e4:e79c:55db with SMTP id b16-20020ac85bd0000000b003e4e79c55dbmr48810833qtb.42.1680529806758; Mon, 03 Apr 2023 06:50:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680529806; cv=none; d=google.com; s=arc-20160816; b=EuxltV4xfCjf4x+v1ymHMXXyTdaUWhcPIbYV51AaZVtQGzdih/cdgZz2oJtbwGh+By VQfKG9vJaxQOHQkE7ibsIIAkJp1umj0L9Tj+zm63L1h5JI1cvZw1L3qG8fVDPGKM7XQi HuMi9Pvrcn2lV3q9V1Uwchf0GTOaTe621kM8h3geuc/WYzl6XNb3NTxBdgSSSi3Dpj5y WJe19p3nBTaURiFB+meUZ/3Ed/1OHgL/ixz1sMnVOx19ehYxKsh2YTobE9X+5o0PdIcX TqHafNEfeuJ+pPvBpcGNwrLlBN2xNTjhn3UxIIVy/+dxxtq7MuiioijFD5A/oaQhK42e PAJw== 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=BNNm+hFhYmn6A4btsbTy8z3ys/wMqr7F5fsQ6UPTE0U=; b=EIPvVAOX26M1X0sSQmd0KeL6HDeEp789K6TxrArTwJPdTAuFBPiAuUe52tLtqoF7w4 z6aIaT2+K3gi6K0eIReS1c1Cj2DX6Qm8qxv3MaCV9tnLlqLQRjygqouWSjzTDnVlMB6V VqhZSxAR63FmfgnTfwUKd56bhlUn6Vs8KZh8T0jj965Z0Jhwm8Sv905sFSKWw+CGeIX4 QhqXj5Wdtf4dyDRlotR4ktjMnV6qWwoivTSwX6Jel2qfu7vtGWK3hRsqnVH8kDz3a82E dLHfPBDmniugm7MGD7XiFGoTSTsS14hF5s6qvVodF81Lmecf3ngHM2TFl5yuyEb+PWGf ImJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="uMZTW/+E"; 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 p142-20020a374294000000b00745bfe0f5a2si3646701qka.755.2023.04.03.06.50.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Apr 2023 06:50: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="uMZTW/+E"; 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 1pjKYw-00032H-Rv; Mon, 03 Apr 2023 09:49:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pjKYs-0002xX-Jm for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:30 -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 1pjKYo-0004vi-Av for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:30 -0400 Received: by mail-wm1-x332.google.com with SMTP id n10-20020a05600c4f8a00b003ee93d2c914so19552524wmq.2 for ; Mon, 03 Apr 2023 06:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680529765; 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=BNNm+hFhYmn6A4btsbTy8z3ys/wMqr7F5fsQ6UPTE0U=; b=uMZTW/+EF5o1W2A5JdfLs4oBqxYHeVBh65G8DF6NWJWPjReRFhKuCC/ncNpHwzh1qs mMEW2tZDNckEfFHS0GjWwR6IQexwG7ZXXRhicNL8f20z5m5Wdk3P5cQ8w/jkdpiCdqDL nLh92n6g0umdfLVI/eQbiF1cxRXgRItEeUiApK+mbKSMit9AUhnjl4hdTriQp+jk79nE 6tFc8cnDjdFMut0KwN1OCHIduIw+ynMVFPZ/mXSo/w5MIZx1TOwiMx0bB0B/C3Z3gm0j 6ePgrajdov1CzO49xyt1IvyKD+1XurKgKZaKP/PrY/1o3SOzUPkceYK5rLcstSpCjaYb OY9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680529765; 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=BNNm+hFhYmn6A4btsbTy8z3ys/wMqr7F5fsQ6UPTE0U=; b=PAgQW8SVBaO7qrjjQJiXbsV7dlV2FtGrDSZkTqf3EnGB05PBI6nP4CXj559X9oRPwl o5RP25Ex7eqMNO7qcCvsMgZuq/jS+fZlXqYIrUUVb1fme/UUn1I5tiSraHk8ySYM4UhA og/3EzTaghnKHH4tkfrWPognNYVo+CKVborXO0sN6kTcNSwtsu6PZqNl2bxFJUDuix3h bvxaxMf1CprMyCPdYUS+q04g8bJvXjC+K3oBfKujlIAw+uF0H/wpVtV0MP92GS6khpsG xJ/JIj0huP2lPMxQ1hYgUXgQoHZ/RHoDMoVCRKah+manRs93j7hVvsqd4E6eUR/qXJly E4bw== X-Gm-Message-State: AAQBX9dg5lOdP8L2Th+af3v6Jek8IQR77naTuOaBkIWs6XC8E5qXllZI LyDNmXim3AHQXEPe48afYDjSdg== X-Received: by 2002:a7b:c4c7:0:b0:3ef:6ae7:8994 with SMTP id g7-20020a7bc4c7000000b003ef6ae78994mr21868141wmk.22.1680529765031; Mon, 03 Apr 2023 06:49:25 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id r16-20020a05600c35d000b003ee9f396dcesm19503795wmq.30.2023.04.03.06.49.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 06:49:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7E9FF1FFB7; Mon, 3 Apr 2023 14:49:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Reinoud Zandijk , Ryo ONODERA , qemu-block@nongnu.org, Hanna Reitz , Warner Losh , Beraldo Leal , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Kyle Evans , kvm@vger.kernel.org, Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Thomas Huth , Kevin Wolf , =?utf-8?q?Da?= =?utf-8?q?niel_P=2E_Berrang=C3=A9?= Subject: [PATCH v2 08/11] tests/qemu-iotests: explicitly invoke 'check' via 'python' Date: Mon, 3 Apr 2023 14:49:17 +0100 Message-Id: <20230403134920.2132362-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230403134920.2132362-1-alex.bennee@linaro.org> References: <20230403134920.2132362-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 Message-Id: <20230330101141.30199-8-alex.bennee@linaro.org> --- 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 Mon Apr 3 13:49: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: 669779 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp1895233wrt; Mon, 3 Apr 2023 06:51:55 -0700 (PDT) X-Google-Smtp-Source: AKy350Y8yqvRnmWoQiH9SfvEsjooeLwpsAmoiGHdkvFYcb3dWJkafexFyVAgBDeQYwdw5BZz2qtG X-Received: by 2002:a05:622a:112:b0:3e4:e5bf:a24d with SMTP id u18-20020a05622a011200b003e4e5bfa24dmr50283815qtw.11.1680529915054; Mon, 03 Apr 2023 06:51:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680529915; cv=none; d=google.com; s=arc-20160816; b=qFu1QPMBrUD4G80Ml4m5YZNnUa8eYW48QtjhFL53hu4fUobYBFQlSpjHhxhUoHMXj3 oVwb7C1M3g3xwHcauJl8gAJLtdzOL65KkJOyIWN7R7vYnW/cR6//LjGjYZSZhFTX0kWx ovyzCNj3fSYagubE7oPFzIKM90i9wRHuRbMV3f7RjHKuNZbDsndAkq0mrFHA/6avsqh0 oHqwAZDYqZCEu+GRqFNzvLKj4HHFNuhq7eJn1zdTOV0CpLZxR6FzVEJSj8gMTObzwca2 kxN9UEYMp2Ip9w4z1i8R7WCBexvRpgZ4ZilRUJriY/AH1u+BxmHeUP0O8CVt3eZVqlsK TtPg== 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=PldKx1qfpz7lDvG61jB68knTHdO2ooZN76NERNqkzDY=; b=H1TMrM3YU9WtmYNawJ5VYZoR01G8H5oj7jGWhxfkxtv9oazmxfJIm/84hoF8qmvqh4 kTSnLUp5zYTcSTV7cVWZDjj8W13uvBFBLtiT96LWLZI1tHwBfNYRmKQatmpfmLyEwHi7 2MuUhQEX+O7rbPGkZ+/wFsGpoJd+dTXTSXerqkzZ06ZRd9MhKPIWfg/hkwE8tax6ShRw ip8rdbBnmSCL1cGWDH7a+cEsN+z85Lmn+sD7F3uaQQpkDAd0FLZUH8R7hU33oGg8whfp wOLJOIrgLb19BuXwIcGJWk3xUf1iaT24lX8EgVciLUFSJeVwjjhPzSqJbzL+2vdii29N LGwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tAaXPTux; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d16-20020a05622a05d000b003e386bb6bc4si5828585qtb.634.2023.04.03.06.51.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Apr 2023 06:51: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=tAaXPTux; 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 1pjKYu-00030S-VG; Mon, 03 Apr 2023 09:49:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pjKYs-0002xO-Ev for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:30 -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 1pjKYn-0004t5-UC for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:30 -0400 Received: by mail-wr1-x436.google.com with SMTP id q19so26356676wrc.5 for ; Mon, 03 Apr 2023 06:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680529765; 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=PldKx1qfpz7lDvG61jB68knTHdO2ooZN76NERNqkzDY=; b=tAaXPTuxrZUwgDhNs2VAA3i3A5sbpUS96TJNu9EnHiuS5McEnfl5cstLz9L8iPRyMm jWDWiyCo47qpsZoFmbQlC86I9o0KKIsuvTeq+G6EWzEJkwAAJpeHCXDuAQsCgp2zn9eX F4qqn5xVcYpsCdCgRKXYKrcLgDuVHj3/chtJPS5xOJaQqG0XSxlyHWqCpnnl5tDVrWwd EhL57J/td90pFXIrSsBfNC92WqwTVsqMuokr0Zsf2W5SUy3L5RWjqyLYARjjsoYgZyCW p7Jd4iSOaVHpFVYz33XRBz8xdSqji6nhgSHdB/Kbk3PNu/cm1fr86kp6okiP5IdY760a pjow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680529765; 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=PldKx1qfpz7lDvG61jB68knTHdO2ooZN76NERNqkzDY=; b=UDn3GmVhn7GrUF3UMLWEKxkPxmQCFWzf9b6m0T/wpmDZyipxvWeoW5YcGGmzIYo2GN gn5d9DlgnTZRySYfMIhrZ4BraLgsAoBCepwMjGfQo8z+v5qQYDdONdJ2YEEf4iXqwicM DIKWE5Qckt/a+cDcDIgVgyMeRap+9V/j/7eBZ+3A/SGff3QPQ7gjto4SqBlBmmXj5ydG 73YAuQdykrFpL5T04hxiWMC7b4JY4Y4W6Q72Kkh1tBgnUWDgkfPukjIW9MPSg+X+mBWk QldfieTjBSh+kd7yW0tkcTbEIHDjX+SngBJ6w7bQFy86eopFi2cdaokqKrb/yvFcvfZn aZ2w== X-Gm-Message-State: AAQBX9fM/78u9OLpWAWPUFZBjuZYCyO9C7nhau0iwewI12id+DLud4tC xN7NeQhtuwWnzPSdRsZhjjeTcw== X-Received: by 2002:adf:e848:0:b0:2c7:fde:f7e0 with SMTP id d8-20020adfe848000000b002c70fdef7e0mr24295594wrn.65.1680529765220; Mon, 03 Apr 2023 06:49:25 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id p13-20020a05600c468d00b003ef7058ea02sm19327158wmo.29.2023.04.03.06.49.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 06:49:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 960301FFC0; Mon, 3 Apr 2023 14:49:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Reinoud Zandijk , Ryo ONODERA , qemu-block@nongnu.org, Hanna Reitz , Warner Losh , Beraldo Leal , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Kyle Evans , kvm@vger.kernel.org, Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Thomas Huth , Kevin Wolf , =?utf-8?q?Da?= =?utf-8?q?niel_P=2E_Berrang=C3=A9?= Subject: [PATCH v2 09/11] tests/vm: use the default system python for NetBSD Date: Mon, 3 Apr 2023 14:49:18 +0100 Message-Id: <20230403134920.2132362-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230403134920.2132362-1-alex.bennee@linaro.org> References: <20230403134920.2132362-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Message-Id: <20230330101141.30199-9-alex.bennee@linaro.org> Tested-by: Philippe Mathieu-Daudé --- 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 Mon Apr 3 13:49: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: 669780 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp1895242wrt; Mon, 3 Apr 2023 06:51:56 -0700 (PDT) X-Google-Smtp-Source: AKy350ZbzeUGGVsac/ZT8mp0MUo0H/uZllXyZoY3pcqMw/Dnsa3r64N6DPCf9QP8HyTOSvbv5h0h X-Received: by 2002:a05:6214:d0b:b0:5e0:2461:d313 with SMTP id 11-20020a0562140d0b00b005e02461d313mr24408309qvh.13.1680529915891; Mon, 03 Apr 2023 06:51:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680529915; cv=none; d=google.com; s=arc-20160816; b=oQFStGU0ydxNyufK7uTTEm3r8x0TJuGR1ANg2lBGFSqTUmnc+NRFl+JuDoxUEtedps VHSu352e7aUGPdiXl43/wbCzZCvUzSAeiXZ3ymsZY9Za8lvE/29FIUVeWkUkATSxH6Oo yEA/w2neygTS+x96AV41wHgzSUedulZvV7qAUlheN4YUYnMrMwj7Mha+ehIsXkKwyU/F 6aTPB44szNy22rpNJRMfxnHaL2MVnM5hj08H2XN1S6Dh+7Nw9C4zAX4GqC7cM+EhhUIR ocUOgcOSVMkzJqKF4XFRKPfKItmCaja6ON6B7hpA+9C4LntwToy7QFtq7UBXgZ+paspE cNxg== 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=H2FeLZKR7rrXEZU0aPhVzNZ/e8CIWD3g/VnvrT6YWk8=; b=qaQxOODOqXeZGhjW1UEGem8rZLESx3wlm1H/ngCt73VbLntRGETRlgJ+7zwjAZZNtY uz0OtTKUapmKfxnj6ovZVK1GeGlhzDtO7cnFxlcP9xViUFtA94Mdo7+m91hcC3F3i++U SuEvBScuaBBN7FlL1HPNcgnGCSabYEK9MoupJJugGTME2Be0U6WgAxWxBYKWgyIuycn+ jPoNfFAuvcL5pJHB/kRUcuHf0hWapCx1kgD1Qm+2AFCaYWpNU4H/EUe60qyrkYqEVob9 Gi3J+Tzj0BR8I05KyIyfD9WeLIrE3Y+tQYqtumDfglFYtcKnh/9zq0VD/O1zr8Vci+Wv lulQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kZmtBOf2; 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 if1-20020a0562141c4100b0056b8269da68si6104421qvb.259.2023.04.03.06.51.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Apr 2023 06:51: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=kZmtBOf2; 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 1pjKYu-000309-Kb; Mon, 03 Apr 2023 09:49:32 -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 1pjKYt-0002zX-Or for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:31 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pjKYp-0004wm-AT for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:31 -0400 Received: by mail-wm1-x32c.google.com with SMTP id o32so17157827wms.1 for ; Mon, 03 Apr 2023 06:49:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680529766; 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=H2FeLZKR7rrXEZU0aPhVzNZ/e8CIWD3g/VnvrT6YWk8=; b=kZmtBOf2iDPBbqPfDNkM9lOnUFuhMtgPgELYV+FeVe/tevJcmAoJoNpdgj0ET4cVJn VHV1zWCKYwQ54Kaa4Qk/UY5c2/V28c2nip5l6WG2XVmBYXaCUJcgq2H25E5MoOxv/J9o gqaz602XARMBoQilmFjbdQMTpXp9Ols/uPMZwaXeWQ/YsftVBAnOCkPFJVwOEhJAGzHj 4igZo/d/GSphULrD/hJbheAsFgf9D4zgVjv6r61QXFW0doyoAWpTelVO61it552Ydcqp YwZABI2ajwBiOLZhRjDPk5sQYvjnZNLMorQ7GQa/YoFiart/Ta2VcGkqcwVjjuQk0okv /LVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680529766; 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=H2FeLZKR7rrXEZU0aPhVzNZ/e8CIWD3g/VnvrT6YWk8=; b=Z7qTyhTjGy/PtnLGOWGj0TOAhxwUZx8Q07wYLkwjiUgWuJFjmkfSoctFNb3ZueycKD RA9oF0+TjWJDn6eagLwLOBQYHIt3XGMfW/ny5XedGGpIOQzWE1ZSV6mn9MNGiR0f+Ng2 YJh4dZ6hQE5JJiVL14EAvTIW5G+vs4m+I+SpNOJTBo+pUn1wmuqbgCc49dtu8mXFrGf3 TKxCiXmCqRRc951dv49Q1A5wd+uE5cQSZVvspeqTB9KpQ0j7A/6lNNoMg5xCBLocXmuD EYcuhnc01uuMSp0EN9/7MjRNAHy4FH81SUjC3IinHVNqu0g+VnKcNmcTPCY8xU8UAe1V 3k9g== X-Gm-Message-State: AAQBX9fuA/w+tynOHvYCB//CQ/WazzZZh5//CBPsyjFEy1KQ+7at8j1C 6xvMaB1bE6BsawP+hab8q4cNJg== X-Received: by 2002:a1c:4b04:0:b0:3ed:c84c:7efe with SMTP id y4-20020a1c4b04000000b003edc84c7efemr13588895wma.7.1680529766064; Mon, 03 Apr 2023 06:49:26 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m8-20020a7bce08000000b003ee70225ed2sm12182902wmc.15.2023.04.03.06.49.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 06:49:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AC70C1FFC1; Mon, 3 Apr 2023 14:49:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Reinoud Zandijk , Ryo ONODERA , qemu-block@nongnu.org, Hanna Reitz , Warner Losh , Beraldo Leal , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Kyle Evans , kvm@vger.kernel.org, Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Thomas Huth , Kevin Wolf Subject: [PATCH v2 10/11] gitlab: fix typo Date: Mon, 3 Apr 2023 14:49:19 +0100 Message-Id: <20230403134920.2132362-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230403134920.2132362-1-alex.bennee@linaro.org> References: <20230403134920.2132362-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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: <20230330101141.30199-11-alex.bennee@linaro.org> --- .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 Mon Apr 3 13:49: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: 669773 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp1894811wrt; Mon, 3 Apr 2023 06:51:03 -0700 (PDT) X-Google-Smtp-Source: AKy350bXMIRhnUb75qg76cAifuZxsOkjJvA6Hy5IX1qJri/GW2eGEFGSD0Gsuh11WaRIE+lyMJI9 X-Received: by 2002:a05:622a:130e:b0:3e4:e58c:d322 with SMTP id v14-20020a05622a130e00b003e4e58cd322mr49348735qtk.35.1680529863580; Mon, 03 Apr 2023 06:51:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680529863; cv=none; d=google.com; s=arc-20160816; b=oLRYBCnN87faB1FJtkD7wEF1t+7mnLdbNuERrvMidtyeEBmjBqgglxCu6T2yUB3Xb9 DTyXh5ImEkun2Xzidk0/4NGJINGfbk8cJavth1C5kihqIVTtHmOlmlmjpbI0aS9NBtkN juVCGBvL8vvcNnkNd6B+/ax6jtAB51czmqRZYzGhpdCz/V/2w5RAPNo7LPJ6wRBw8eSF Zjh9Nj/wqak9k+LzxlFoBz2HV5Krx3H2ofAH3KHKkGy5AqiYUh6quc5/NLd0vJalpI4w ell0caM36Rf/UAddvWi0ENijChSATMYZtAELg7bjdya33EcCdyfmTH06qWFdsc8gVvl1 GXlA== 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=vKaHaFlstk5VQMLZ9VjcumTBmG2FDADA92zKOBfHglo=; b=Hr8+gBYOOrgpQX2b4FOUurwFvP9EQcHilJWT2Q0NiGyc88OvYGsd3HJTwETiTNtdBc sKeMw2s1yUo0XVC6v6HzUj3XOkhMGHfTYHBBzA36+3Zf3CiYXYd1nOO1ij2BJqrm9/tR 3lvLgzgm/+txN+pu2Oqs67/5NmLW9DAV7obFHpmoweNb6JNw45w/plRjuVJRR4ZlER1q It+ugRUJ86vSYfqqxWYnAIkCdJKUSlEd8/AeRqRV5zyBYwGYX03Ig6o1om24QAsEeemm BmY74eOfwk7XTOAHOpDu873H3qD1DvDUBV6fC4iDSuSEteqZ1d6DY/iip20q/S/izs62 Ovrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=c4D5FAHN; 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 o7-20020a05622a044700b003d8c59c9257si5941600qtx.117.2023.04.03.06.51.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Apr 2023 06:51:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=c4D5FAHN; 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 1pjKYx-00032h-F6; Mon, 03 Apr 2023 09:49:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pjKYt-0002zI-JW for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:31 -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 1pjKYp-0004wd-7V for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:31 -0400 Received: by mail-wr1-x42f.google.com with SMTP id r29so29388123wra.13 for ; Mon, 03 Apr 2023 06:49:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680529766; 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=vKaHaFlstk5VQMLZ9VjcumTBmG2FDADA92zKOBfHglo=; b=c4D5FAHNNne6aHzgXm5PKvuQrV0KwTkfjJrPgEUCbjhxQtZdGE6JVakoULkhd4i0Jp KQ44SWWS+vuj0c/x1WHBgAJVF0VkrLqxVfK+GJjHs7Vea8fmVUlRf1Ue5TAdeVnp9KRt HyiaBIFGGqVpXbqVvGqeMubwlUqQNCZtGvzXPLyTiBafiVbmJ5rk5FMteRW5UZpVxlOP Coe1KPAvwVYf9gfUKbXzQm/PUx95STeBTH+X/m9TYt0ik4ltlVpmOHols2Q8yhqBI2oc T7M2Qg9KeZKsqn6T1nFy3QM0dtzikm8kUK4amICoZQ+Ulw9BczaCvvd3MmZdonHSCx4j 3oXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680529766; 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=vKaHaFlstk5VQMLZ9VjcumTBmG2FDADA92zKOBfHglo=; b=smpzb6t8JZUUp3WAjEPBR5KCOB9oSRFmhPEN8pE3tgLKpHErKX1Uw9K59qaoITmWik gh/a0EwJBTMzb4/q3skBTSTp171CA4kj+Hwbvo/Qa2tMfv23hGzXKqJrIfjichn2w454 gBRF94KVfU/hlPB9/G5+YGwbd/NDKa1p3SsGCPeCTEus/QZtMedk68b+0PUwsl7P/La3 iLfDi7KK1DwqjqxPsvjafLY68Lp0wN3WnkMr0roPQCJruPfIrkATiNV4gYkUSWKuIQgw 1zHAEp8hoMNPzCrLjo8773SsfTL8L9EzsOkL0EU+/5nTPMHRkW8JhAp/KwUDRdeEjbqi 1nmw== X-Gm-Message-State: AAQBX9c28NgHr8sXIB/y5++dC2UfELlkFlvgePaVLzmXBEXykH39AVUo kkMMKeyNDf4k7yIwEMZQ+9QaNw== X-Received: by 2002:a05:6000:ca:b0:2d6:5afe:7b91 with SMTP id q10-20020a05600000ca00b002d65afe7b91mr12487847wrx.30.1680529765861; Mon, 03 Apr 2023 06:49:25 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id j8-20020adfe508000000b002cfe71153b4sm9696735wrm.60.2023.04.03.06.49.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 06:49:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C43841FFB8; Mon, 3 Apr 2023 14:49:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Reinoud Zandijk , Ryo ONODERA , qemu-block@nongnu.org, Hanna Reitz , Warner Losh , Beraldo Leal , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Kyle Evans , kvm@vger.kernel.org, Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Thomas Huth , Kevin Wolf , David Woodhouse Subject: [PATCH v2 11/11] tests/avocado: Test Xen guest support under KVM Date: Mon, 3 Apr 2023 14:49:20 +0100 Message-Id: <20230403134920.2132362-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230403134920.2132362-1-alex.bennee@linaro.org> References: <20230403134920.2132362-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 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: <20230324160719.1790792-1-alex.bennee@linaro.org> --- v2 - catch fail to launch and skip on lack of support --- tests/avocado/kvm_xen_guest.py | 170 +++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) create mode 100644 tests/avocado/kvm_xen_guest.py diff --git a/tests/avocado/kvm_xen_guest.py b/tests/avocado/kvm_xen_guest.py new file mode 100644 index 0000000000..112c955976 --- /dev/null +++ b/tests/avocado/kvm_xen_guest.py @@ -0,0 +1,170 @@ +# 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')