From patchwork Thu Jan 26 11:22: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: 647089 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp185529pvb; Thu, 26 Jan 2023 03:23:29 -0800 (PST) X-Google-Smtp-Source: AK7set9hYEUSaL6k/hTu9MsGAko0Zd71uMieM7HdwirHJxA6TMoXWuhSnXnd0bZUOoGIStMof5wt X-Received: by 2002:ac8:7e8d:0:b0:3b6:3022:688e with SMTP id w13-20020ac87e8d000000b003b63022688emr10650272qtj.53.1674732208952; Thu, 26 Jan 2023 03:23:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732208; cv=none; d=google.com; s=arc-20160816; b=SuX0/zNVB0QrU5kMusPLAJaIg5EtZi65zsvOGnh8sOyNWEu9cXswQDHtQdc2zZNBm6 mIhiANZffvMd2NbVVxYXbXHMt+1IQBf+7liXkl2Fotlb5NZSKlh1P2ZTPeKbUwTrhX9h AdRRD4pXLy/yzlLD6V/ZubSk+ge7n/HZuCQ1oGUlQARe9sgDZLtiOi+/lWeWdAHZjY5d QmvNlBge7C2D3vfOvN2FmsBQqDCubwmnkWB1EatpBcaTf0Db1gAYOMirAm9NtHP+V2SR dY1KVwHGp5MPUufkNIuJge0EtEuvsPdhFz7rAg7mwGUuqUrXCl0ABAEUjuhjyzsqT2EZ 2sEw== 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=q0NjCeAYrzK7A1a1AbZZ8FkVkM9fRhe+XUXKLNI0vuk=; b=e3soULqlAWAhs9yCyQRELH/QX+9DcA70VApc/ZAKbC+zrmYhUcOi3HoQpVx9JLYyQp zuPXHiwcn5CjNmtA099+DM6X2nl3XIeBPhYra3+zqVcAmvIlggsb4hlRiLpjQN+ydOz7 +Z4ftkUGlgWWrPrLV//nJixbXJ/1DmaWc6aJ0k+c/YqvTVN9edCGv6TlwncuHXWsTuy9 z/U+HPIUa+d9jLpGOrBNGc5gPic9v4DVbxX2YgEXe8XFNO8MpC3NWZXOpOUgpX7/HDU+ CT/chEKX16G91YzYlPKmXCNhn0MTovW2EOI9QmBSvdmcR5PL/dFl+oKLKbmg6pRWBDhB q59Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Dm6ncvDz; 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 j19-20020a05622a039300b003b31886ab72si500082qtx.747.2023.01.26.03.23.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:23:28 -0800 (PST) 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=Dm6ncvDz; 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 1pL0LO-0002Lm-Er; Thu, 26 Jan 2023 06:23:02 -0500 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 1pL0LJ-0001hb-Vx for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:22:58 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LG-0003ce-WD for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:22:57 -0500 Received: by mail-wr1-x42d.google.com with SMTP id n7so1425269wrx.5 for ; Thu, 26 Jan 2023 03:22:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=q0NjCeAYrzK7A1a1AbZZ8FkVkM9fRhe+XUXKLNI0vuk=; b=Dm6ncvDz+5yxpteh8aQAJ+UfcavSmBKZS6rP9Aerzh+EHMjvfdGNl8B+cP/TfULiCa zKoCsNTb5RRGESbqmE2MusD3r4z/rREcRZ/LMwZnaSXbiYnu7UsYIy759KSD8VoKM+0A V7ysjPL8Lrg/cZ2snzOEBZ997UIZ+Yp3hpqT0VUG8QSsoVNmwkXWGnzjajlCu6LGrCoc U2hsfS/SvOL4fNdYc/YExv4himnDFm/TX+byul+ui6o5Mpqzc8h58/S3IYy2Lwr4WrxD K+nAfP8e9tua1KXiPRUtm+VfyfJclHy6LLUQ0N2llxVC99MtiuRmp9s0oHmbVd+We1xH 6oCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=q0NjCeAYrzK7A1a1AbZZ8FkVkM9fRhe+XUXKLNI0vuk=; b=qJkvKAzw7m9u/sKLbE8wBCI0hyBBoDuaQO68ESskocEgwzhHawa0dr+RBGIE6VVem8 U5aXlRjmPhYKw6b0in0gAgGVg/8Fw9pdeQeWElVqWjSzfY6siy2qBSb+FsunUh9+R8Lk n8GwFmgNXIG9C03BH5WjynzOT8jS2V0WrICMwkTX2xJUpKAyitPhA+pCMdMgUql39XpL bOud4iGVjdosJnw58XurUd3nfasMCV728S6Ox+UYUFonG0f4dEodeW9BvopRILfxeN4+ 8UtxazdhhhRWgFSq3Z5CovdLnm7o2V9mAKdqcW8a6uzI5A/pzBYB/nm2dq+OieMAFdeu XZ4w== X-Gm-Message-State: AFqh2kqdRFfCpEeawXs3PuwLxt1U00T9IPR9dkgsQAjoFE1or/9SzGrE AMxH+NVya5Z5iTNDuUfV9b8Tmw== X-Received: by 2002:a05:6000:1708:b0:2bd:db1c:8dfe with SMTP id n8-20020a056000170800b002bddb1c8dfemr35569106wrc.48.1674732173020; Thu, 26 Jan 2023 03:22:53 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id f12-20020adfdb4c000000b002bfb1de74absm1087164wrj.114.2023.01.26.03.22.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:51 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 285241FFB8; Thu, 26 Jan 2023 11:22:51 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 01/35] scripts/ci: update gitlab-runner playbook to use latest runner Date: Thu, 26 Jan 2023 11:22:16 +0000 Message-Id: <20230126112250.2584701-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.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 were using quite and old runner on our machines and running into issues with stalling jobs. Gitlab in the meantime now reliably provide the latest packaged versions of the runner under a stable URL. This update: - creates a per-arch subdir for builds - switches from binary tarballs to deb packages - re-uses the same binary for the secondary runner - updates distro check for second to 22.04 Note this script isn't fully idempotent as we end up accumulating runners especially during testing. However we also want to be able to run twice with different GitLab keys (e.g. project and personal) so I think we just have to be mindful of that during testing. Signed-off-by: Alex Bennée Acked-by: Richard Henderson Message-Id: <20230124180127.1881110-2-alex.bennee@linaro.org> diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-runner.yml index 33128be85d..95d4199c03 100644 --- a/scripts/ci/setup/gitlab-runner.yml +++ b/scripts/ci/setup/gitlab-runner.yml @@ -50,60 +50,30 @@ - name: Download the matching gitlab-runner get_url: - dest: /usr/local/bin/gitlab-runner - url: "https://s3.amazonaws.com/gitlab-runner-downloads/v{{ gitlab_runner_version }}/binaries/gitlab-runner-{{ gitlab_runner_os }}-{{ gitlab_runner_arch }}" - owner: gitlab-runner - group: gitlab-runner - mode: u=rwx,g=rwx,o=rx - - - name: Register the gitlab-runner - command: "/usr/local/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list {{ ansible_facts[\"architecture\"] }},{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'" - - - name: Install the gitlab-runner service using its own functionality - command: /usr/local/bin/gitlab-runner install --user gitlab-runner --working-directory /home/gitlab-runner - register: gitlab_runner_install_service_result - failed_when: "gitlab_runner_install_service_result.rc != 0 and \"already exists\" not in gitlab_runner_install_service_result.stderr" + dest: "/root/" + url: "https://gitlab-runner-downloads.s3.amazonaws.com/latest/deb/gitlab-runner_{{ gitlab_runner_arch }}.deb" - - name: Enable the gitlab-runner service - service: - name: gitlab-runner - state: started - enabled: yes + - name: Install gitlab-runner via package manager + apt: deb="/root/gitlab-runner_{{ gitlab_runner_arch }}.deb" - - name: Download secondary gitlab-runner - get_url: - dest: /usr/local/bin/gitlab-runner-arm - url: "https://s3.amazonaws.com/gitlab-runner-downloads/v{{ gitlab_runner_version }}/binaries/gitlab-runner-{{ gitlab_runner_os }}-arm" - owner: gitlab-runner - group: gitlab-runner - mode: u=rwx,g=rwx,o=rx - when: - - ansible_facts['distribution'] == 'Ubuntu' - - ansible_facts['architecture'] == 'aarch64' - - ansible_facts['distribution_version'] == '20.04' + - name: Register the gitlab-runner + command: "/usr/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list {{ ansible_facts[\"architecture\"] }},{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'" + # The secondary runner will still run under the single gitlab-runner service - name: Register secondary gitlab-runner - command: "/usr/local/bin/gitlab-runner-arm register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list aarch32,{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'" + command: "/usr/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list aarch32,{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'" when: - ansible_facts['distribution'] == 'Ubuntu' - ansible_facts['architecture'] == 'aarch64' - - ansible_facts['distribution_version'] == '20.04' + - ansible_facts['distribution_version'] == '22.04' - - name: Install the secondary gitlab-runner service using its own functionality - command: /usr/local/bin/gitlab-runner-arm install --user gitlab-runner --working-directory /home/gitlab-runner/arm -n gitlab-runner-arm + - name: Install the gitlab-runner service using its own functionality + command: "/usr/bin/gitlab-runner install --user gitlab-runner --working-directory /home/gitlab-runner" register: gitlab_runner_install_service_result failed_when: "gitlab_runner_install_service_result.rc != 0 and \"already exists\" not in gitlab_runner_install_service_result.stderr" - when: - - ansible_facts['distribution'] == 'Ubuntu' - - ansible_facts['architecture'] == 'aarch64' - - ansible_facts['distribution_version'] == '20.04' - - name: Enable the secondary gitlab-runner service + - name: Enable the gitlab-runner service service: - name: gitlab-runner-arm + name: gitlab-runner state: started enabled: yes - when: - - ansible_facts['distribution'] == 'Ubuntu' - - ansible_facts['architecture'] == 'aarch64' - - ansible_facts['distribution_version'] == '20.04' diff --git a/scripts/ci/setup/vars.yml.template b/scripts/ci/setup/vars.yml.template index e48089761f..4b355fb80f 100644 --- a/scripts/ci/setup/vars.yml.template +++ b/scripts/ci/setup/vars.yml.template @@ -1,5 +1,3 @@ -# The version of the gitlab-runner to use -gitlab_runner_version: 13.12.0 # The URL of the gitlab server to use, usually https://gitlab.com unless you're # using a private GitLab instance gitlab_runner_server_url: https://gitlab.com From patchwork Thu Jan 26 11:22: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: 647106 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188288pvb; Thu, 26 Jan 2023 03:30:59 -0800 (PST) X-Google-Smtp-Source: AK7set8X//NSmbKGm1T6s6zqIRzgTHsMQR2UcC/BEspv+/pNp/0pcn5fSjzQwv6eM4TRK7nY+SOF X-Received: by 2002:ac8:5fce:0:b0:3b6:87f2:838d with SMTP id k14-20020ac85fce000000b003b687f2838dmr9395471qta.8.1674732658827; Thu, 26 Jan 2023 03:30:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732658; cv=none; d=google.com; s=arc-20160816; b=E0zgW+hLXRzHwmw8VGlI2Mujmh1E6SdfhqGrtKtt9+kX+ocSPeMaE2diTcmZUMSZT3 AhSNNjc72DVWS4Uk3Hw9WidCb6kZhwBLV+t3rZ74Yb5qQjCAHm8BVMtlpx801M5PhHWL n7mz2ZwHsyEL2sb5wf7Sp/qZbL2GX+4ronOR7q14CCYnM3E98OlgfNmwgUqYEB8eq51Y e6c8LDucXuW+bgfx3AOUFea2xgcOZ7beGCHS/sGtoH7EvosO+6RctcSWWOlesVIghxJs lrfKTNdZaUhhvwCWrPnCRmwqDE7q03yi/4C07uYBFE62C+4yTWmwN1CwAJK2pdTI2wVf TBcQ== 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=D0JFQN/51pRFc3qNTyiffpOYu7KU2O9q0f5EjNXPtwc=; b=W686D+dKavlRI2vpRRjPKljOGZL0FL1hp4C06zdGOQAxlFFrXKGmYbAo/Bf11N3eoG JHRapK3oCRxZWj2rFMl90u575arI+Xq6d9ny5yWHkxF5oW+16wmPMXyyo13nb9DE66Ty S0yzhQwYSrbV6/3WvCPZ19QQD8eSOvLpLZmnp0x6Qu/WXI8uIyFtTL96bHJbRc7DgcLc il2VYkX6UZJMLOagsWz55YfSnYZ7rQNIr1BrWNFyIcx1AU6DQYTzNA8QkpSZfThV25xJ sroy0olEL34n7gd6O3DVoE0Brv0h+D83ffxgxrAPAhJE6bfGQiOsaHbaWD+2gO8/7uJO IYhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EzTZP4Ea; 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 g22-20020ac85816000000b003a7e5493305si517963qtg.356.2023.01.26.03.30.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:30:58 -0800 (PST) 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=EzTZP4Ea; 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 1pL0LK-0001dX-3U; Thu, 26 Jan 2023 06:22:58 -0500 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 1pL0LH-0001Qu-Qz for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:22:55 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LF-0003ZJ-SG for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:22:55 -0500 Received: by mail-wr1-x42a.google.com with SMTP id r2so1418097wrv.7 for ; Thu, 26 Jan 2023 03:22:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=D0JFQN/51pRFc3qNTyiffpOYu7KU2O9q0f5EjNXPtwc=; b=EzTZP4EahKslCdRWpl9tOgpHXJbBX+9pFWJ2tTumttErrOYX11ASUGbEZ+XWTtS4as jHhChSb6CZPS/7vZ+ycfWFk0Nz9TvCSNCkbvAzTNVYd118V6fpZ3TvH70GLrG3ju7LZP XYeU2K3no2G8eHQYa/B0HOh+LdRrco9+AILScK6JNW8F/buLiqb8hKI2IN+gybqWYNvc A/dWmyzerv0LpN1sOPLmGROniNNLJjR0eGSouH8qKwyUy0uLPHXWCmS+qvK3qWCdH3kl uq6lmLua7+kt6kuIaYnFhsG7GaGZlpqutuz3o7IYOxAxEk2dtqDEvwPfw3+Z3U3Ifzpo 0GOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=D0JFQN/51pRFc3qNTyiffpOYu7KU2O9q0f5EjNXPtwc=; b=TsDugQ/vRxXD73/Px1MWsPApwZ7ispfR8riVsAVE9KPGCEDYRilaqCz2VsLEHNHoO8 fiweIPUihqqNO5HBt5F2636BquJZuF394VaWJAUFdoDYae5ElJPmQoy5zxn0eR/u2X3W 2GuiwS1OxhUagSdglNkNm7JIiGKNuLpR6Lxem1zOqubnGBhQi+u5mQT422JOJxpUuXmr Ehy0RI5ZWbPpGGYONPKONU8KGNZ48GA8CJjrt0D/jfcsBhSb6wuRYhRIHvew6jw4iG0J 9CMrR/NVUaHzYe4hDKx/3Qu2t+1XTe4CM1Zw30PKKKRrIUreeJa+VBrnty9NUGjhT3oB JCzw== X-Gm-Message-State: AFqh2kqNTX04c7pW5iNPYxhKsscfSxwfC8T9xGsS82GI0rcotAlBiAm7 7nAuaW73SrdU6A7yoaRP+1WrJw== X-Received: by 2002:adf:f4ca:0:b0:250:779a:7391 with SMTP id h10-20020adff4ca000000b00250779a7391mr30981607wrp.47.1674732172200; Thu, 26 Jan 2023 03:22:52 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id a11-20020a5d508b000000b002be099f78c0sm996655wrt.69.2023.01.26.03.22.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:51 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 511CD1FFBA; Thu, 26 Jan 2023 11:22:51 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Mark Cave-Ayland , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Dani?= =?utf-8?q?el_P_=2E_Berrang=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 02/35] gitlab: add FF_SCRIPT_SECTIONS for timings Date: Thu, 26 Jan 2023 11:22:17 +0000 Message-Id: <20230126112250.2584701-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: Mark Cave-Ayland Suggested-by: Mark Cave-Ayland Signed-off-by: Mark Cave-Ayland Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Message-Id: <20230124180127.1881110-3-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml index 69b36c148a..50fb59e147 100644 --- a/.gitlab-ci.d/base.yml +++ b/.gitlab-ci.d/base.yml @@ -6,6 +6,11 @@ # most restrictive to least restrictive # .base_job_template: + variables: + # Each script line from will be in a collapsible section in the job output + # and show the duration of each line. + FF_SCRIPT_SECTIONS: 1 + rules: ############################################################# # Stage 1: exclude scenarios where we definitely don't From patchwork Thu Jan 26 11:22: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: 647097 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp186405pvb; Thu, 26 Jan 2023 03:25:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXscFhaz0RR5JlNhDL1zIS2iuRbGiO/H4TxKMUnPYo4Kv2RZQ6L12LZ+EDMaoC8vi4Puse7R X-Received: by 2002:ad4:4983:0:b0:534:9c81:2c15 with SMTP id u3-20020ad44983000000b005349c812c15mr49951596qvx.3.1674732353322; Thu, 26 Jan 2023 03:25:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732353; cv=none; d=google.com; s=arc-20160816; b=aL37vBNim+BmX/Se+8++XWxCZj5CXWWF2qpmeLKudHumRVRh7NGqIKbtFyEk9Kd/ro kxNWcTiWDn5KOZ2ooUxjV8XWvVyrEUYGp2dLwnVSw6U9VI1sdr2QxR5TJSURsXp9RrPg ZwVAY+wb5bzdHaWnIft9F7Es+P3qnI5U21utd3q06s7+zxcvb/cdqELWIRsLGR7ilAZ4 gaWbJZCLIUtwD+ErbSvaS2SF0y3Bg2R1ZU3okqGcZ69oHWfakq8lwpuTmiZnTDXnJ7NY //OEgXjv7KZa3qbXS95A0fN5JpwhKhhwPlrxKyMUxBm/ehLwgvYgfwnZsK32/mLUTuvw 3U8A== 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=uCn56T6orLePDi22PpfDY7Bln8QKxCeK4Q3TTEITxy0=; b=sCBS0WZo6jT2Y4y+S8JOf42rQKAro232Y7L4uxJyUkErVUY3XYYgd/NV9cFUdoHSfr 7miagGTxNS2a2uj4nduGK2xl1Mhxi7yoL8Vb1tl/Wygp5BLdFXrbVaMy+gphrNWhwgoT UOjkmmnltn+FtfVSq9zBMJC5Dj/8bsqSjSFR6KJ5AkBqTns6Gca8XmcW5/QopWpcO7q2 Vva4NcvwsBHPRfgyAphcZ+/AEtVl1V9Z9H7eGRgpXn0WGATGxSpZQvc3WSX24cwKeIZG mO/MH1DH2QY/HRyBLlGfViY4yyyQUj8t5TPeOC6KuZJe8bQfQKygVC5syy8h7oT8gFXm 3epw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NQPOxLQJ; 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 t15-20020a0ce2cf000000b005351a772ddbsi623015qvl.293.2023.01.26.03.25.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:25:53 -0800 (PST) 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=NQPOxLQJ; 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 1pL0LO-0002Ky-Eu; Thu, 26 Jan 2023 06:23:02 -0500 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 1pL0LJ-0001g5-SU for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:22:58 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LH-0003hj-QZ for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:22:57 -0500 Received: by mail-wm1-x336.google.com with SMTP id f25-20020a1c6a19000000b003da221fbf48so906342wmc.1 for ; Thu, 26 Jan 2023 03:22:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=uCn56T6orLePDi22PpfDY7Bln8QKxCeK4Q3TTEITxy0=; b=NQPOxLQJYppw80QFssT9x/dItvm4Q5xYN0ztRzs9iNpmGoMtlhOWJUyPP7pvswzCNW f7TSp+RqNzj9yWNPSCfwwnGykpv35xTBRwoglysRmK7bZqeHykk1/tEDcoWcAkl/IfHK h4LS7TDUhFIDHLHG1zb1wS+8oLv57VmZY/TrrzFJzAXQhqMoMtijApr+fVwGWfSLXaHH eaS0ylVdHQCnKCCpymwSt9D4qAYzCbO44o8fycEy2XPDRZKcrPtHgvLyg61ueHaz6bSf 9t/UT/wh036aUBdOCvXuxM9+LoFij5iYt/VIBIEzaXm7hxu7C2HuDd05OzLCsvO71OqK 8YVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=uCn56T6orLePDi22PpfDY7Bln8QKxCeK4Q3TTEITxy0=; b=LoTk2LRk1jYDUL2wx98WRVpwuFVaSI2ETOLfHU710w3HonGqiOf5bkfHe6KZbeQi5V E11CmXN4S2U7l1D6xZJoU8g4h/wyd73ew82+IT3+ImE+90u0AnoiVf1HbxCX/pu0KIiZ fQB1kBabmNroD6BkFhi/HcKtalrf4suSUfs1nsmR+GwmIV2GqPw0Kg8+pD7CUkzKEWDG 0Yxu03ot+cqfZGujdE2AohfDGAEtK/NoZFAKtOlN0vqgZBDhGNXxSxKrQ8iZDClkAHHX f0x2kJ5LPEKkKXCYc+LNvdkJJYBEO6e10+Zwe7enmCnMqYFY/gRcJsNzpCv2jWPXjKEv aayg== X-Gm-Message-State: AFqh2kqlqLAHfSVUYebwpszBVBpTRmmWkThVPTwQZ/d85klN0aklrEoj opEF7izdErRXQIWZm5kfn/bKtg== X-Received: by 2002:a05:600c:331d:b0:3d3:591a:bfda with SMTP id q29-20020a05600c331d00b003d3591abfdamr42438805wmp.27.1674732174294; Thu, 26 Jan 2023 03:22:54 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n10-20020a05600c180a00b003daf672a616sm1167506wmp.22.2023.01.26.03.22.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:53 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8B69B1FFBB; Thu, 26 Jan 2023 11:22:51 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 03/35] gitlab: just use plain --cc=clang for custom runner build Date: Thu, 26 Jan 2023 11:22:18 +0000 Message-Id: <20230126112250.2584701-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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 I think this was because older Ubuntu's didn't alias clang to whatever the latest version was. They do now so lets use that and not break. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-4-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml index abeb33eaff..725ca8ffea 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml @@ -81,7 +81,7 @@ ubuntu-22.04-aarch64-clang: script: - mkdir build - cd build - - ../configure --disable-libssh --cc=clang-10 --cxx=clang++-10 --enable-sanitizers + - ../configure --disable-libssh --cc=clang --cxx=clang++ --enable-sanitizers || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check From patchwork Thu Jan 26 11:22: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: 647111 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188423pvb; Thu, 26 Jan 2023 03:31:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXv6QvGRM9G28CSieDsViLflTHGhskZdcA25l+GS1yzMdcHfNJgHPbpIYcCYnSAM2kPPjymd X-Received: by 2002:a05:622a:1748:b0:3b6:8881:6b07 with SMTP id l8-20020a05622a174800b003b688816b07mr53557471qtk.48.1674732675955; Thu, 26 Jan 2023 03:31:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732675; cv=none; d=google.com; s=arc-20160816; b=fUFQOtfw2DBMLzKTs65Mi6vzDYqljt3m5htcA8gdIriMEwpakVCcPJCEprZ1BFTYqJ +tI4mDs40MMy3B+eFcfNwJ3b3bSEy/KO9cLWjWsjsogoq+lWbjL/nd5DChGwxN/26zPB +6ws6dITZWiUZs/G2pxO4Z4cioXjJaZwlJeOz8bWHUyumont01vnI189CLdZX27cR+76 SZ2Lnl5pZKN0Gi4qnestETo0tp6A0NPFaGR0xp3zwxZOazE90YkFQGQv1wNZXii048IM KMLdb7oj9FAsIQgTbRHy9/0YPY90SgUh938z0/SibaJp1yMl3VA6/ujZUD/OCW0JhBnw aK6Q== 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=+C92sq0vWAUt4fUXNA2VhVXJ53Co9AL3jOyRa4BuHYE=; b=VwICpcm97fHPbiLNLNPpIzUGjk1TUxc+Lqw9DwfnVuOq3e8gc2b/CUuBQTpL9MqfVi uCXDgzei0FaZaKXXdI+jMAxWKW/VL3GW1PAoo1S49+VA1aAYWibg/IGmY5vk1+S1Iv2Q jNKVvNFdCEPZeNocV+GkOIINBCibvAzOsBtjWB0AsiB3uqcpn8/25+E1cRBuE2kDjhmj lbF097GTfZCX+uoVeRX9DSfH6NV5o8JVsplWpAOdjIzVslygS9DeFwROBMgGtFRERN67 WjH06wTW8OW+FamB/M9ntDzLQf+wRegPro8BlEa5qSAm4ZLg8YMGB/bnsnYN6BDC1kKF Mxgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XNQa75eN; 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 b18-20020ac85bd2000000b003b697b05c94si509133qtb.506.2023.01.26.03.31.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:31:15 -0800 (PST) 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=XNQa75eN; 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 1pL0LM-0001yT-AQ; Thu, 26 Jan 2023 06:23:00 -0500 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 1pL0LJ-0001cS-Hu for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:22:57 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LG-0003eA-UX for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:22:57 -0500 Received: by mail-wr1-x435.google.com with SMTP id m14so968517wrg.13 for ; Thu, 26 Jan 2023 03:22:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=+C92sq0vWAUt4fUXNA2VhVXJ53Co9AL3jOyRa4BuHYE=; b=XNQa75eNRRyRVUa2eqZ+DIneWPXfRxo4L9I4FYUsBzIOEs4iTsYguVbK27tS/SW/93 QbPKv6Cb/vDxisxOe2Wcu8HBnElISEZEUsI+Ise3WthcM9IBPZHEh7KZpJf+XQQBYJy0 rKJgkLb6y04DdcS+fQs3987Gsb5abneRRAAcyujMYQI5UYSzJFFsZZBKZxXblGmxPxYi 4TCckz1+9zE6ijYPv+daIJLlhpclrYRm7YDPNPJIMfyxbQE4sogzu/q4Vw0x3Sk3M64v 4XjoIEc/0EnO2MXToFx4/nnZUZm3a2ugLPDfaJSZZEVJAHpShL1KUvyk4yoimkLdJuSx c62Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=+C92sq0vWAUt4fUXNA2VhVXJ53Co9AL3jOyRa4BuHYE=; b=uu3bfiiijWWV1ztWt5HfvLya3P/3vbfNWQgEYjj0mVbNgK4vCctZT3zVDxpJYZWhjR zfI9iPHRuMhUMOQwpluXmgbpIQYA0X7Ldwvp550ZdxxpmBhi6OrqEGBS4XvwcDN4ryyf pUHeAFGDEUDI1kM6IweQ50+XiEyJcLUtotq5dYz/jbZNPhKUVBa7KEjrDmy+pHK07DcT DF2zOi3Rhg6rgpMU+nHHfINMT30hq/q+56+6Yh3i4PIugs1BznGs6bjrMIa8CSF0kd4i TKGOnxDl/u6S0k7F/fmGYlnR4W9GnHs8jvRF1o7XehgtUNkhltkPGk6LSSSQHLYz/b86 zl9A== X-Gm-Message-State: AFqh2kqq3Bgn7wbejbd6ylJqMhP6aEiUVbgLAA7SOjvXdkS1WrDdaesA iADIpKw8SbKByBRQrMMnWmIFsw== X-Received: by 2002:adf:f4ca:0:b0:250:779a:7391 with SMTP id h10-20020adff4ca000000b00250779a7391mr30981654wrp.47.1674732173429; Thu, 26 Jan 2023 03:22:53 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id v1-20020a5d6781000000b002b9b9445149sm1225985wru.54.2023.01.26.03.22.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:53 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BE9D71FFBC; Thu, 26 Jan 2023 11:22:51 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PULL 04/35] tests/unit: drop hacky race avoidance in test-io-channel-command Date: Thu, 26 Jan 2023 11:22:19 +0000 Message-Id: <20230126112250.2584701-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We don't need to play timing games to ensure one socat wins over the other, just create the fifo they both can use before spawning the processes. However in the process we need to disable two tests for Windows platforms as we don't have an abstraction for mkfifo(). Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1403 Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20230124180127.1881110-5-alex.bennee@linaro.org> diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-channel-command.c index 19f72eab96..425e2f5594 100644 --- a/tests/unit/test-io-channel-command.c +++ b/tests/unit/test-io-channel-command.c @@ -20,6 +20,8 @@ #include "qemu/osdep.h" #include +#include +#include #include "io/channel-command.h" #include "io-channel-helpers.h" #include "qapi/error.h" @@ -29,6 +31,7 @@ static char *socat = NULL; +#ifndef _WIN32 static void test_io_channel_command_fifo(bool async) { g_autofree gchar *tmpdir = g_dir_make_tmp("qemu-test-io-channel.XXXXXX", NULL); @@ -40,12 +43,13 @@ static void test_io_channel_command_fifo(bool async) QIOChannel *src, *dst; QIOChannelTest *test; + if (mkfifo(fifo, 0600)) { + g_error("mkfifo: %s", strerror(errno)); + } + src = QIO_CHANNEL(qio_channel_command_new_spawn((const char **) srcargv, O_WRONLY, &error_abort)); - /* try to avoid a race to create the socket */ - g_usleep(1000); - dst = QIO_CHANNEL(qio_channel_command_new_spawn((const char **) dstargv, O_RDONLY, &error_abort)); @@ -60,7 +64,6 @@ static void test_io_channel_command_fifo(bool async) g_rmdir(tmpdir); } - static void test_io_channel_command_fifo_async(void) { if (!socat) { @@ -80,6 +83,7 @@ static void test_io_channel_command_fifo_sync(void) test_io_channel_command_fifo(false); } +#endif static void test_io_channel_command_echo(bool async) @@ -124,10 +128,12 @@ int main(int argc, char **argv) socat = g_find_program_in_path("socat"); +#ifndef _WIN32 g_test_add_func("/io/channel/command/fifo/sync", test_io_channel_command_fifo_sync); g_test_add_func("/io/channel/command/fifo/async", test_io_channel_command_fifo_async); +#endif g_test_add_func("/io/channel/command/echo/sync", test_io_channel_command_echo_sync); g_test_add_func("/io/channel/command/echo/async", From patchwork Thu Jan 26 11:22: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: 647087 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp185451pvb; Thu, 26 Jan 2023 03:23:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXvIWgxjNFRINZYkt2a+zyDL49zJMv7Bf3rTtcQ2miY3W8ncqTaSQNgXawwV1u4+qOA5GvXY X-Received: by 2002:a05:622a:6090:b0:3b6:92ce:b4f7 with SMTP id hf16-20020a05622a609000b003b692ceb4f7mr32187217qtb.37.1674732196310; Thu, 26 Jan 2023 03:23:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732196; cv=none; d=google.com; s=arc-20160816; b=XcEexa1+ij+OS4uMGjnlnzQ5uzoT70DogYhpesgx0hSl/FSRQ3o1l/FvN8Fh59XJsu fktGtjPwZWqZaZpEJMRGDyDGoOWDiSj1+rLzM1Jj/qqX8W/iI+N5KcnWyI40X4iy6fb7 QQ48r7PMrJR5+3DHhwEemZYVXjzEC8E84lfzzkZKGaD34AZCj0JNoQOXre/kXQ2eq8hR +BXSVGSNOsOyjSrOHdkBqCxMMpudsdIa9e4JGoJuMvtR7KgQtVoGMKJAw3dtcwaWsZnK vOOKHps1RYzWTLSFowgHFkKdamPXEdYnTI7RaJVulK87tvpBGZ0oFfZjK97hsb0PrRAn qJpg== 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=OuzaFTwfGMNndbyVLGZzkIKY+y7zC81Hu7O+CK8pY9I=; b=VBfymIxTmWeA0jjXIBFB1AmopqRrom66DpvHCFV65u6G6HSEQZ3dbmz5oR8x3WlxE4 zl7V1IvB45jC681yndzue1v7eArzCTQfEPvvXlem6AqDos1MFCkr6EeT/hXOgBqwqKBE AMPzRusmUVsX0Q5ltmmH/gzo00radGq23wtfLeO9x5EsRg8/PdytWS/U11JvUi/aCvv0 YcGgXkpUqjuNVp2+31K6GGAHT4jkgc6AztEOw+cciwQxfm2T8gVu2/wtiDDcmJ5QKjRL Le0msRZeId5F63xfDhhtX0AWjsXIwNc/Ol+zreoBQByYQHT90o3YVX86rR73gPibiyKM 3K8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d0gVdMoq; 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 n4-20020ac85a04000000b0039af5489abdsi578762qta.554.2023.01.26.03.23.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:23:16 -0800 (PST) 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=d0gVdMoq; 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 1pL0LR-0002e9-Nl; Thu, 26 Jan 2023 06:23:05 -0500 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 1pL0LK-0001ig-Aa for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:22:58 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LI-0003iq-0F for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:22:57 -0500 Received: by mail-wr1-x42d.google.com with SMTP id bk16so1403964wrb.11 for ; Thu, 26 Jan 2023 03:22:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=OuzaFTwfGMNndbyVLGZzkIKY+y7zC81Hu7O+CK8pY9I=; b=d0gVdMoqTUoCEp5YC3rTiOUpturM6eilLiAPl2kjoc3JmjykAuWSjxbgyLolPUe6Mb jvEcfrwh8h83sP1T6nTLz8q0FAcKToJkOLT4zOmDnHsXd1m0VHcQjb6rh2Jv5H9rWwng V5mIV6FcWYPu5ApsN2FZCShK1suoWypteZdC+GRT7w+WJav2Hwjrq06hlzUQBelFk+N5 4f8FsSrLmDblEMrAnH8Yx5fkGaEWik06g+hlTTCFbv2L4Qo7lxXlDouA51ucXaI+S5eB dREWmmHfuBGxpxHtj1bJHppCVL+kOAieGDmW4omA79RlMkiKcCwPJE4ONARMu9IPs6vL OJbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=OuzaFTwfGMNndbyVLGZzkIKY+y7zC81Hu7O+CK8pY9I=; b=ZagNQ6WjLXQD6QfcTeTnw4M7WgBsDHtehtuyzG3IEXl8yOhe64Vvu3i3ChUpssMX7H +DQkG2xRz5EER9AuhrfcJ3UnX4QEB4tc0GI7E2Gs5DOk8+iMdiMv5ioP98DMWl9SWWLr 9O1dpwJsOuBUcwoStPaiClcCpNFo0LbtZyQbM3d6BIFiOiBqd8rrOuKT+2J8Gal74afV hMLxeP7bvUiQOernRqfbuIeJNf6N1lfjIZO34500GgkX97vKmv3wjHk51vcdN2DOvfuj dCKhfkFRYuJjt4XLi6sjA4j4OVNVIScAZBT9w5VXoZOJkFFu4G8XmMM0IYja4dC258eJ 3ktg== X-Gm-Message-State: AO0yUKUfc2MyoPcInDGIM4QMYeJtyHIIxcY8OtRVgycITUZHkARIvkWG QvyNEAiq8m8Q+6AQtv8YDBjkag== X-Received: by 2002:a5d:65c5:0:b0:2bf:c338:8673 with SMTP id e5-20020a5d65c5000000b002bfc3388673mr2181792wrw.41.1674732174564; Thu, 26 Jan 2023 03:22:54 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id d3-20020adfe2c3000000b002bc7fcf08ddsm974494wrj.103.2023.01.26.03.22.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:53 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 138351FFB7; Thu, 26 Jan 2023 11:22:52 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , John Snow , Cleber Rosa Subject: [PULL 05/35] build-sys: fix crlf-ending C code Date: Thu, 26 Jan 2023 11:22:20 +0000 Message-Id: <20230126112250.2584701-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.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: Marc-André Lureau On msys2, the shader-to-C script produces bad C: ./ui/shader/texture-blit-vert.h:2:5: error: missing terminating " character [-Werror] Fix it by changing the line ending from crlf to lf, and convert the script to Python (qemu build seems perl-free after that). Signed-off-by: Marc-André Lureau Acked-by: Thomas Huth Message-Id: <20230110132700.833690-2-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-6-alex.bennee@linaro.org> diff --git a/meson.build b/meson.build index 6d3b665629..56320ae717 100644 --- a/meson.build +++ b/meson.build @@ -2779,7 +2779,7 @@ config_host_data.set('CONFIG_SLIRP', slirp.found()) genh += configure_file(output: 'config-host.h', configuration: config_host_data) hxtool = find_program('scripts/hxtool') -shaderinclude = find_program('scripts/shaderinclude.pl') +shaderinclude = find_program('scripts/shaderinclude.py') qapi_gen = find_program('scripts/qapi-gen.py') qapi_gen_depends = [ meson.current_source_dir() / 'scripts/qapi/__init__.py', meson.current_source_dir() / 'scripts/qapi/commands.py', diff --git a/scripts/shaderinclude.pl b/scripts/shaderinclude.pl deleted file mode 100644 index cd3bb40b12..0000000000 --- a/scripts/shaderinclude.pl +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env perl -use strict; -use warnings; - -my $file = shift; -open FILE, "<", $file or die "open $file: $!"; -my $name = $file; -$name =~ s|.*/||; -$name =~ s/[-.]/_/g; -print "static GLchar ${name}_src[] =\n"; -while () { - chomp; - printf " \"%s\\n\"\n", $_; -} -print " \"\\n\";\n"; -close FILE; diff --git a/scripts/shaderinclude.py b/scripts/shaderinclude.py new file mode 100644 index 0000000000..ab2aade2cd --- /dev/null +++ b/scripts/shaderinclude.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2023 Red Hat, Inc. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import sys +import os + + +def main(args): + file_path = args[1] + basename = os.path.basename(file_path) + varname = basename.replace('-', '_').replace('.', '_') + + with os.fdopen(sys.stdout.fileno(), "wt", closefd=False, newline='\n') as stdout: + with open(file_path, "r", encoding='utf-8') as file: + print(f'static GLchar {varname}_src[] =', file=stdout) + for line in file: + line = line.rstrip() + print(f' "{line}\\n"', file=stdout) + print(' "\\n";', file=stdout) + + +if __name__ == '__main__': + sys.exit(main(sys.argv)) From patchwork Thu Jan 26 11:22:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647088 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp185453pvb; Thu, 26 Jan 2023 03:23:17 -0800 (PST) X-Google-Smtp-Source: AK7set/MgO1Lbmz1aMhcJuV0LqeJS0leGbArFqSFQg0x0WGv76zcxn7dW9GJ3GhegOuXsuNEnSEl X-Received: by 2002:ad4:5a05:0:b0:537:e563:c33 with SMTP id ei5-20020ad45a05000000b00537e5630c33mr645474qvb.14.1674732197319; Thu, 26 Jan 2023 03:23:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732197; cv=none; d=google.com; s=arc-20160816; b=q7QmvoW3gHyU5gJfp3J+BAotniv00gA0E86CyXtDq7Vk+UO9MKVPMgxFj2p0X8k52S eE1+IWTr6CDKaBhEGygNlEdyZNbwNSt5E8zoPh2mzqaOgjbIgK3kD7LQogyKPj1ZKjn9 qgpbVMTuqwDTYrSTbPB+KXAmwFZ/WfFKttZyK+wh9WA7fj1qNs3ApCyQ59NYqL1XKhXI /nRyX4MmwMLZp+xHpn3YdjmwGW7ktxNootuZ7qtucF68ZvxmkrCV1jRDtE/u8TfMgngX K/WGq8EGi9QidAVUqzOYHkG7eirXdMKOoXWb1Fppt+myQhb3Sqz1GLv7QjtUtRH2V9SW n81w== 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=qzqwfdK21RM5z6fK6OdNzPsFVArHMF3Y75c3I4gjb7Q=; b=cCmphpQmpnvaWXzTDR5BPrz4R43o4gdVMOXy/8PE0dVhxLef8E0WclbpNZtk4k3rOR dQx4d0HRVzMAeIjPT2/DfAS0+Qaw1pvKr9Qj7fWZi4cWMTvOG+Z8iW1R1OlywiJ2Y8aY cbQEuAg00yZJhfGypCJxe/CYBTiFn72vBJtTywD2erPKJ67ogoekIQPpupJmr1YFRBcq c5sWouvsLcWu7FEz2RZs8XJjpWXAscDTK3va/fwwZMTW5YAem7PdufP4QRkc9+phWloi 1ft/z+vw4dfAjGE0LhVQRUVTbuyEQJhuIFMZueouLUFavPG/4xtHu2ImupxYucazPijR hwDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=f9HICVH6; 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 i12-20020ad4538c000000b005374ac6de0esi589677qvv.231.2023.01.26.03.23.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:23:17 -0800 (PST) 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=f9HICVH6; 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 1pL0LU-0002t0-KK; Thu, 26 Jan 2023 06:23:08 -0500 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 1pL0LL-0001tt-Df for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:22:59 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LI-0003jP-Vk for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:22:58 -0500 Received: by mail-wm1-x32e.google.com with SMTP id q8so893874wmo.5 for ; Thu, 26 Jan 2023 03:22:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=qzqwfdK21RM5z6fK6OdNzPsFVArHMF3Y75c3I4gjb7Q=; b=f9HICVH6R4imhHw4uEMQuLF8xLhU5452Ky/vfAECiau/TLCF349I7bmBOjDyyB8shy jtCAVH7NxmVPmMBMgUmENckVsFMAdLIZR7EvBaYTWHJhIRqV9a08pLjWeNsNr6aufyv5 GwPTOG9ejN0iTrB+LV9W571yY2rAWqVU8MJ1m+PmqZudf5xiaUSE4PvZPsxL0g1c5u4y I8igsFj+mJES+knBoD3X1HoRRm8EpxptTjrNX/t6V3haETSxvUJnSCzF+yAJOZwDoZmX Az36MbvXR3ptDh3fdp+xy8u69eeAEeg3HC8TI0Zh06CDNqDqZpdN3iLZLMhIbabnwnRC w9Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=qzqwfdK21RM5z6fK6OdNzPsFVArHMF3Y75c3I4gjb7Q=; b=MhaqMzGPyONLTiuomqTseN60Fa+63PigafuEXuMZdNMs/7zRuVanZx9x12ZGia7vaj W1cexR33rUJjNc5Q52cxjN4yzo8o4DlHrjoT9HdgRQWcb7XGPCI/D8sFsNn8PniJNE4Y Zfa9v4jckoKt0cKnTh3KEXvdCA9YeB63PEcwvVnQoglyJxloILMRd11EdXfCsUqrP8yh a1S1Wlr/zpMutMNr4NLB0FhR+9HfUD4hBm07SI8A7m3FGJWdGnvzQCEi5hRjrOpWCYXa +hK8uTEH57LbF9loaliBna0KJSbjIpWy1TIPyvqBUMgYUnS4pABEEYZ9tGBKi4cJwOcn ck3g== X-Gm-Message-State: AFqh2ko04c7H/JqYslslBxlwTYyxex8Cisw+7xniZR9yABdCqDEWz8Z1 XDFmisiYBJYxYo/MHolNkzaOBw== X-Received: by 2002:a05:600c:4928:b0:3d2:2043:9cb7 with SMTP id f40-20020a05600c492800b003d220439cb7mr35276437wmp.5.1674732175297; Thu, 26 Jan 2023 03:22:55 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id x10-20020a05600c420a00b003c6b70a4d69sm1133311wmh.42.2023.01.26.03.22.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:53 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4D2511FFBD; Thu, 26 Jan 2023 11:22:52 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 06/35] .gitlab-ci.d/windows: do not disable opengl Date: Thu, 26 Jan 2023 11:22:21 +0000 Message-Id: <20230126112250.2584701-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: Marc-André Lureau The previous patch should have fixed shader compilation. Signed-off-by: Marc-André Lureau Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230110132700.833690-3-marcandre.lureau@redhat.com> [AJB: tweak commit message] Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-7-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index a1d5790580..cf445b77f6 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -71,7 +71,7 @@ msys2-64bit: # for the msys2 64-bit job, due to the build could not complete within # the project timeout. - ..\msys64\usr\bin\bash -lc '../configure --target-list=x86_64-softmmu - --without-default-devices --disable-opengl' + --without-default-devices' - ..\msys64\usr\bin\bash -lc 'make' # qTests don't run successfully with "--without-default-devices", # so let's exclude the qtests from CI for now. @@ -113,8 +113,7 @@ msys2-32bit: - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink - mkdir output - cd output - - ..\msys64\usr\bin\bash -lc '../configure --target-list=ppc64-softmmu - --disable-opengl' + - ..\msys64\usr\bin\bash -lc '../configure --target-list=ppc64-softmmu' - ..\msys64\usr\bin\bash -lc 'make' - ..\msys64\usr\bin\bash -lc 'make check MTESTARGS=\"--no-suite qtest\" || { cat meson-logs/testlog.txt; exit 1; }' From patchwork Thu Jan 26 11:22:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647113 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188768pvb; Thu, 26 Jan 2023 03:32:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXsdhTMB4Rlwd4YNw1Fo0lL36C6n06xnGo5QiztQI1B60y9FfGR2ZkyGYIdPfqvPKPQNaf+B X-Received: by 2002:a05:6214:4382:b0:535:65cd:77f with SMTP id oh2-20020a056214438200b0053565cd077fmr32278224qvb.32.1674732728101; Thu, 26 Jan 2023 03:32:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732728; cv=none; d=google.com; s=arc-20160816; b=vbGSaW786L/F87w/4t33zuyTukb6xmI8BWSEQi4lRrlCBdHWc3cTkjUZA6kfRGGD+z k1gAPdn+cnWgLAkfPr+L1c6UW4W8QrX6RrKocBQ9AgAio0c2+FOgaCtMvxnudsIzUR1P NDgE0m/YzW0Si9BwgdMraj7B3vHiFnztOEEIhP/0uRJvn+XiCJPuTujc0ti66U19s2vb BNAE87EC5TygkQrDfFFTsxIaEAygBRLHVquMrvxkOmQOKUhYzg5LTPYlX4g51p65Zopb 1/JE5v/AxdjjexyvD1QgcttXiDkGtUmxBXDToC7Rf2u3YVvNNP/1Lfr40yT8ZTbAL8gR ibkg== 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=zhJ2RCjWEhtNjzcA/iBMZ7sQCLCU1u/N4bQ1NIk6DxA=; b=tF14K5/VesGgIm4GbndljDCC6K23/I3+JUdBKsOm99K3sybnHIUcK4TSGbZtc8/dIU Dkw5KbZF0dyvpOqRO3238DgcCHNEz4tHwCujZ3ytCzkq7YSoJcpObRmnDEDF/32KoovU 1l0NxkGvWIJhto/Z3itLMU/UN8mUANRh8+c3c1pOVPZJqXMrc+a7g8YsUjjQHe6EFu+4 YGvNVqEceFQ+3tKUpF8QuUmYiLduAHVvYOcTE0f2aZkO/kTHq4LxC7p5JWJENPsTZ3Sj /8J7PrhlyBgwK+f0QWsSlHzbl6xqdT6XSylrgiBSnpG4gDhhliGwOoAx1RhP83LTQzZt uKIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="uEGNgkv/"; 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 n6-20020a0cdc86000000b00535223d0e07si654992qvk.49.2023.01.26.03.32.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:32:08 -0800 (PST) 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="uEGNgkv/"; 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 1pL0LP-0002US-RV; Thu, 26 Jan 2023 06:23:03 -0500 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 1pL0LN-0002BH-7j for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:01 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LL-0003ok-2I for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:00 -0500 Received: by mail-wm1-x32f.google.com with SMTP id l8so900828wms.3 for ; Thu, 26 Jan 2023 03:22:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=zhJ2RCjWEhtNjzcA/iBMZ7sQCLCU1u/N4bQ1NIk6DxA=; b=uEGNgkv/Xqobs6kufgia/0IH0K/46chO9SJ3m0INMnv/o0gBimhDYUbMSI1VHYWf/y J7ova60lspvCG++JFNzOymdbCOOSswQnDHQzwGCCRHHp74yK/shcJPGm9jtFAwvzvB2b jIRX5U5P/OWt3llxISXNK0W47wQ+v5N8mi7duBEsDahoB7pxp4t5mfmZeux4HZ8eUw9N J9xqmL/60pIQfZYlYlY8KZFBDB+HD71RNYDVu210hgtN7lUGGnl5IJpAbE5osjo0RlwV aLpMFS5BtbA1xnFKWFkjWtn04RKuj3SZWhF5INkc1pneq4zeZXC6S1E0dk+ApMdQv+1c aR2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=zhJ2RCjWEhtNjzcA/iBMZ7sQCLCU1u/N4bQ1NIk6DxA=; b=zU5TGfzM72Hit1M5qwDMf5nbemqVRmSabs02ttinkFI7V993FySYdyTIASKT6xHGyr kOAM8jvWcGO2ib71EW/bSOjjHxXey2TP0yfD1SKNPaFRgufy9AtflOL7avdMmS5wdaC4 piXK/uwnnxwBjIPluh4/3QsqWJW+bZE7Z0Dfx3kgOF37xcdog93qMrdfLi7QE7HvymTJ 8D7y6hSAND48sQU0IiH3ZV9+Dk0XGf3TLLt5uyu3mj/nZD/pi+3zp561aZ29b+4sHfO0 HHmn/s2AbZi7hLYuBCQxcsjOXKxV4mfk838WB8/OcP0WKjP4MF3sPiwuUzLol5FYO7Ai HNZg== X-Gm-Message-State: AFqh2kor1xL6Kn3oN6kOi3CVlCpr63n26PwunRJ4aOVVMyIRWf/+3VW1 45pFLSPcRK/zVtgG1/2FwVAelg== X-Received: by 2002:a05:600c:358b:b0:3db:2e6e:7826 with SMTP id p11-20020a05600c358b00b003db2e6e7826mr23963578wmq.5.1674732177540; Thu, 26 Jan 2023 03:22:57 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id d1-20020adfe2c1000000b002bfba730b0fsm1031981wrj.65.2023.01.26.03.22.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:55 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 70FAE1FFBA; Thu, 26 Jan 2023 11:22:52 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Ale?= =?utf-8?q?x_Benn=C3=A9e?= , Markus Armbruster , Michael Roth Subject: [PULL 07/35] meson: replace Perl usage with Python Date: Thu, 26 Jan 2023 11:22:22 +0000 Message-Id: <20230126112250.2584701-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Marc-André Lureau Let's try to remove Perl usage during build time. Signed-off-by: Marc-André Lureau Reviewed-by: Daniel P. Berrangé Message-Id: <20230110132700.833690-5-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-8-alex.bennee@linaro.org> diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index 9dfe98bc9a..d85b14f28c 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -259,22 +259,23 @@ if build_docs # Fix possible inconsistency in line endings in generated output and # in the golden reference (which could otherwise cause test failures # on Windows hosts). Unfortunately diff --strip-trailing-cr - # is GNU-diff only. The odd-looking perl is because we must avoid + # is GNU-diff only. The odd-looking python is because we must avoid # using an explicit '\' character in the command arguments to # a custom_target(), as Meson will unhelpfully replace it with a '/' # (https://github.com/mesonbuild/meson/issues/1564) + remove_cr = [python, '-c', 'import sys;[sys.stdout.write(line.replace(chr(13), "")) for line in sys.stdin]'] qapi_doc_out_nocr = custom_target('QAPI rST doc newline-sanitized', output: ['doc-good.txt.nocr'], input: qapi_doc_out[0], build_by_default: true, - command: ['perl', '-pe', '$x = chr 13; s/$x$//', '@INPUT@'], + command: [remove_cr, '@INPUT@'], capture: true) qapi_doc_ref_nocr = custom_target('QAPI rST doc reference newline-sanitized', output: ['doc-good.ref.nocr'], input: files('doc-good.txt'), build_by_default: true, - command: ['perl', '-pe', '$x = chr 13; s/$x$//', '@INPUT@'], + command: [remove_cr, '@INPUT@'], capture: true) test('QAPI rST doc', diff, args: ['-u', qapi_doc_ref_nocr[0], qapi_doc_out_nocr[0]], From patchwork Thu Jan 26 11:22:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647109 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188382pvb; Thu, 26 Jan 2023 03:31:10 -0800 (PST) X-Google-Smtp-Source: AK7set9r4CaHkMiphfazZBShao6l46L0RfiKqWwhqBpOlZ/gGEOFsr7ZLpz3C/C0+QkFI11KrXgj X-Received: by 2002:ac8:594a:0:b0:3b6:98c7:48fd with SMTP id 10-20020ac8594a000000b003b698c748fdmr11803352qtz.15.1674732670053; Thu, 26 Jan 2023 03:31:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732670; cv=none; d=google.com; s=arc-20160816; b=AgXAkgf0T7cdQtXLi0P5F/7LXrfr/152Om0BWwafVbngC2poAx9vLtjh9OGcQLJGec Axp0JsFaYB4Phi27FSK9Ajt6LDMeB/8FZxjj3hY58Oe2KOODIa10pn9GNzSBB+Jt1/P2 tjoCNG71MwWlkOFaQ8slhaSOTRBH8gfk1/LkRD9NsMtP6lC4UIEdqWUPYnHLrmJpO0Uf 2Qug30V9pvUQltlXWWB4Pcro9Ut3/N82pe6VZNTN7+zytZCms9mqJCWF8VnDnRDCmbNp QwV3/cvJCpvLCgZEq5dkWFx3koAhkMoNpjEEAYYV5g2eRoSLRfyQcKso8ipoqAyF2/29 BVMg== 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=BQnMQzqF2kKBRCOQGOWvpk+nNmjkwpud5iW4vZ0K0N4=; b=vN3oZRso3hmfqumewwb1w2svVXOOiUj25SGo4F6EYgrop2noY5JT/1nevqaFHCt5KN 80R1eOjCpIMmm77GaHCwdnr3EEzqLSttSX0Mk/A0C9A0nR6jnPh5E/gjEDRLHqVeHCRO KxIUVwZhzuIOKnFTMUXx6qs5RtDxGYKrVPsNN8XgaRn2c6E1qRaSra/QTDs7dYPQetQp Jum65fLkdnw6WxSr4rq7h5HYNt5wJ+GmCNVQfYFMJJgYM46LI0LLpysVIYWAWR3CSps/ R1/GcsJ9QsoZ0LR36kFOFf3iCAL4qzZsikISFEOxsdZNCnLNsx+3T/obEQicUAytwG+Z R8WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NpiQlfJx; 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 s1-20020ac85cc1000000b003a6905f8495si598227qta.32.2023.01.26.03.31.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:31:10 -0800 (PST) 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=NpiQlfJx; 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 1pL0LQ-0002Wf-4I; Thu, 26 Jan 2023 06:23:04 -0500 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 1pL0LL-0001tr-BL for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:22:59 -0500 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 1pL0LJ-0003YR-7R for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:22:59 -0500 Received: by mail-wm1-x332.google.com with SMTP id f12-20020a7bc8cc000000b003daf6b2f9b9so3035211wml.3 for ; Thu, 26 Jan 2023 03:22:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=BQnMQzqF2kKBRCOQGOWvpk+nNmjkwpud5iW4vZ0K0N4=; b=NpiQlfJxZODD3rSRPel5BmIOnFNRxFn7DQDUfnHPkIPuJQEsCGbs+j0NY+CKzXyHbW 5QAT/QFh1sjwoyl29dhqUyZQIaCJ0GZgSoDQ9EgZwJ+BSVFz96p2TnXbxFfyFpdy5vNL XcUze4Ym+MxxZ+0l3BZBgKvNI89cR6fDdDs78vOINFJdgJjke4zxXKhJkw0fnEDEwVrd A3VYQRUToQYWwbbEKzWqJl3br5JdU4zhhmAaPIru0VmJFMAHckXyFlKa/bGJ251WBSgI 3/0BASV5ZXZjCpvGcNv2qPOovlMVhbD04sFOr1DlulYQESRndiPpjFF2GD1ih10iikGX hZ4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=BQnMQzqF2kKBRCOQGOWvpk+nNmjkwpud5iW4vZ0K0N4=; b=wpTnD4GPlGosGVz3P2bij4kwSWUPs7WwO6Thl5A+HZWw9X002rhBgoI+JWCwuMMSIF Lz+pG8cgRdj5Gp0RHFyUm+wJ0GCnJe8ZC2qLibzQOerarJcnhbZUY2jGWDwH8uZQ2LqE mWm1Cc1QCpplnmY+fmABEv+AV7tzXwoUMlpArK2BcbpfHrlAnbZ/I2h+TdyDE20MIa79 opB+HOAzYATiGMLK5OY/RmPbc8h7JiQSxQ5WKgv3wSaebP4igtg6pMY3aQTG2tjbwAtG exvu56F+bkERZf/TwTXuLf/xhvy/u/D8xc1ASph9daKsB4XQjasJQc4hWPUEeAiZpeI/ 8edw== X-Gm-Message-State: AFqh2krMWZlHbUR1lDwcv9QI/DeuJzaQ0i+YzOoB6PHZPzz8KfcUNwc0 i+jFU0SzjEV2YoZ0tIeiJ7sZ/Q== X-Received: by 2002:a05:600c:1d22:b0:3da:f66c:795d with SMTP id l34-20020a05600c1d2200b003daf66c795dmr35832248wms.9.1674732176434; Thu, 26 Jan 2023 03:22:56 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j5-20020adff005000000b002bddd75a83fsm1073930wro.8.2023.01.26.03.22.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:55 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A4E2C1FFBE; Thu, 26 Jan 2023 11:22:52 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Ale?= =?utf-8?q?x_Benn=C3=A9e?= Subject: [PULL 08/35] docs: drop texinfo options Date: Thu, 26 Jan 2023 11:22:23 +0000 Message-Id: <20230126112250.2584701-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-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: Marc-André Lureau It looks like this is no longer wanted, we only build the html output. Signed-off-by: Marc-André Lureau Reviewed-by: Daniel P. Berrangé Message-Id: <20230110132700.833690-6-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-9-alex.bennee@linaro.org> diff --git a/docs/conf.py b/docs/conf.py index e33cf3d381..73a287a4f2 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -297,19 +297,6 @@ ] man_make_section_directory = False -# -- Options for Texinfo output ------------------------------------------- - -# Grouping the document tree into Texinfo files. List of tuples -# (source start file, target name, title, author, -# dir menu entry, description, category) -texinfo_documents = [ - (master_doc, 'QEMU', u'QEMU Documentation', - author, 'QEMU', 'One line description of project.', - 'Miscellaneous'), -] - - - # We use paths starting from qemu_docdir here so that you can run # sphinx-build from anywhere and the kerneldoc extension can still # find everything. From patchwork Thu Jan 26 11:22:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647112 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188744pvb; Thu, 26 Jan 2023 03:32:04 -0800 (PST) X-Google-Smtp-Source: AK7set/kB326qAHLOfKdDnDFomQH5Rzj/eikc8MRRF+Sodj43sbxe3uw1goKeiUvcuQ8Bu+oxvlN X-Received: by 2002:ad4:46d1:0:b0:537:7915:64d1 with SMTP id pm17-20020ad446d1000000b00537791564d1mr2027090qvb.28.1674732723902; Thu, 26 Jan 2023 03:32:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732723; cv=none; d=google.com; s=arc-20160816; b=cMU7qzMJE+svR6wRDzP0lWp8kbdifN+kgRQTk6HfCgbp572RAp83D422phBkk+6Aeb qEgsywaDEqJH+/FmSlE1hqbl0BUkkcZZF1bEvntXNpd2BJ4XLBV1bNTHtG9Upq6W+kap e8H1Zk6y0a3SVbJLWtUGrBZyG+iJSg3hLNE4Ud8VCJgJ7huvMsdaGG2MfsxQz/ZyLd// GCuaN7KO5dMGKl28XkIowVcIG0ZW7VzIqGmDelO1ZJcFRq0dR+JAL1hBkTDIu3sCKg+k R0HSnt6GOYRzrHO4ss8cz+kb1f4MLOVvu/pcTDAYNtVr1bbfZ9GR0nD3T1eD5V0plNXZ 2tcw== 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=8oTohHyqKg48V4I8Jf7kpYgw+F5MogOoj2Z0HZPPA70=; b=icWPGj654NCmpA7bdKPLEDYh4qpbQ37B7LEtVp7iqMl7r7cr8o9Endc0mWF+WtLdVG dubGHfMIcN/9s2nLHCMSFBrS1cnyMQ8igsihZY4NBwNqsChm9KCLkafUFfUozG0SFnWn XJ/bJUNufZMLUjJqbp0oHG2dGcCiw4/M5e83doXvCF+P6Ug0myQZbt0UkziGy7h7pqXo E+u/daZ3FY3z+kAhc/J/3qC4KMqzTW6dXmqoUPr2rZE+zcLshQKi3M/EYC6qa0Spod7O EDX29+jpWb4WWhU5j/BIzQrEPePgqgFDUu2rBhAyZHW/rnYnxJekZjH95jW30uWZsy8m 4RKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="a7pPh76/"; 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 c5-20020a0cf2c5000000b00534fe0f21dasi645755qvm.103.2023.01.26.03.32.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:32:03 -0800 (PST) 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="a7pPh76/"; 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 1pL0La-0003Vk-VI; Thu, 26 Jan 2023 06:23:15 -0500 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 1pL0LM-00026v-Q7 for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:00 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LK-0003nc-NU for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:00 -0500 Received: by mail-wr1-x434.google.com with SMTP id y1so1439759wru.2 for ; Thu, 26 Jan 2023 03:22:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=8oTohHyqKg48V4I8Jf7kpYgw+F5MogOoj2Z0HZPPA70=; b=a7pPh76/4tb6dAkwtCtdvIWGzLwFbUpJ1Sv1kvBKxQE9ubZ3uD+IcFS060Fdmb2COE hLnhxaCL2prK5kqpMKrNBt3XFCmxItU4Cgu9kTgBRY3SYqgjPKfF4PuZvm+neFuls6qM XKqq86H2azHIwZfh+vHfImu0BzxHRRX6cF6WiOYT5goOUBI0Sftr+6bXO/PY8uSVabY/ GxDQZlKtSn/ro2bs7u2+ltbA05/elwROkJihR5CUmLoAw7qs8hFW5cLNNINq++gKRERZ vT5Hr6tvUCyNeZWBp3KZiShiPVNy5elpTf20ThfMrAnUG3+ZukYy79gcsksSF8KulMQx iesw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=8oTohHyqKg48V4I8Jf7kpYgw+F5MogOoj2Z0HZPPA70=; b=mbak9qs8lRsZzXVjli2fyEZm5l32i1quVRdFwrP8U5DllUzNfEprF72dzqcz1DKadA gyndD+9uAH+usnRa5kgJfy4DLt+SDurqCroty4TMbDQ+iQsdm01SSGvvmr2RhlRLvGJP 29iMVJ57DW7+/8pHg4nMkdB/3LE+1MAFZ/ymWRN2jcR2LVVr65pxzowhsx4y1oz0s9ZW ORRn4eHDmiuNwHe/H2Xte9D4CavK8AJXEKowqb3bdVrXZENnuOnxZuEQ0G4GQfA9uuyq s4q6x3AVjspPqAaJLVyhI/0N8GfxfOkbvLUB1Msm/z4Qnhq/aahJvJ0maWpmVvsNh3wz 8raw== X-Gm-Message-State: AO0yUKXG4a1TdpBPKX+DBGzSBLvreUq+8sUQiOv6JhXs1ONCdQoYlrDz j/Ezh47vYffs3855TpsWLWfQIg== X-Received: by 2002:adf:fc8e:0:b0:2bf:ab81:c7fb with SMTP id g14-20020adffc8e000000b002bfab81c7fbmr9134025wrr.24.1674732177182; Thu, 26 Jan 2023 03:22:57 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n6-20020adff086000000b002bdbead763csm1044564wro.95.2023.01.26.03.22.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:55 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EC4091FFBF; Thu, 26 Jan 2023 11:22:52 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Alexander Bulekov , Paolo Bonzini , Bandan Das , Stefan Hajnoczi , Darren Kenny , Qiuhao Li Subject: [PULL 09/35] gitlab: add lsan suppression file to workaround tcmalloc issues Date: Thu, 26 Jan 2023 11:22:24 +0000 Message-Id: <20230126112250.2584701-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 up-coming upgrade to Fedora 37 will bring in libtcmalloc as a dependency of libglusterfs which confuses our fuzz run. Rather than disable the build lets use LSAN's suppression mechanism to prevent the job from failing. Signed-off-by: Alex Bennée Cc: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20230124180127.1881110-10-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index f09a898c3e..9a6ba1fe3b 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -511,6 +511,7 @@ build-oss-fuzz: IMAGE: fedora script: - mkdir build-oss-fuzz + - export LSAN_OPTIONS=suppressions=scripts/oss-fuzz/lsan_suppressions.txt - CC="clang" CXX="clang++" CFLAGS="-fsanitize=address" ./scripts/oss-fuzz/build.sh - export ASAN_OPTIONS="fast_unwind_on_malloc=0" diff --git a/scripts/oss-fuzz/lsan_suppressions.txt b/scripts/oss-fuzz/lsan_suppressions.txt new file mode 100644 index 0000000000..02ec0a6ed5 --- /dev/null +++ b/scripts/oss-fuzz/lsan_suppressions.txt @@ -0,0 +1,2 @@ +# The tcmalloc on Fedora37 confuses things +leak:/lib64/libtcmalloc_minimal.so.4 From patchwork Thu Jan 26 11:22:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647099 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp187451pvb; Thu, 26 Jan 2023 03:28:57 -0800 (PST) X-Google-Smtp-Source: AMrXdXvxvsFE078EHUm2tEulerjQm2ytzt4pP2WNR5/KNwy8TtWSUqfS6uWDrlHp9cfIf6NML/om X-Received: by 2002:ac8:6b43:0:b0:3a9:80b3:435f with SMTP id x3-20020ac86b43000000b003a980b3435fmr51008076qts.12.1674732537326; Thu, 26 Jan 2023 03:28:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732537; cv=none; d=google.com; s=arc-20160816; b=VfQk7Wuve1Mu2hXECZAnsLN3Gk17DxgwsZm5jRTZZe5GjLnNMDkufjGmsCjlTCfU2a BL2FaK3Dy/A4xsoXwEd7jMmajrb5GXQoCEXyYlf8x42uyDXESR2sB1WmgAZ5z2ntNQKN OXP4kjZKpnRi+RJkhK8WE2fyV3VJjBOYM2aLniOUOPkH3mMYB1RH+eUFzAYnorKVeGXi St3+Kv3U2HqBr8ECZ0bARCW+bodUHXYP1lQJ01Eb1wph7vzgHl+IUIJuR3qvChmcndAk ym/3z1E9YXlQELLmu6DOcJD82/5i/76sb2vmH83fYQcXL52Uj8Qyhy7wkYmx2G+Lt/rr v0mw== 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=9R7kaxsuQjhgu9DnmHlOudKs8wCovlJACINe0BZ3k3s=; b=XPE7XZjNCL2xmALYnj/+F+UkpStQ1WNQ82vXLyCyxjM+NRPCDvD2SITPNSXIJkj1ND uWI8FQ7NVTmaniNphtcdhkn3D7N1koXWW4OoQ7dnPKqVe7Hpc3NB0WtimqL/SgVMqh0R SQ536eF3rU7sDQctt4aTszDmeTLvaTs1AZEpVfbV80JRh1UTTKn2idx8rAf7CXUuRHGE OYgx8TnH0SC9aYFjXuMHK4qvMX885qeqaWSk28eDMKOROVe50atiL84qdjTgR5KRV4el uoG+9JKCF/p3ENf4Uwh/uB/33K1iw6Kf16kcm2FdjXOFAqEjeld/6ygzGmgjvrAnPYHW i/9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ix4fZ8xu; 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 n11-20020ac81e0b000000b003b3ba458741si549475qtl.22.2023.01.26.03.28.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:28:57 -0800 (PST) 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=ix4fZ8xu; 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 1pL0LR-0002fE-UP; Thu, 26 Jan 2023 06:23:06 -0500 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 1pL0LM-00022x-BV for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:00 -0500 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 1pL0LJ-0003kb-V4 for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:22:59 -0500 Received: by mail-wm1-x330.google.com with SMTP id q8so893909wmo.5 for ; Thu, 26 Jan 2023 03:22:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=9R7kaxsuQjhgu9DnmHlOudKs8wCovlJACINe0BZ3k3s=; b=ix4fZ8xuMvRoBBLMNeqnP2I2akhiCXTU+NxQfZOTVyG6l6NrSAXxvRBzbNe32G+dm2 wqfBtamaKLblNBqeP/pJuuq2/Mk5gDlNkjkpzDFkl0d5+LpkAUhxl9uxJ9QlCFYm3Z45 8OlB1V2uXH5BHB3NDvwupot5isX5KnQh0xmvcDMZd2R8wrvN2L4sN9Q6e2uBSy5JmVuY DqGD5bOCQiI2VsNUXLMDTbENV0Hh9sDvlOUwEmvxRgltwTuism/SUuwJiWKYS8XxtlY2 HRjhKSoGnGGDjmfqn1B/bzo+rdsuuk9PtBy5Njbt9DCfs8C9aWEn4zbhmagFeQHjtsly DFFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=9R7kaxsuQjhgu9DnmHlOudKs8wCovlJACINe0BZ3k3s=; b=whuDQOgIQ1vQ4UqqrlIh8IebC7cg1GEvQVUQ9jb5t7S/f5HNdi7eKM95Y6bWiiaP6P szeKj9KEv6KTNGZoixjO67EV5TDAUHhLkTqKP834IF4RBipcqkYoY4oVROXkljuiKBJD NbbXPswliPvAbLQXJt52jQ91PcK0hPlruuSevD56uJUSuz2VmoI3PYHGsS/r8NU3v4KJ Qiz4T3m1HQHgbFW7N6KD5dkRVCePWqe2LO7QubPAf57kEkb19cUvmqOCsXyBMNzj30+D 5qXuBbs3SREbPtBL/D7t5NbM/pJ4rhAHRyxUKtmLXSCGLvjEG5lRKmvCT1cvBQMHCEel YSjA== X-Gm-Message-State: AFqh2kpcLrEpp8yPcag4zBElVF3TV4UIsg6rH8LyIVW8M7PWVZaCfrgC B3sR2XZAlnWdf7HOcSCspFFXnA== X-Received: by 2002:a05:600c:3296:b0:3cf:82b9:2fe6 with SMTP id t22-20020a05600c329600b003cf82b92fe6mr36769548wmp.8.1674732176145; Thu, 26 Jan 2023 03:22:56 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id k28-20020a05600c1c9c00b003a84375d0d1sm4813210wms.44.2023.01.26.03.22.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:55 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4D65D1FFB8; Thu, 26 Jan 2023 11:22:53 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 10/35] Update lcitool and fedora to 37 Date: Thu, 26 Jan 2023 11:22:25 +0000 Message-Id: <20230126112250.2584701-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Marc-André Lureau Fedora 35 is EOL. Update to upstream lcitool, that dropped f35 and added f37. Signed-off-by: Marc-André Lureau Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230110132700.833690-7-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-11-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index 75383ba185..cc5d1ac4be 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross mingw32 fedora-35 qemu +# $ lcitool dockerfile --layers all --cross mingw32 fedora-37 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 98c03dc13b..cabbf4edfc 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross mingw64 fedora-35 qemu +# $ lcitool dockerfile --layers all --cross mingw64 fedora-37 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index d200c7fc10..f44b005000 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all fedora-35 qemu +# $ lcitool dockerfile --layers all fedora-37 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index e3eb28cf2e..319a534c22 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit e3eb28cf2e17fbcf7fe7e19505ee432b8ec5bbb5 +Subproject commit 319a534c220f53fc8670254cac25d6f662c82112 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index fa966e4009..a5ea0efc3b 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -111,7 +111,7 @@ try: generate_dockerfile("centos8", "centos-stream-8") generate_dockerfile("debian-amd64", "debian-11", trailer="".join(debian11_extras)) - generate_dockerfile("fedora", "fedora-35") + generate_dockerfile("fedora", "fedora-37") generate_dockerfile("opensuse-leap", "opensuse-leap-153") generate_dockerfile("ubuntu2004", "ubuntu-2004", trailer="".join(ubuntu2004_tsanhack)) @@ -161,12 +161,12 @@ try: trailer=cross_build("s390x-linux-gnu-", "s390x-softmmu,s390x-linux-user")) - generate_dockerfile("fedora-win32-cross", "fedora-35", + generate_dockerfile("fedora-win32-cross", "fedora-37", cross="mingw32", trailer=cross_build("i686-w64-mingw32-", "i386-softmmu")) - generate_dockerfile("fedora-win64-cross", "fedora-35", + generate_dockerfile("fedora-win64-cross", "fedora-37", cross="mingw64", trailer=cross_build("x86_64-w64-mingw32-", "x86_64-softmmu")) From patchwork Thu Jan 26 11:22:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647092 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp185730pvb; Thu, 26 Jan 2023 03:24:00 -0800 (PST) X-Google-Smtp-Source: AMrXdXu6qVIf1U6qJrrQMnOXR+B2oX+aPr2psc9O/auo4ZcvbmdsRTVIk5PryalIjSuC8WZk38q4 X-Received: by 2002:ac8:747:0:b0:3b6:3a28:3377 with SMTP id k7-20020ac80747000000b003b63a283377mr44424533qth.58.1674732240343; Thu, 26 Jan 2023 03:24:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732240; cv=none; d=google.com; s=arc-20160816; b=hYYYgjvq+VW/alN3Fw1axTxXSyJvSBDdAEem40vkLIAJkfxHtu0QipfXiP07YbpKU8 me2pn130hgbmEXOwQUAKSvnZxLH6Nz2ICTlRk/RG9ZvaQ20QekRqxZvWVU7Ef+6WHPSU pFIvL196Psm7hGLbrJUHBZF5U/kKYBDMTnzpk5+yIqPOJBjKPCHtNVzB8ikh5fpDZu0i eslHYvIU2xh1R95TY9tJYJW7/e0ujSE/hLGq++kPL3hxn7b6J1ANTOLfs9/OlHUW+xcy mCP4Vx64oa2daYRBHEtUdym4ThYujsYqX/+3VsHAVbYm2RxesSS0RS3J1wkuetjmvfUV hirg== 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=XfmOr8AB7l/sRGL+oSfjFEkee1ur2VxLIR7gCG3Imak=; b=J6oLf9DQ7Dj6T3Ln11Rkfn1T7VVM+GLdcgxuSbcAauKjjduE9ZvOIXf/j6jY3mNCFa r17bQBTVb4VkHkH27tG9U/7NgdxxPkCLlpBJg3gRugvtuKMax5OlO/DirsVCEqQG3hah zD95UACgpWbTt5CCKAD7z0vVEuLaDORwqgywHCdS/T9v+Y16txXBQK2NGizyGMkPq4tO lOpe6CZ61N+UAWpwpR8eMhPYYBcE3iIvSFyxtyMavxKiLwg1nS3ftNYl0cbaWkoLKe9r Mprx/auxg7JvdylM+bKTE+s0xoVw4Ey2G/y5WNbyCGV16/EycBkK3lGM7puSObTkzb0T 4NpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="gDhk/1Aw"; 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 e1-20020a05622a110100b003b69228f7eesi523700qty.266.2023.01.26.03.23.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:24:00 -0800 (PST) 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="gDhk/1Aw"; 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 1pL0LT-0002n9-E9; Thu, 26 Jan 2023 06:23:07 -0500 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 1pL0LO-0002N9-Cr for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:02 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LL-0003hj-7s for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:02 -0500 Received: by mail-wm1-x336.google.com with SMTP id f25-20020a1c6a19000000b003da221fbf48so906463wmc.1 for ; Thu, 26 Jan 2023 03:22:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=XfmOr8AB7l/sRGL+oSfjFEkee1ur2VxLIR7gCG3Imak=; b=gDhk/1AwR48dB3goRTleodnBt+A4Qo5HE+Xouy6FXQXdvlH2p9HPyr1PGkrl+YLaTw KmDm4ERjaEA/eM4hNcUutlelKCWvN0jBv3F/MTJ20IEHgEH49hD8Ca/Wef3aPB89BXo6 4+rN8ZGD4WN1c9ADWI6tznFhJu31Rk6LQ4LRRPICQx0cUKCVqcJpve7zQIHxEIxxQtKi sbn/sXwwwOMDknXJnEFndjS+8RQohvQWvwnE1bUsGWsD4/apr9gLeGopcUfEvmAkP+me gxOh4JOwWw+wjlGa/tninaEwPt6bmgsZ0CoByOfHw7r/+US9npTne4hvAzCOIo2SapT2 E7QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=XfmOr8AB7l/sRGL+oSfjFEkee1ur2VxLIR7gCG3Imak=; b=b0G49uJcNF57415K72IAdJ47MOAe83YNq+LlyTYQGNnmiE7/0tLkW9a/n67g2naj16 wh4rHpHQcb5mhw7FTBSUihgwprMkMSZbS4iAbhV4jfleFFJ+ovA6vlliQyD8UP/Z4ac5 khYbFkjvMXKFerZ77hQfYpunDn+XJoFSnAsK4MM1V59HcO7qCqnfXQpXcBBR3suHkvru zc/b3CfQLZ8lAH8Vw9gfyWD8+I3oM2nIayfgw1s1A6JqTlXLehIb97l3F+7RLufrdWfo 3d1pRwGmKt7HvWkD0LCr8IUWwm0HofRIoXOfLjIFCe9nX30HOdx2YKg4/FVWV7JvjKG8 X+VA== X-Gm-Message-State: AFqh2krssQ3qsdKf2IWIk6GnPwJ3Zblo+jUUaYegv6gpPwO4Ygea/fRg 6+GdRfNRoxUlXW4nkg9XcK+uvC70LoSsgs6e X-Received: by 2002:a05:600c:1906:b0:3da:1d51:ef9d with SMTP id j6-20020a05600c190600b003da1d51ef9dmr35759309wmq.15.1674732178260; Thu, 26 Jan 2023 03:22:58 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l16-20020a7bc350000000b003d9aa76dc6asm5402807wmj.0.2023.01.26.03.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:55 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ED87C1FFBC; Thu, 26 Jan 2023 11:22:53 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Be?= =?utf-8?q?nn=C3=A9e?= , Ed Maste , Li-Wen Hsu , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 11/35] lcitool: drop perl from QEMU project/dependencies Date: Thu, 26 Jan 2023 11:22:26 +0000 Message-Id: <20230126112250.2584701-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: Marc-André Lureau Signed-off-by: Marc-André Lureau Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230110132700.833690-8-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-12-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars index e3fc3235b9..f32f01a954 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars index 9f56babd9c..813c051616 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/macos-12.vars b/.gitlab-ci.d/cirrus/macos-12.vars index ef9e14b373..33bb4e1040 100644 --- a/.gitlab-ci.d/cirrus/macos-12.vars +++ b/.gitlab-ci.d/cirrus/macos-12.vars @@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake' NINJA='/opt/homebrew/bin/ninja' PACKAGING_COMMAND='brew' PIP3='/opt/homebrew/bin/pip3' -PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' +PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme' PYTHON='/opt/homebrew/bin/python3' diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index b04c2b7cee..58438008ee 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -155,7 +155,6 @@ - nettle-devel - ninja-build - nmap-ncat - - perl-Test-Harness - pixman-devel - python36 - rdma-core-devel diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 094f66f4eb..3293c790c9 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -77,7 +77,6 @@ RUN apk update && \ numactl-dev \ openssh-client \ pcre-dev \ - perl \ pixman-dev \ pkgconf \ pulseaudio-dev \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index 1f70d41aeb..f13745e6cc 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -91,7 +91,6 @@ RUN dnf distro-sync -y && \ openssh-clients \ pam-devel \ pcre-static \ - perl \ pixman-devel \ pkgconfig \ pulseaudio-libs-devel \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 5e57309361..d0ace6d0f7 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ncat \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index bfeab01ee3..0517c4c315 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -108,7 +108,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ nettle-dev \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index 98885bd0ee..9ac1c1ba3f 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ncat \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index d5c08714e4..8be492f4ad 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ncat \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index 471444fcf4..da789e04af 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ncat \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index 15b0224b76..8b7c59c4f9 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ncat \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index a5d3ca6e2f..f9f1ed5fd2 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ncat \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index d2954e61f6..e423d88c2d 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ncat \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index d43ce16317..c1134f4cec 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -40,7 +40,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ncat \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker index b573b9ded2..34b2cea4e3 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -28,7 +28,6 @@ RUN apt update && \ locales \ make \ ninja-build \ - perl-base \ pkgconf \ python3-pip \ python3-setuptools \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index cc5d1ac4be..de811b332b 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -42,7 +42,6 @@ exec "$@"' > /usr/bin/nosync && \ nmap-ncat \ openssh-clients \ pcre-static \ - perl-base \ python3 \ python3-PyYAML \ python3-numpy \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index cabbf4edfc..71681d6f92 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -42,7 +42,6 @@ exec "$@"' > /usr/bin/nosync && \ nmap-ncat \ openssh-clients \ pcre-static \ - perl-base \ python3 \ python3-PyYAML \ python3-numpy \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index f44b005000..ca3793b04b 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -98,7 +98,6 @@ exec "$@"' > /usr/bin/nosync && \ openssh-clients \ pam-devel \ pcre-static \ - perl-base \ pixman-devel \ pkgconfig \ pulseaudio-libs-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 4361b01464..680f49e7dc 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -88,7 +88,6 @@ RUN zypper update -y && \ openssh \ pam-devel \ pcre-devel-static \ - perl-base \ pkgconfig \ python3-Pillow \ python3-PyYAML \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 9417bca2fa..6594bba338 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -105,7 +105,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ nettle-dev \ ninja-build \ openssh-client \ - perl-base \ pkgconf \ python3 \ python3-numpy \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index c62dbc00f9..c2af92348a 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -83,7 +83,6 @@ packages: - ncursesw - pam - pcre-static - - perl - pixman - pkg-config - pulseaudio diff --git a/tests/vm/centos.aarch64 b/tests/vm/centos.aarch64 index 2de7ef6992..3f58de1e64 100755 --- a/tests/vm/centos.aarch64 +++ b/tests/vm/centos.aarch64 @@ -28,7 +28,7 @@ DEFAULT_CONFIG = { "dnf config-manager --set-enabled powertools, " "dnf config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo, " "dnf install -y make ninja-build git python38 gcc gcc-c++ flex bison "\ - "glib2-devel perl pixman-devel zlib-devel docker-ce.aarch64, " + "glib2-devel pixman-devel zlib-devel docker-ce.aarch64, " "systemctl enable docker, " ), # We increase beyond the default time since during boot From patchwork Thu Jan 26 11:22:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647093 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp186255pvb; Thu, 26 Jan 2023 03:25:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXv2cvtbeNAEcZeMgyaC/9WVox/4xssPh15N8hNywLdPxgcolllP+M4552X+aeZChNQj+SNk X-Received: by 2002:ac8:7297:0:b0:3b6:2f17:5d3e with SMTP id v23-20020ac87297000000b003b62f175d3emr46338684qto.59.1674732326104; Thu, 26 Jan 2023 03:25:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732326; cv=none; d=google.com; s=arc-20160816; b=z+h7HRD32YWDUvs81PW/lhiLj+pMsRYS6NcSzOWQQ2YTYYCKABg+Q+GzRc9I6ZUV7H EbYKwwaFRpZUG9QfIdzBWokUaLWyfGdVnIp+187wRm2K5WilyztVVMC5w7QWIA+k8qLP NbQOLHFZn/57eyqbDg1c3/OlfpF2fff6BWSs5cTJSI+2hEm5WDwi9/Zgj0bWIt23jKQB SVzGobqITNAt/FLyMqY0K5dBZqM7Rj8+mtb8nagtMUldHHlbq08yLUKW/njUgNHExqTW LKk/esm6FJG2Lzi9sZswJWtJuollxynU2svHhPSCe0J8a4l+3OpQFUdLhNOcCVK5YtYU egTw== 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=Gqyvp8b7/mZCX5heVRUZcFRztYQJr2E3Tb6sKWOaM6w=; b=rx32sIzW9ObmsVEwTnaXaodhd/VQIljX8VkacAZjemtk+PNGyJdr/SK8XDLpfjedn8 VmKn6fzBuTgd9vLK3Xv05r4GS64ejEkhFWHAC/tvo8uGHO7QIG6VGQ+Zo2/YsGv6jSYS YXSZm8L9yRZJqfTjj+c4fTwjtXCKpYxpWC39j/JZSADkkC02/VR+zyB6zkqy49wtCuBJ d5RTHI2hIh630hFkfCnCASdMFR8EKXO3Ggt+drIA8xEJm0JGqOtGKlBfLV41aUHxkt4M 3OTYp9P4UQJXFuRBUQCtq0rHjWvzZj9zM+WkgOZsyeX/Mg8XuSIAYZ3N10TZqLPGlNSh FCyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="aOg/3SeH"; 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 u20-20020a05622a14d400b003b696a538fcsi553860qtx.546.2023.01.26.03.25.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:25:26 -0800 (PST) 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="aOg/3SeH"; 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 1pL0LR-0002eI-NF; Thu, 26 Jan 2023 06:23:05 -0500 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 1pL0LP-0002Ra-3L for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:03 -0500 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 1pL0LM-0003r6-Di for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:02 -0500 Received: by mail-wr1-x436.google.com with SMTP id h12so1407013wrv.10 for ; Thu, 26 Jan 2023 03:22:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=Gqyvp8b7/mZCX5heVRUZcFRztYQJr2E3Tb6sKWOaM6w=; b=aOg/3SeHniTfepkUFbJRzOMhiWFGeY5YjC8qWcT9D8O3gtBWYbdSksHC9zmUFm5EBF gBz2E26FJPliJKNmUalQGEaPpirlJw/gh7xlSAM6+GWMEpZq+5cP+G/OrEUkNBb0QEsZ xiWfvwZQPBm+lrmwnuvkzB3zqLDkd5ZPD5je//nNxqmPTLz4HojxHVvT/BixD6AgZZSo yH0Ts0UzRAa6CC6oDWT7lqmnB1JQD9wuLZ7ZnSCAKNxEDzCf7EtcdqTPlhDonXwP7snu cMH5kQwPoOlbCOFsr6n1E9ednX6+LAXqzHy8qNMFdO8jnPyxXqSCBdZ3P2xALvAcExE+ I5/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Gqyvp8b7/mZCX5heVRUZcFRztYQJr2E3Tb6sKWOaM6w=; b=44VK/Gpe7Y8v9UkAb2m9R5tJRx3w6iYy+3n1lJ7WMYdmVShwH1FzJaqS+eNfX0TDIH hHVfFQxmTrlCg7NLuYFqv7ZjhGgTCTkyUZIPIQtglKNW7giHKRmXbqKO7EqtsAfULqY9 ERH0rIwY5IiFGIYyR50iVudxD1y8NSRerXT7w3PmeAf6LQ7CW7Sh6Xh5b7E2fjsC+nmU wdvZznj2FKnCWI298uFmtnpUWz8y9tj+Bq62f5qUf7VuI31MHsGjuxOopHZjsPBoKXtc UZYvXDrgweQDgpYmS59WK/dV8BBC5ozdEdTk8VEygK1kOS73Rl5QBXN+mucBFd8s1bSd MH/A== X-Gm-Message-State: AFqh2koa7yEhoygjG5w5+/gkON2+tYujRAAwylpSO8z6mvFQjimqskFn ScAgMK9VavA50JLeInigTzSW+g== X-Received: by 2002:a05:6000:1049:b0:2bb:ee8a:4282 with SMTP id c9-20020a056000104900b002bbee8a4282mr29950603wrx.34.1674732178612; Thu, 26 Jan 2023 03:22:58 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id a4-20020adffb84000000b002bc7f64efa3sm1004105wrr.29.2023.01.26.03.22.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:55 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D65641FFB7; Thu, 26 Jan 2023 11:22:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Ale?= =?utf-8?q?x_Benn=C3=A9e?= , Ed Maste , Li-Wen Hsu , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 12/35] lcitool: drop texinfo from QEMU project/dependencies Date: Thu, 26 Jan 2023 11:22:27 +0000 Message-Id: <20230126112250.2584701-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-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: Marc-André Lureau Signed-off-by: Marc-André Lureau Reviewed-by: Daniel P. Berrangé Message-Id: <20230110132700.833690-9-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-13-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars index f32f01a954..8934e5d57f 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars index 813c051616..65ce456c48 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/macos-12.vars b/.gitlab-ci.d/cirrus/macos-12.vars index 33bb4e1040..65b78fa08f 100644 --- a/.gitlab-ci.d/cirrus/macos-12.vars +++ b/.gitlab-ci.d/cirrus/macos-12.vars @@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake' NINJA='/opt/homebrew/bin/ninja' PACKAGING_COMMAND='brew' PIP3='/opt/homebrew/bin/pip3' -PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' +PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract usbredir vde vte3 zlib zstd' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme' PYTHON='/opt/homebrew/bin/python3' diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 3293c790c9..4a569d82f6 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -99,7 +99,6 @@ RUN apk update && \ spice-protocol \ tar \ tesseract-ocr \ - texinfo \ usbredir-dev \ util-linux \ vde2-dev \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index f13745e6cc..fbc953c6dc 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -110,7 +110,6 @@ RUN dnf distro-sync -y && \ systemd-devel \ systemtap-sdt-devel \ tar \ - texinfo \ usbredir-devel \ util-linux \ virglrenderer-devel \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index d0ace6d0f7..5175095a85 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + tesseract-ocr-eng && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index 0517c4c315..b61f664ea2 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -125,7 +125,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ - texinfo \ xfslibs-dev \ zlib1g-dev && \ eatmydata apt-get autoremove -y && \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index 9ac1c1ba3f..b69958c69f 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + tesseract-ocr-eng && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index 8be492f4ad..96b524fab6 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + tesseract-ocr-eng && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index da789e04af..08a75cebdb 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + tesseract-ocr-eng && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index 8b7c59c4f9..5930e6fa5d 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + tesseract-ocr-eng && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index f9f1ed5fd2..c65d9830e7 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + tesseract-ocr-eng && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index e423d88c2d..2ae56c978e 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + tesseract-ocr-eng && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index c1134f4cec..0db86a0fcd 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng \ - texinfo && \ + tesseract-ocr-eng && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-toolchain.docker b/tests/docker/dockerfiles/debian-toolchain.docker index d3d4d3344e..6c73408b34 100644 --- a/tests/docker/dockerfiles/debian-toolchain.docker +++ b/tests/docker/dockerfiles/debian-toolchain.docker @@ -21,7 +21,6 @@ RUN apt update && \ libmpc-dev \ libmpfr-dev \ rsync \ - texinfo \ wget && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt build-dep -yy --arch-only gcc glibc diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index de811b332b..b659c0b8a8 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -57,7 +57,6 @@ exec "$@"' > /usr/bin/nosync && \ tar \ tesseract \ tesseract-langpack-eng \ - texinfo \ util-linux \ which && \ nosync dnf autoremove -y && \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 71681d6f92..0a404c15bf 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -57,7 +57,6 @@ exec "$@"' > /usr/bin/nosync && \ tar \ tesseract \ tesseract-langpack-eng \ - texinfo \ util-linux \ which && \ nosync dnf autoremove -y && \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index ca3793b04b..5d60a96141 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -121,7 +121,6 @@ exec "$@"' > /usr/bin/nosync && \ tar \ tesseract \ tesseract-langpack-eng \ - texinfo \ usbredir-devel \ util-linux \ virglrenderer-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 680f49e7dc..4b2c02d6ab 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -111,7 +111,6 @@ RUN zypper update -y && \ tar \ tesseract-ocr \ tesseract-ocr-traineddata-english \ - texinfo \ usbredir-devel \ util-linux \ virglrenderer-devel \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 6594bba338..13ab0b6887 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -124,7 +124,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ - texinfo \ xfslibs-dev \ zlib1g-dev && \ eatmydata apt-get autoremove -y && \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index c2af92348a..6467bcf08a 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -109,7 +109,6 @@ packages: - tar - tesseract - tesseract-eng - - texinfo - usbredir - virglrenderer - vte From patchwork Thu Jan 26 11:22:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647096 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp186404pvb; Thu, 26 Jan 2023 03:25:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXsdtmVm6ekoCNI45QMrzLsFeUGan+xuB0W9Zluk8JZKdxvDzaI8jeHBMzrtPQUgVBx/MT8I X-Received: by 2002:a05:6214:5c83:b0:534:3013:1d27 with SMTP id lj3-20020a0562145c8300b0053430131d27mr49357690qvb.11.1674732353207; Thu, 26 Jan 2023 03:25:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732353; cv=none; d=google.com; s=arc-20160816; b=sphu194yLrTS6zAX8s122WCVrwoDggBA3z2WudEjG5pmNLVd5I0lTttne4qOLVgkSc ui25+NFD2zngLZwwDqOEOquiZNdCDtEQ8aRi8aDufMhhh7NgAQwxJVsO4BeIFM/4EyUp gjTNmzfNtvdlVNvVVITVjOuQrZcCCHZdLkKqmA9FzbmRmp0M/6lgy3GGqYTvZ8LBojAb IOYkxrh/NHfqFN6K2RgjItYD5A5PPqONTGg1tCONjicmQCXsb4XPFxdT5RTKcXBu1NHC 09xLv2bt7NRwhgVN86gbA/DJBw7dyTeVfnxv4OatNnmE0X2XGi0C/8wuzynv6sUdt8AT ZnWw== 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=KFZeEOxJCVQspOHbF7wx+yMKgFZxmjaI0SvCk2jpZbs=; b=UaX2MgEoRiLoopvIGfM3WZdaqOWZpClOVUF8ZfLCut/JEeBdpvUW5NVSGuAj2PrB22 g1MFzn6aE0ndQsTY08mcxIUYtQTykv5c5Wtal41yhTZ8BvE+sdMd14zxTeLnqc/3RBSz yyPT7lyfxnEXlHF8ZiDeru3TB3iSRSsyMVOJ1ac0eiaddxsdb3v2jUUx2nij+5ZMXBTM /+RY2eircWNq5214DvkKHBuDLUn3clShzIuXEJ4cfqnLogQN5Ib4fo5hO+AMleDaB/1k 9jB6mrpjVA4iRBiqb9sRrSw4NgKS45u5Bhual7i9oMtR0LMbGt6IdPqVODcT6cnlNEF+ yMDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TBe1H0Ha; 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 ls17-20020a0562145f9100b00525d60e52c0si690894qvb.8.2023.01.26.03.25.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:25:53 -0800 (PST) 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=TBe1H0Ha; 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 1pL0LY-0003Ep-92; Thu, 26 Jan 2023 06:23:12 -0500 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 1pL0LP-0002Uj-Jb for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:03 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LM-0003jP-I4 for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:03 -0500 Received: by mail-wm1-x32e.google.com with SMTP id q8so894033wmo.5 for ; Thu, 26 Jan 2023 03:22:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=KFZeEOxJCVQspOHbF7wx+yMKgFZxmjaI0SvCk2jpZbs=; b=TBe1H0Ha4fhAw6OGRnrnNq42Pwmd4sOi7igco6shLhIVk88qsG7QkTsFiQ7Vo64vuH wwNEE/H6MGTWM/h74zzGlN4CrW4bjzpWbpCVr8LzV5gx2gJHsh51CD2h9ab5x03shGMy 32tgE72zWuZIGHWuMJXM08MrNiBwt4E2RFXESL/pu+mn/9rSKvJ9ejeyn+64LITyg/Fl PcL1bOWVcXI7QEuqeKMe7FDCxUogJv8Awww2JADQzOuOg7K7BUSm7kLON+gjU+rxh1jm 5AhsJKX7qRG28x1UJEzwmdiEV7y3P7X0ZdxBMQWad9OI+NSsQxnUvSl6Z910jGCifnN1 xpUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=KFZeEOxJCVQspOHbF7wx+yMKgFZxmjaI0SvCk2jpZbs=; b=vkaZ+gkLxYXiqk4569yLpvWlyzkUYBAg+4IxpwfgGPd9NK97CTToR2wIdtzNsIXwKQ ZbREhn4887HKRYUCFN2MGcwjc7VUnSIVdbrzJ3SBWy7dSZ8zqp5nc1tAj3KR8TwhWPFf pKtyOu2g/ztfVq0lfY60NJJDF6R5BoQRlaA3pf56/CcVJXmbQFVzJBIT8aF1HQnxgVi1 G95tfajYxtVaWNG8rqQl/rfsjcJGEER4lUdFGqmid+HQ4ofjVPTZYIzp3Dr5nGHL2OR1 EealyCYkTJ4qaChT0zzzF4QeEoEbWAbYlwNRSlLgv3dt4tLlW5GSA7Sorlpt4u29qsCS 0A1g== X-Gm-Message-State: AFqh2krxz3TZeYSMDL1cSi8L1zpU9W4AZdPARpwLOcktF19enJZRJwxQ 0DN9BlM/M9FB9OnbZaFYT2MoTLrFs1sDBlO4 X-Received: by 2002:a05:600c:a29f:b0:3d9:f42c:56c5 with SMTP id hu31-20020a05600ca29f00b003d9f42c56c5mr35001516wmb.4.1674732179557; Thu, 26 Jan 2023 03:22:59 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n6-20020a7bcbc6000000b003d237d60318sm1213191wmi.2.2023.01.26.03.22.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 17E351FFBB; Thu, 26 Jan 2023 11:22:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bastian-Koppelmann , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 13/35] tests/docker: Install flex in debian-tricore-cross Date: Thu, 26 Jan 2023 11:22:28 +0000 Message-Id: <20230126112250.2584701-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé When flex is not available, binutils sources default to the 'missing' script, but the current script available is not in the format expected by the 'configure' script: $ ./configure ... /usr/src/binutils/missing: Unknown `--run' option Try `/usr/src/binutils/missing --help' for more information configure: WARNING: `missing' script is too old or missing ... checking for bison... bison -y checking for flex... no checking for lex... no checking for flex... /usr/src/binutils/missing flex $ make ... updating ldgram.h gcc -DHAVE_CONFIG_H -I. -I. -I. -D_GNU_SOURCE -I. -I. -I../bfd -I./../bfd -I./../include -I./../intl -I../intl -w -DLOCALEDIR="\"/usr/local/share/locale\"" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -w -c `test -f 'ldgram.c' || echo './'`ldgram.c `test -f ldlex.l || echo './'`ldlex.l /bin/sh: 1: ldlex.l: not found make[3]: *** [Makefile:662: ldlex.c] Error 127 make[3]: Leaving directory '/usr/src/binutils/ld' make[2]: *** [Makefile:799: all-recursive] Error 1 By pass the 'missing' script use by directly installing 'flex' in the container. Reported-by: Peter Maydell Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20230112155643.7408-1-philmd@linaro.org> Reviewed-by: Bastian-Koppelmann Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-14-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker index 34b2cea4e3..5ae58efa09 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -20,6 +20,7 @@ RUN apt update && \ bzip2 \ ca-certificates \ ccache \ + flex \ g++ \ gcc \ git \ From patchwork Thu Jan 26 11:22:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647103 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188235pvb; Thu, 26 Jan 2023 03:30:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXv2vJ4nURQOHG1xgxnyofo6f/t/DZvPNSImsuDZhokt8RFF9IYUQwNvhNdeE6aRB/9Zt7Ul X-Received: by 2002:a0c:9c8a:0:b0:531:b7b1:c31e with SMTP id i10-20020a0c9c8a000000b00531b7b1c31emr50261429qvf.38.1674732653170; Thu, 26 Jan 2023 03:30:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732653; cv=none; d=google.com; s=arc-20160816; b=aqBhgNQxwU6446UIHSTd/Z8E6c0matSpQ3vQ4BKIPRgmOrjWQNxcKZWYdvpm3BSa8a 9pcmwlp3sHAUujyKy5yNN+QMsF0/pEOHOWtXeoqZtRMH8QxEtJAip6uxd9SdwDM6ls7s xVF+o/W65MXuPGCxPj8AmIUshF+xvKhPQxMJrNT79exbWs+tn4OySdCUBNPfi/zsN3dm 3rsqe5eP7kH9I8ZBsZ/u03sIivhqZ04NdiUDHbA/UhMUd2ni3LUsZflriE5ijC0unGep 4Ndg0X1UVoLMIBG5n8o/7TpqRMbxwYrlKsg8BcS1/wT0brh7trNTJN/7572u04Bj/g5X MLuw== 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=0aNvcxOhLZR4Of7Jpv6k8KZIyu+hQ2GNiHWU5ZTeAY4=; b=rMEAPQVhWwPv87qr+OfTS8ayhLxqHxp+fjk6unLWhcBi3g/ntujX4WylEU5y6cAG51 5U2xSqWr3u8hV8tXAQqs6ivwqqYrp4/qhaBjerDK3UEUhA04raQkyrq8K3FgOYpzpAWs c2wSrx2T5oBkPHudonYcxbxu+V6ksvCPqENELxIjxdGPMvFNBx1NxZBed+ed1DQhV82d 4cO8tjeNa5VN7Y88xqXYuWgu6zLFykCZxOb++U6YQ3sAujAjSLgVyBiB6lwP7YgnQ+iP /BAftMiw80dDog0TiuQ2x3F5hF/4sAjBuM0Dp/5krydC3rCGOV5/4Wrlybhx2Z7e+lHF fglQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GN44nqVR; 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 l18-20020ad44bd2000000b005214df9a7ecsi570044qvw.576.2023.01.26.03.30.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:30:53 -0800 (PST) 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=GN44nqVR; 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 1pL0Lc-0003g3-8v; Thu, 26 Jan 2023 06:23:16 -0500 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 1pL0LQ-0002Yk-Ae for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:04 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LN-0003nc-FF for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:04 -0500 Received: by mail-wr1-x434.google.com with SMTP id y1so1439925wru.2 for ; Thu, 26 Jan 2023 03:23:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=0aNvcxOhLZR4Of7Jpv6k8KZIyu+hQ2GNiHWU5ZTeAY4=; b=GN44nqVRr+cjhSKi5AUtzpH2ELhMhlSu+bGV/qipCRFaLfnqSlRc7eGRL+jyk7RX/R DcmSz1VVTx60ej2q5xCNKdHTnc8IK25KanooLhUkqYJKUc3oKPg3LSaK15p8LX6w4Foo VJ2Bvi1/Apfj1zXf3cnvkqp8PIfuSpxO9YwBZfvSIMjreB3gTWUkbJ5UJCtyKFfxlx71 AMqONPQzLf/5k4ovl576g81nLCggtlV4lUOqHF/TXi6mzgnfoSptGbvJ/5H+0GmRQr89 Ia+QJTBrkUtNOujie+O1+4vFGQATSl8Dnld59ODoNrone0Got4DgYE+WLhBwl94BMUQt 8qgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=0aNvcxOhLZR4Of7Jpv6k8KZIyu+hQ2GNiHWU5ZTeAY4=; b=sLAdn7Xv8+Eqn6MGiJA9gSSNQP+q73+9XpwuOwQmesVd75EzGoiYjEbZC/wZSqesbd zvOyQHU+h2qThgT7ZG7g3VdBMXjCD4K3wc3oqoDBcxnePgPaQBaKmJv4emycJSQgu7mR A4O4PRqntVNFn86WywrjpzRydIL9tI45C6DI9OLMX7LirJ7VmfvUkDveM2GOrsFn4Iww xSiIDiVuKFqwqDgAru1HlaSYu027zfTbUFZcph3UhcZhjlmO9u325LtnAOPoblAIfzhi FhCSq0IdIqaIQF1tdCyOzh+4DQmXOitn7O8IBdvQhYZ6SYCvP86KlPi20oLfyzwCymXh Y2XA== X-Gm-Message-State: AFqh2kq8DaXSvfJwkqgC+cTFF1HHysRbZN2box9861SeTT9zlAEHpi05 548M7CsWyl47jueQZyroztxttw== X-Received: by 2002:a05:6000:388:b0:2bd:d34e:534d with SMTP id u8-20020a056000038800b002bdd34e534dmr36226124wrf.27.1674732180630; Thu, 26 Jan 2023 03:23:00 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id c7-20020adfe707000000b002bfb0c5527esm1022131wrm.109.2023.01.26.03.22.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 458AD1FFC0; Thu, 26 Jan 2023 11:22:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 14/35] tests/docker: drop debian-tricore-cross's partial status Date: Thu, 26 Jan 2023 11:22:29 +0000 Message-Id: <20230126112250.2584701-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This image is perfectly capable of building QEMU, and indeed we do that on gitlab. Drop the DOCKER_PARTIAL_IMAGES setting so we can also test the gitlab build locally. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-15-alex.bennee@linaro.org> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 665ddde518..bfb0dcac21 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -128,7 +128,6 @@ DOCKER_PARTIAL_IMAGES += debian-mips-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross DOCKER_PARTIAL_IMAGES += debian-riscv64-test-cross DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross -DOCKER_PARTIAL_IMAGES += debian-tricore-cross DOCKER_PARTIAL_IMAGES += debian-xtensa-cross DOCKER_PARTIAL_IMAGES += fedora-cris-cross From patchwork Thu Jan 26 11:22:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647098 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp187079pvb; Thu, 26 Jan 2023 03:27:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXvYSHSSsA92fpA/RRPHeyBkzhjqm3aow6eWCOVVN3M9X8sAl94NUfgsKU3tb2axdLZt2iMl X-Received: by 2002:a05:622a:1aa5:b0:3b6:a1fd:19cd with SMTP id s37-20020a05622a1aa500b003b6a1fd19cdmr42641488qtc.46.1674732474989; Thu, 26 Jan 2023 03:27:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732474; cv=none; d=google.com; s=arc-20160816; b=EkCaG4mYmUVpKXgPkymz3YPtKCmk67HqKI14acYkRO5SlyMprrgugeXu1x0jTUJcQC Ns83FpHbq+syOE0Mp5sHdCaohLegTFh5nSXpq6XfnY373r7yASeBcnxQ11JJpKfmycgU CUmMBUW2kWDj9Jibg72E15EwPfUdHrVBX5+B/gJ6DEtE0vU9+aPtBctIVDCofC9Q5Njr S+UAM9Kgv0qrIswk0z8rtYqbzfN6wI3Yt8NCrHAIHRCE0fBh9JTIfWXPeDhSbS2xQfU8 5clt/FMj3BSx+XPWpMZrh6z4t+x3BL2hiS1jW+Kj4LRqYaHbnNnpWHs+mRKF/C85ncM9 aAVQ== 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=GF9se++UjGrzr3Ah8eYjy9RktgyOzceFa3Namz4fGRk=; b=hGdcsB/vSvOMI+4Kar4zdyeEBttIp4cmqpfPCRqKenoYbh5OptPnZ8nTREIqKAiAge gvgWw7u0p6Bao48wEZ4eEdVgPfY278rvtioZjfwHKMaKmjyJN2npJmtlxHzaXTSDS310 11DnENB18Ksnpf19OVJd8SaCyBgBjhWDcRgmmpgagwQv/sKzkqvitYy/kV1QLx9PEclY 4ls2Nj5tHMKLAkbDpxEOwj4xsYoJnBBjXpR2i35jwS9vRlroLauI9ngPJ8JawkWs8dzi ZOIMpUvqK/iXndGpn/Zp8OEXZ/Gwdb+SC3mKwfN+AC3AGUgb9HfxiXUT4IVBXD8Q1neS 67Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LWH67R+m; 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 ESMTP id w124-20020a379482000000b0070f92c4e692si789800qkd.62.2023.01.26.03.27.54 for ; Thu, 26 Jan 2023 03:27:54 -0800 (PST) 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=LWH67R+m; 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 1pL0LT-0002o8-OH; Thu, 26 Jan 2023 06:23:07 -0500 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 1pL0LQ-0002ar-VH for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:05 -0500 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 1pL0LO-0003xG-JQ for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:04 -0500 Received: by mail-wm1-x331.google.com with SMTP id l41-20020a05600c1d2900b003daf986faaeso892431wms.3 for ; Thu, 26 Jan 2023 03:23:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=GF9se++UjGrzr3Ah8eYjy9RktgyOzceFa3Namz4fGRk=; b=LWH67R+mfM5N4NGO8rgEssBi7GnPKw8Az5Pi1xeugpYKeByDnfm6l4QXnLhHjIShv6 TOayhhUQM5efoTW/1T/81WdcwkaA1B/Wbcfgvv2agHLkDIFf3ALF6wPxqw/YLJ0pQgqT W7DNuadjoGQlUqDPDqXBU6PLp5bDQ2Js1R9nO/3ujmTN7lKXnaIO7NdhZgAoxNNIp+OF LDMT6MXH46RalGpoqUi5rFOUtLEYbPmpIF5DqoH2eY/x3NmJlPBmiq4Bpmv7ituoyFii 221ZvHvrE3lSXGaplKZCmQsBE9Xy4pv8GifMpsQ5OfbzKprn5bius9M2MBU6rixb3Je9 aZ/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=GF9se++UjGrzr3Ah8eYjy9RktgyOzceFa3Namz4fGRk=; b=GB9v3kNZMjZV+6MOCs7ufyDpRvdMRS0C6GWpHAnPOO9ceDGj/sF0mHitYkO875Hy4O d2M+h1xas/FcpNmfpg+TIpUWxV1dUXs1xM40qzyi7UFDBFIbgKYOSlY5esNmrC64us7k scxKuYdAgLPj/6yPnF0mxxtavypfMEGfpDmgezLY+LlFhe4dZeXfcocSBBXzOYPLtV5c b/yTDyZ3XXZhuOmAvOBPMR+t8xeJModp9QOHOhrdedUoYWaSU3jNIzouJYGFlzWTQofE GZwGrk9sS4FTmhNdLw0dBKqLItdpZf9vJEdQgJFgwBzG7FXVAZhbQPL/7pN2wAP5+RC2 ZK7w== X-Gm-Message-State: AFqh2kqXurYhpWLtlFjY6f5QZ84u+yr9J2tcIbti5KTWU5BEIi0JgWUe AXYOi7M44e6J8axaRmZmX2J3jg== X-Received: by 2002:a05:600c:354a:b0:3da:1f6a:7b36 with SMTP id i10-20020a05600c354a00b003da1f6a7b36mr35460025wmq.0.1674732180979; Thu, 26 Jan 2023 03:23:00 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id e38-20020a05600c4ba600b003db11dfc687sm1175625wmp.36.2023.01.26.03.22.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 79E4E1FFBD; Thu, 26 Jan 2023 11:22:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Subject: [PULL 15/35] tests/tcg: skip the vma-pthread test on CI Date: Thu, 26 Jan 2023 11:22:30 +0000 Message-Id: <20230126112250.2584701-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-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=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 getting a lot of failures that are not related to changes so this could be a flaky test. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-16-alex.bennee@linaro.org> diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index e7213af492..ae8b3d7268 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -42,6 +42,15 @@ munmap-pthread: LDFLAGS+=-pthread vma-pthread: CFLAGS+=-pthread vma-pthread: LDFLAGS+=-pthread +# The vma-pthread seems very sensitive on gitlab and we currently +# don't know if its exposing a real bug or the test is flaky. +ifneq ($(GITLAB_CI),) +run-vma-pthread: vma-pthread + $(call skip-test, $<, "flaky on CI?") +run-plugin-vma-pthread-with-%: vma-pthread + $(call skip-test, $<, "flaky on CI?") +endif + # We define the runner for test-mmap after the individual # architectures have defined their supported pages sizes. If no # additional page sizes are defined we only run the default test. From patchwork Thu Jan 26 11:22:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647095 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp186386pvb; Thu, 26 Jan 2023 03:25:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXtfWxEpjbkL/zumvfQyrVFJ1HgUm/zdxqwSTpFMLXokmE2pqScK2PJqNHyP2yiHKdsBiGa/ X-Received: by 2002:a05:622a:6028:b0:3b6:3aad:afe0 with SMTP id he40-20020a05622a602800b003b63aadafe0mr47669532qtb.11.1674732350418; Thu, 26 Jan 2023 03:25:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732350; cv=none; d=google.com; s=arc-20160816; b=VVXx6gyq0YlMBsuZm9CrgcIHocMNUzDK3jX+E3EceIeygCyRgS19Jk2U5JEr8DdE08 DfUWKOw7BDmSLxomnULzqIFELyyJhrTkfOMbGuo2Jk2HuNtZR4ZO6+g2KEghKNoFurku N9q06QatppXTUX8SarDZ4OynRikuNiL3KQfiHFS2HUBx83LHCmxh/TkFbMgHC0+X7Xnq RrGWL482nNgQKMAhViFVJDvlYZBDglnQ9Fv7IGHgucf+enmBZ4Ij5GiLIZE2neBhrnX8 PXvsdHuWqoW1Ogm36WD+Ckl1sHLTs+j24D4TPaodOFrBcBKNzTvSpwX+pX/VRT/lrz8b kREw== 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=5jrg3BCHzkEEvgvsCu9pnvQ76HLYPlXnAsGxfTUecSw=; b=w9wbJLvccsPiMuzlDd96TNmGh9ZC97I8mVXr0yBeJ2JVjDO+9w/HOTC2FfaQFPJTbp AITNHGllX/3XLo37RYykC+/BnOJ71BkhkiznfYC1rbx+G6HkfoaiMxFhg55FFSbP/G+6 KNk8l62/Z0A1R0dtqNVex+owiwUW+AG8290OCIJM8DTraU4oVecBiXR6I4wr4CXHkeAA W8xFEaBMEqfrpujhHI7khMpr7WIwk5dEPB5wqYu0wbcX7QOYmFIrpdceow5awF7Gotba ji3DD1PT27b68QTEHj8I+XhLuq8VVvdy+VOonokqDIVyiXht32KxCS8HS+Qy+jA33453 5QvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=x2FPYywr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b6-20020ac85bc6000000b003ace032d9a3si553854qtb.378.2023.01.26.03.25.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:25:50 -0800 (PST) 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=x2FPYywr; 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 1pL0LY-0003F1-BF; Thu, 26 Jan 2023 06:23:13 -0500 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 1pL0LQ-0002Yn-DY for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:04 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LN-0003t6-Iu for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:04 -0500 Received: by mail-wm1-x336.google.com with SMTP id c10-20020a05600c0a4a00b003db0636ff84so915885wmq.0 for ; Thu, 26 Jan 2023 03:23:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=5jrg3BCHzkEEvgvsCu9pnvQ76HLYPlXnAsGxfTUecSw=; b=x2FPYywrJhUCdrSwcEWiF782PV18BCk2bpZOLXwsoj3RZtLuW0GV2WKkMGTPqxpTpi UPQuH8lj8srKT2AQ8M9mzQc2+9aYQuKmp4FUtwMtqvWz7CFZvSDKzs+sR39fJKSAhfeR QqMYkPPIX2Tv1JOwoJhGi1x+E6wtWyhBWPc+HOicHjDNG0kS+GtVMwlR01p2bUo7T+ZL XJVrF0O7srM3phbem1cbSuva6xIsJNiNF6YSMp0FRUsqBoZYCF6VG75gu6FQ4ioM9GuO 6c1SdxBBCDguUaUrkR/jSByKfMvFBmed5YlxNpnQ5NrjUjDUVP35sgpay0V6JrEjm7Ti ZbjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=5jrg3BCHzkEEvgvsCu9pnvQ76HLYPlXnAsGxfTUecSw=; b=s/x08p9MjacMdrB9/BVBHJWJlEnXeIuLVMPFMXXMfgoUV71N7mrV5LJ03UrRecqxpt NeAbiKiBDSdSOZ9RRzDZKyyco9BLekbBkijHcoFFNiXWHn6Tw3lF3xBoY0DfMAD1kDiL leXA8jB+pI3AXK60n45IuSIIsg7nBY0qMikYMcFiQFHobwNz3E6tZMBaTcWKU3v42S0D swJFffu5BJFnTjqYXPZYY4VnlNggYZQz8k8Kn65GtANSc4yBHmQn0sMbMjQhr25/wAuV Le/d9SFVeMS73E+TfTrbYcXOeqK6QuxLFxtfEvgS/NcPs70q1RUmja8fdMc77gPuylyc yPiA== X-Gm-Message-State: AFqh2koEZDfzZ9e4GZ+9PxkuEHv2aHxP53B7vHPenp9t9okPrHYDCusw xG2tI+dvQPZ3Hx+NPmGbo1nRmw== X-Received: by 2002:a05:600c:5116:b0:3da:212d:9dc0 with SMTP id o22-20020a05600c511600b003da212d9dc0mr35406295wms.14.1674732179850; Thu, 26 Jan 2023 03:22:59 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id u11-20020a05600c19cb00b003d9fb04f658sm4801290wmq.4.2023.01.26.03.22.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A042D1FFC1; Thu, 26 Jan 2023 11:22:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PULL 16/35] tests/tcg: Use SIGKILL for timeout Date: Thu, 26 Jan 2023 11:22:31 +0000 Message-Id: <20230126112250.2584701-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: Richard Henderson linux-user blocks all signals while attempting to handle guest signals (e.g. ABRT), which means that the default TERM sent by timeout has no effect -- KILL instead. Signed-off-by: Richard Henderson Message-Id: <20230117035701.168514-2-richard.henderson@linaro.org> [AJB: expanded commit message from cover letter] Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230124180127.1881110-17-alex.bennee@linaro.org> diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 14bc013181..a3b0aaf8af 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -54,10 +54,10 @@ cc-option = if $(call cc-test, $1); then \ # $1 = test name, $2 = cmd, $3 = desc ifeq ($(filter %-softmmu, $(TARGET)),) -run-test = $(call quiet-command, timeout --foreground $(TIMEOUT) $2 > $1.out, \ +run-test = $(call quiet-command, timeout -s KILL --foreground $(TIMEOUT) $2 > $1.out, \ TEST,$(or $3, $*, $<) on $(TARGET_NAME)) else -run-test = $(call quiet-command, timeout --foreground $(TIMEOUT) $2, \ +run-test = $(call quiet-command, timeout -s KILL --foreground $(TIMEOUT) $2, \ TEST,$(or $3, $*, $<) on $(TARGET_NAME)) endif From patchwork Thu Jan 26 11:22:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647086 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp185444pvb; Thu, 26 Jan 2023 03:23:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXvk35HXBChH3WRduzkBDU7qn+FIHIuwWOSrXwwzCB567y0sjy3fF/1WZwuSIJ/IsLor63Od X-Received: by 2002:ac8:4c84:0:b0:3a6:a89d:9ee with SMTP id j4-20020ac84c84000000b003a6a89d09eemr46974874qtv.33.1674732195495; Thu, 26 Jan 2023 03:23:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732195; cv=none; d=google.com; s=arc-20160816; b=dt+Sm0tVNmFOSio3E9cd5dAAdJodXk7hmiIAFHR6pvU6geX8TnazmkRgZf+x3LowIn mEnM95ip7INX02abZQ1yf1lk+kCOoQRMd/XHP7XDxeDvYwFJ386wFysHoLaACE5dbWKM plUyslfqvdpFRj522NZ+lkXxVWnStQrgOALEnCndc+Xc0fpom91PuQZC+v+Pz4fq9rpb 7iQN8xp2cqQtwqkRD1r1cIzsKuG9X+/kSA59dZ0f2d0dgcRQHDQ+E64IJOzDV1pJPVsi JZrYkZEUiMw9NfAy9BQ/+Ill1Q7gudsLDIfPGp5qkMpIvIIOvav4ddoGtArT5YpWmVst MLDA== 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=TodRRHCuZr2NbsR+6HpPmvjD5P9vgla+mam0F9Gvwc4=; b=LvRfOFU510374L27VCmmYmDb6aJrs+LUKxPomX48Th+o4aO2ulLvbviABFRhSgCLZ6 Sur3xgmNePGv25gMKfSxbBAvz+3udZTaAIpBZLBXsGkzY3VVcWs6jOsmVOQtIfpOcqiK QqBm++UV7NyqRfNxeBobfWzWJ7a/a5F3CTGrb8jgGBpiwJcr4Law9UTY9LuFReVB4A0A rbAzOH+xoXKy3KZzzfTch4bSoFxEMb+WjhiVnpU6SrR4nKkZtPu6UeXR2T/qs89GjMH+ 3dd9be9+Kf3Lj1KCOzKDa7UdjKEOzZvhqaDDHpa+EYeS/EQS/JJqTgHlKVzO/zhwHNLR /pFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=feXVOtbY; 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 2-20020ac82082000000b003b68ac44a3asi444318qtd.720.2023.01.26.03.23.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:23:15 -0800 (PST) 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=feXVOtbY; 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 1pL0LW-00032z-Ns; Thu, 26 Jan 2023 06:23:10 -0500 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 1pL0LO-0002Qy-W9 for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:03 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LM-0003rH-GT for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:02 -0500 Received: by mail-wr1-x42b.google.com with SMTP id y1so1439834wru.2 for ; Thu, 26 Jan 2023 03:22:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=TodRRHCuZr2NbsR+6HpPmvjD5P9vgla+mam0F9Gvwc4=; b=feXVOtbYwGaXKqFnGGM/PohPcc/89tcwmKC+RcWIO9UA6qFAR++8AamzGczY/Y3nv6 zKD4MCtu4UZ0h/cpLhjg6akwyrJL7mJ0co25AzadMwoNZaux16b1xJ3z3cEIe3+//eGO n0RO/4Gqg55pnCdo5yqM3xPIF++xCpvpvMD5fP819BwIQwdzOWUt2edzSMtDuR0+S2ng iTjHPLYFYGl5UEsjtB06IpvZJeHGYxt0Jz7jwCkvL3MHizFBSn2hzzVS8YwQ9pddEO67 rjr/pFFhWP+QhQKRgOtPBqq5SVcqghxYTtSoRW5gwVHEAzOthQyDPTjiaWE8VNJbU/Bq l3yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=TodRRHCuZr2NbsR+6HpPmvjD5P9vgla+mam0F9Gvwc4=; b=I8qM5PpXb4eVDiJx2VhHkSkK/5x25eqMae9q7dCeHiuQdMNx1K8YKN7sToKX7DU6NK lneECZp1mjkfixNSF4gKPoskEYANj+cnkWu3lyg2iEi9sgbFH4VzrNIW1CtZ48UwHjGM bGiFdHjxKU7Wl8EdF2DMMCIyJOhj8fopw9rOBSgTGZOgQT/f5B8v4DLapRxRaXamEdPu UYgLYTh7WYdMtXH+3wiFklf/yXCsEx1D67gY2Q1og9479odmrnpuY0F+xwGemnuGwaaX 427urwDfLcXeQC74+wA9yopPUfQc9dUT19wuslnkBtQ7rvHTt3PAngj5OBpP/uUyxADT kkcw== X-Gm-Message-State: AO0yUKVqyEfV6PLTEdU3SXvSuAFoLo12t/D0QwOjWKDcTRZiDfeeILAv v++gM0PGAIqUx0n7pPj0kEHUdQ== X-Received: by 2002:a5d:4ccc:0:b0:2bf:b88b:aae8 with SMTP id c12-20020a5d4ccc000000b002bfb88baae8mr4897906wrt.50.1674732178994; Thu, 26 Jan 2023 03:22:58 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id y2-20020adfc7c2000000b002be07cbefb2sm1436141wrg.18.2023.01.26.03.22.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EC70F1FFC2; Thu, 26 Jan 2023 11:22:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 17/35] gitlab: wrap up test results for custom runners Date: Thu, 26 Jan 2023 11:22:32 +0000 Message-Id: <20230126112250.2584701-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 Instead of spewing the whole log to stdout lets just define them as build artefacts so we can examine them later. Where we are running check-tcg run it first as those tests are yet to be integrated into meson. To avoid confusion we don't run multiple check-tcg tests at once. Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-18-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml index 97f99e29c2..9fdc476c48 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -13,6 +13,17 @@ variables: GIT_STRATEGY: clone +# All custom runners can extend this template to upload the testlog +# data as an artifact and also feed the junit report +.custom_artifacts_template: + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" + expire_in: 7 days + paths: + - build/meson-logs/testlog.txt + reports: + junit: build/meson-logs/testlog.junit.xml + include: - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml' - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml' diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml index fcaef9e5ef..f512eaeaa3 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml @@ -3,6 +3,7 @@ # "Install basic packages to build QEMU on Ubuntu 20.04/20.04" ubuntu-20.04-s390x-all-linux-static: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -19,12 +20,11 @@ ubuntu-20.04-s390x-all-linux-static: - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` + - make --output-sync check-tcg - make --output-sync -j`nproc` check - || { cat meson-logs/testlog.txt; exit 1; } ; - - make --output-sync -j`nproc` check-tcg - || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-20.04-s390x-all: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -41,9 +41,9 @@ ubuntu-20.04-s390x-all: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - make --output-sync -j`nproc` check - || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-20.04-s390x-alldbg: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -64,9 +64,9 @@ ubuntu-20.04-s390x-alldbg: - make clean - make --output-sync -j`nproc` - make --output-sync -j`nproc` check - || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-20.04-s390x-clang: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -86,7 +86,6 @@ ubuntu-20.04-s390x-clang: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - make --output-sync -j`nproc` check - || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-20.04-s390x-tci: needs: [] @@ -109,6 +108,7 @@ ubuntu-20.04-s390x-tci: - make --output-sync -j`nproc` ubuntu-20.04-s390x-notcg: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -128,4 +128,3 @@ ubuntu-20.04-s390x-notcg: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - make --output-sync -j`nproc` check - || { cat meson-logs/testlog.txt; exit 1; } ; diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml index 2c386fa3e9..42137aaf2a 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml @@ -3,6 +3,7 @@ # "Install basic packages to build QEMU on Ubuntu 20.04" ubuntu-22.04-aarch32-all: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -22,4 +23,3 @@ ubuntu-22.04-aarch32-all: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check - || { cat meson-logs/testlog.txt; exit 1; } ; diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml index 725ca8ffea..8ba85be440 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml @@ -3,6 +3,7 @@ # "Install basic packages to build QEMU on Ubuntu 20.04" ubuntu-22.04-aarch64-all-linux-static: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -19,12 +20,11 @@ ubuntu-22.04-aarch64-all-linux-static: - ../configure --enable-debug --static --disable-system --disable-pie || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` + - make check-tcg - make --output-sync -j`nproc --ignore=40` check - || { cat meson-logs/testlog.txt; exit 1; } ; - - make --output-sync -j`nproc --ignore=40` check-tcg - || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-22.04-aarch64-all: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -44,9 +44,9 @@ ubuntu-22.04-aarch64-all: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check - || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-22.04-aarch64-alldbg: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -63,9 +63,9 @@ ubuntu-22.04-aarch64-alldbg: - make clean - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check - || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-22.04-aarch64-clang: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -85,7 +85,6 @@ ubuntu-22.04-aarch64-clang: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check - || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-22.04-aarch64-tci: needs: [] @@ -108,6 +107,7 @@ ubuntu-22.04-aarch64-tci: - make --output-sync -j`nproc --ignore=40` ubuntu-22.04-aarch64-notcg: + extends: .custom_artifacts_template needs: [] stage: build tags: @@ -127,4 +127,3 @@ ubuntu-22.04-aarch64-notcg: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check - || { cat meson-logs/testlog.txt; exit 1; } ; From patchwork Thu Jan 26 11:22:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647101 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp187730pvb; Thu, 26 Jan 2023 03:29:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXuKmmkD7419qadyBBP5REO8UadXOUsJikBc/123lE+dmcx44Q2bXMnm40TqtdaTFRkNWs93 X-Received: by 2002:ac8:6690:0:b0:3a7:efe3:47c8 with SMTP id d16-20020ac86690000000b003a7efe347c8mr49511345qtp.6.1674732579579; Thu, 26 Jan 2023 03:29:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732579; cv=none; d=google.com; s=arc-20160816; b=aX1VziopbhH5w1CXT9JONDIzczdwb915Shnu+UExaujpLLDZxYpc6+NVGOby0gaH5F TZRZhVFEy87PEU/0ve5asxMp0/t2irP9bsjTr/kDUaQmrsA3ND3ia6Z/tteKyEZRTHwy /NUDCIjqDmURWmn3nrJAmUvMXVWQbPVaoRhAsr4nYdRkHiQlBLWU05RNcV9qdjDa1zmv Fy6TPLbX/7iI7aF02fpyDro3cqkOomCQDYh06hHDbzn6pXCMxLDXguBdZinToumkz9OS ort3B22zv6My6VD2xRddbzoX60dpZfZPubetlu/SAfNY/B2f3q4tPT0Qn/R/IzHVQZs/ VOWw== 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=Pfi1W0xHLZWf1PK1ikWIAw2bTkm2srMITC6ITRXr/yk=; b=blDGipDe7gLWlavlg4WzLsoq8t5QzjLkzcv18/5EsNo8y8o6M3WRavV8Jjr2pTtiou G3lgxnjA8jHkJrRyMHDaWYTptUem7pU3nke62HzdR0KsKZ4NrZvwOgRis1cjvQWX0hQz JCxYYkOBxlIocKLFM7qBQ566nKhBNQ46Im3us4do42dFBrr6+7BwQMq+AoN4vWX/D1hr zHwj3bN7mE1s1e+fWkv8k9SGHwigQ2PqEzXmGDEKWdepGtibBMl71LVxg5TKeoBLLHR/ Ptt39nfLjQKsZw3fsNZ460nmxT4qQS5alR5bj/8ZPuDz4BiH3EFM1bNSZIDiwb+Bafx4 SgaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RNGgCJKU; 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 f37-20020a05622a1a2500b003b69e2f6565si532679qtb.105.2023.01.26.03.29.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:29:39 -0800 (PST) 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=RNGgCJKU; 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 1pL0LV-0002yX-I2; Thu, 26 Jan 2023 06:23:09 -0500 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 1pL0LQ-0002ac-Tn for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:05 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LO-0003eA-KK for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:04 -0500 Received: by mail-wr1-x435.google.com with SMTP id m14so968895wrg.13 for ; Thu, 26 Jan 2023 03:23:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=Pfi1W0xHLZWf1PK1ikWIAw2bTkm2srMITC6ITRXr/yk=; b=RNGgCJKULw+PA4CaChhuYH4tryI/8HPPO2QOTlkZc7nfkWLdd2tFGe3KE16bRNfLmt J2D3OpPxGvxJHBVyVQl1yZm+L6FGVF4kVcRAKXiOvepGZi8o7eixbjquu1t2My3z0jyF y6lgd6YF8Jxh8aYxd8POoFDkrOYmAglaAgArR++w3J4iySUq2z5C85mw1Ho38FKBawfv bEO30A1rCjRCUsniNmCCqBZRXkU5XnzEhAR01oOcb9KLOCLpTOxZVS9gIej0VFgVJRVw JVvXDGXMnnSe6olfaLqxPBP9SJnx5LWH3E+NdkE8O6GuCQRUHdDJQ1GSw4OKEt//WXjj gqkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Pfi1W0xHLZWf1PK1ikWIAw2bTkm2srMITC6ITRXr/yk=; b=M8DFYZWq26xmRRVMzJIpi13bbffzWaJGNiVBLoPXTIfObg4DWwIuOlypFrC5MQXz4T XUeOatuo7lGRLi9VNNPfmyi7c4xop9aPzu4SDCv0BrRVDrA+6M2mxSpYzFfyrvTumJLp n85b4u1T3sfqTOFS7lPESULtDuK4EaAo4TnFrswQdgcz64SfYFK5UYd/BsYdwQZuAEx4 xCiDC7rogjRxil8Rk5pb4a2pL/Xl1hCQKeF62WG0xNWsCvCP2gATlWCp1sZk/Qacc9Kd kwmObYFuQD0/h8zPNFVCXmQDuLfct5taOUfKP/X/v2ZztMQYBTDiQLABSVgUMgTfcUyN CFjg== X-Gm-Message-State: AO0yUKVoKQxK6XaSF28QgbIl5YD483ukRXWIk/E/ebP8pseUKQfs7u1H OxhDvLz+adAkN80I4DfH8wIssw== X-Received: by 2002:a5d:4b8a:0:b0:2bf:af4a:281f with SMTP id b10-20020a5d4b8a000000b002bfaf4a281fmr8422673wrt.18.1674732181782; Thu, 26 Jan 2023 03:23:01 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id e2-20020adfe382000000b002bfae43109fsm1024163wrm.93.2023.01.26.03.22.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1EBA31FFC3; Thu, 26 Jan 2023 11:22:56 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Ben?= =?utf-8?q?n=C3=A9e?= Subject: [PULL 18/35] MAINTAINERS: Fix the entry for tests/tcg/nios2 Date: Thu, 26 Jan 2023 11:22:33 +0000 Message-Id: <20230126112250.2584701-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Thomas Huth tests/tcg/nios2/Makefile.target has accidentally been added to the Microblaze section. Move it into the correct nios2 section instead - and while we're at it, it should also cover the whole folder, and not only the Makefile. Fixes: 67f80eb4d0 ("tests/tcg: enable debian-nios2-cross for test building") Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230119130326.2030297-1-thuth@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-19-alex.bennee@linaro.org> diff --git a/MAINTAINERS b/MAINTAINERS index c581c11a64..629ab5bbb1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -240,7 +240,6 @@ F: target/microblaze/ F: hw/microblaze/ F: disas/microblaze.c F: tests/docker/dockerfiles/debian-microblaze-cross.d/build-toolchain.sh -F: tests/tcg/nios2/Makefile.target MIPS TCG CPUs M: Philippe Mathieu-Daudé @@ -262,6 +261,7 @@ F: hw/nios2/ F: disas/nios2.c F: configs/devices/nios2-softmmu/default.mak F: tests/docker/dockerfiles/debian-nios2-cross.d/build-toolchain.sh +F: tests/tcg/nios2/ OpenRISC TCG CPUs M: Stafford Horne From patchwork Thu Jan 26 11:22:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647118 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188913pvb; Thu, 26 Jan 2023 03:32:29 -0800 (PST) X-Google-Smtp-Source: AMrXdXu5N8Q63uclffdGoYmCNLu3JadtCiIPIclHYU6gi1KuNRsZmXgjyf4eAn2cHq/V18Jz2S+M X-Received: by 2002:ad4:5c46:0:b0:536:ba5e:6a8d with SMTP id a6-20020ad45c46000000b00536ba5e6a8dmr45328540qva.22.1674732749669; Thu, 26 Jan 2023 03:32:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732749; cv=none; d=google.com; s=arc-20160816; b=d54tBiQ5OXpO28jF08eVK+730jjjBtstGfD7SC6n6nYzc9AxR49nf3pSeqMaCZ2bgF oEaqgwTNonzSARTvnhM8UdF3jjOqwtn95Ninx+v2SlC+atMw1ltZLyoUqFHuroT9UHJy 6cS6RzOmh1cPMkpcgSTg6OoyMNNZEh9FkK4YTP+CWltAFsIJB7ROp64UHfgJt5iRnkbv 8Mb90f6qyfXOnHf6IuG7REEi4kYLZwIaAp2fHKY+vM3kVJL6wXaHxsPkS8GflPCb6oO/ EHN30wWo5lWHTqWRB8S6BI17SFFKz9HhPV0tXNyCVCXGB9TttOJHwnXvtBBKADfSX1ZK 3R/g== 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=y/TiS+4tqDBwIwjrw4zNyDX1puegvZLYhxI4wXR7ikA=; b=ESP1zY851/3BWfq1+TyKrkcF6XPFBT3/+VXe6ukVd2mDOW00KxwE5NXg/GMXn5CDlI nSJF7qqsWq4oahdTWEDp11HhgB+40dAH3613cLQlgpqP9BWaCh75mhbYjeDZp9TT/ZjW UiXHnRCieDcw84dggh3S38HTolTZSzeoafGQBMCXSvJkH+BcQ4R6u6XRl2zYlUCDOnkN Eil9eYucnB+sIMXE9JjySnnMc37HTBaPdyFYHvhd9FZ/58gDFqz2HNHH/WtKEMDeVEjU d3AIrF4khJzignztQXugNFzxX2PDEhkK0rdT/q2WSoPR9jD9G6FEyR1vooXQjzSLhi+9 lrKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="mIC1QYV/"; 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 139-20020a370b91000000b006ea960d8852si807096qkl.303.2023.01.26.03.32.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:32:29 -0800 (PST) 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="mIC1QYV/"; 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 1pL0UD-00052l-FT; Thu, 26 Jan 2023 06:32:09 -0500 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 1pL0U8-0004bt-C8 for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:32:04 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0U4-0007nn-4U for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:32:03 -0500 Received: by mail-wm1-x32f.google.com with SMTP id e19-20020a05600c439300b003db1cac0c1fso3048301wmn.5 for ; Thu, 26 Jan 2023 03:31:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=y/TiS+4tqDBwIwjrw4zNyDX1puegvZLYhxI4wXR7ikA=; b=mIC1QYV/4deeDlFHTKHGkTHjkRS+15YrKTdotMr/AsOMqZF6nZcCzevrHO9TvMKe9q pRkhyvH8gK4BkJI66rSVUDS6EcZ8+j4hdMR1313m4U4f9NCSTp+sykF87hLbR/n0M3ZM xRUAqKBxZ0gjGGKJD0/2F/Q4tIRM1ddgdBMRQd7vmRkF3frOpQwwdiK6POAXEKgDUUoP jIHlXDClNXC2MGts6ZmvbyQlPzarOaaNr54Pykaz5nNafjGzB6hvJUuZM1GWde8+ebDM EKSPXVTTNTlJQQwpGkns8Jb733WRJNIMs0X2S+wn4nojGt0kkhZcU71fdDzr7r3Tl+VV dlRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=y/TiS+4tqDBwIwjrw4zNyDX1puegvZLYhxI4wXR7ikA=; b=tVJH+WtjrWRRSXnH82gl/kSAzvmddrFgE2jdTNHb7wMqqRSlYRE7nIcUvmYJZ78QGc MK9YTEkfe+yUWfY2G6/+V+0OjfUt14CmUAPmjErSZ/xlBwP07YqciXETRvmebWOV14nF nuH7Z+FgRxnMd/IeAqawqXEbmfBwhKAf5iN3x/Q1ALZQjRqwjQxzaqmyZrdkQs5teUPw hPbhQpbZZRjz3oMijZnQxmrARBZLyk0bpw1xukjTLU7DkaW1tF4s3uc/K08iyG4iyDVS RvYPlm+R17hdoFS3PHCaoympe5MKviWxqvErfDpbnM9HWK0wn+ojFgloJ8A8fRVoxzFA um+A== X-Gm-Message-State: AFqh2kre8IpRt606uNFm7uKzt6uQf91zSTbkGEsJCfBizjjO8e3AQQE6 83PWbTPDXZw4cfThCk/HcOFYc0dMvXdF2kAA X-Received: by 2002:a1c:f617:0:b0:3d2:191d:2420 with SMTP id w23-20020a1cf617000000b003d2191d2420mr33473508wmc.7.1674732718479; Thu, 26 Jan 2023 03:31:58 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o7-20020a05600c2e0700b003dafa04ecc4sm1188580wmf.6.2023.01.26.03.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:31:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6F5341FFB8; Thu, 26 Jan 2023 11:22:56 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PULL 19/35] docs: add hotlinks to about preface text Date: Thu, 26 Jan 2023 11:22:34 +0000 Message-Id: <20230126112250.2584701-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Make it easier to navigate the documentation. Reviewed-by: Peter Maydell Acked-by: Richard Henderson Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230124180127.1881110-20-alex.bennee@linaro.org> diff --git a/docs/about/index.rst b/docs/about/index.rst index 5bea653c07..bae1309cc6 100644 --- a/docs/about/index.rst +++ b/docs/about/index.rst @@ -5,19 +5,19 @@ About QEMU QEMU is a generic and open source machine emulator and virtualizer. QEMU can be used in several different ways. The most common is for -"system emulation", where it provides a virtual model of an +:ref:`System Emulation`, where it provides a virtual model of an entire machine (CPU, memory and emulated devices) to run a guest OS. -In this mode the CPU may be fully emulated, or it may work with -a hypervisor such as KVM, Xen, Hax or Hypervisor.Framework to -allow the guest to run directly on the host CPU. +In this mode the CPU may be fully emulated, or it may work with a +hypervisor such as KVM, Xen, Hax or Hypervisor.Framework to allow the +guest to run directly on the host CPU. -The second supported way to use QEMU is "user mode emulation", +The second supported way to use QEMU is :ref:`User Mode Emulation`, where QEMU can launch processes compiled for one CPU on another CPU. In this mode the CPU is always emulated. -QEMU also provides a number of standalone commandline utilities, -such as the ``qemu-img`` disk image utility that allows you to create, -convert and modify disk images. +QEMU also provides a number of standalone :ref:`command line +utilities`, such as the ``qemu-img`` disk image utility that +allows you to create, convert and modify disk images. .. toctree:: :maxdepth: 2 diff --git a/docs/system/index.rst b/docs/system/index.rst index e3695649c5..282b6ffb56 100644 --- a/docs/system/index.rst +++ b/docs/system/index.rst @@ -1,3 +1,5 @@ +.. _System Emulation: + ---------------- System Emulation ---------------- diff --git a/docs/tools/index.rst b/docs/tools/index.rst index 1edd5a8054..2151adcf78 100644 --- a/docs/tools/index.rst +++ b/docs/tools/index.rst @@ -1,3 +1,5 @@ +.. _Tools: + ----- Tools ----- diff --git a/docs/user/index.rst b/docs/user/index.rst index 2c4e29f3db..782d27cda2 100644 --- a/docs/user/index.rst +++ b/docs/user/index.rst @@ -1,3 +1,5 @@ +.. _User Mode Emulation: + ------------------- User Mode Emulation ------------------- From patchwork Thu Jan 26 11:22:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647090 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp185604pvb; Thu, 26 Jan 2023 03:23:42 -0800 (PST) X-Google-Smtp-Source: AK7set+KmRAYDd168BxL9hTfAkm5bqiDjGTeMll1ErVIPn7A2FhU9ydKn3IcdA1Hhg9lRPS3bi6l X-Received: by 2002:a05:6214:1712:b0:537:ab77:fbd9 with SMTP id db18-20020a056214171200b00537ab77fbd9mr1358378qvb.28.1674732222289; Thu, 26 Jan 2023 03:23:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732222; cv=none; d=google.com; s=arc-20160816; b=oARUWkR7ZMh99k90wN3ExQ+ukuj/iEIQ7ultjCwlK8jCtG+gXQgGBimUbJlh9DqwPH W48FpCFR1Y1hz3mb/W/DLY0e7R9PgzQTYq8kM508gaLx/vAtkx5CMFC+XNH8sEmsF1/6 wVX62A3wIA9JEZ5iqFjZURKiXEMRlfWQDhB4GAvv7x65K2i5wiUVwwDBmoDX4A797RUJ 06dScYpXd9d+sCEeEYCeaCzpUdEOeo6R69shGfyFYDq47oSZYEr/YO4gXmUnbAOCRVCD vZNkMixeM65IY29VTwQ/Q9OwcdYHaSbckAwr70gWvJEpMuaMt/SAkVUwobbA+64DTajE PF6A== 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=SSF1EEW5P8K/ZY5KGpCY9LUtrhXdSdbhv1qq20jYFBc=; b=yJLUdBkPWUuvXM2vFjkSxK33AKV4TQ9FnVbeEGM95u2S2uifTCKC9yydgmXDxQw+/H uzC6AlvVAV07QVfOWAArCy0/XVEG3MZqlm6suzDhiZ87MMCwssLX8Hkb8QAoCr+R7Ab2 sujpujOY2R4MWkCDcwSEFogHNh52WTKXgcoNkGuBBajVIhPlo6tmcG3rMz/xSSWUhCm4 HVgu09+3s2p4b3V3X/93IThuWl13m0Ypxu0/bICzQDiziQanudeiJMtcOoKbaAOjpyZC mr+Wz6457ruFYhhO4aln4KHI5kAHDN8J7Fh20us1wtDznAM6BSBuWTvBea9555lcPASs UoWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EPpwEbYH; 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 ld13-20020a056214418d00b0053559cef1ddsi641937qvb.139.2023.01.26.03.23.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:23:42 -0800 (PST) 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=EPpwEbYH; 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 1pL0LV-0002yJ-Fs; Thu, 26 Jan 2023 06:23:09 -0500 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 1pL0LS-0002jI-Hc for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:06 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LQ-00044a-DG for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:06 -0500 Received: by mail-wm1-x334.google.com with SMTP id l41-20020a05600c1d2900b003daf986faaeso892472wms.3 for ; Thu, 26 Jan 2023 03:23:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=SSF1EEW5P8K/ZY5KGpCY9LUtrhXdSdbhv1qq20jYFBc=; b=EPpwEbYH1ukoq2zOoXwFTYhPtGxnyD5BSpIUk+vtHisbiITJQfjnte+21i5SkeOi3I ApZSvEMsbe7CVHPIw9PpkuIJbr9G02lvFBRAfQnlmVY3AJd27NlOVUfIKqLzMMtmcuIp iaqYrxLULGyn0pG45dEdOnqWg1wOV7sqtiRNIByrJK2xPqCp2niIdR6WnFk/qn8POTVX A6HP0wsAfDgk+mvsxgF/p+QS2BEib4L2ksiJ0aEHjiZuGEDxhNZm7up/Gm0QLukaYYgC 6fXIPlkbk/TD/2SM6NDD0do99i2MZvPiqlv+9DWgYTck/txOZQ2LeOGx6d4cmFutfcu4 eUvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=SSF1EEW5P8K/ZY5KGpCY9LUtrhXdSdbhv1qq20jYFBc=; b=JISHoMuDx+DqraCB63I2Kqmh9M5aqVkaBNuxNmaLFUm2H6AQpbyTNhlCOiXlj8gv4j 8WESH4lMqC27a3nQ+DCuSPlgEU2/qO/0KSWrIP/Y5G+7OQ7UJMlW8jaDTg3zPA2fBVs2 urRt8osJDF1ynhbWFXZFP27kwMlFaSxDI3XtDH6FS5SkyJAK8O/hR5fkcQ7CeJ/94CxC w/P9ggRf3ZR/BFPeP9wfcwZ6sKh+cT4zZdV/Buc+bXopU75D+56zfkNlYD+HIwj4Pm3H qQ8Utk41/v7ZEC3i596RpYwE4YMo5GgOKxwOi9SFb7esUqxRU2MlhiEUteCoye74Zdnf zZdg== X-Gm-Message-State: AFqh2krdRXWdYjJbiRb6BMdi4JrUzbajyBpLI8O/bbisgU+RS1ejECZg 1HJqyK+vK4T2LvgPWJ238k/7jzPN/NSM7oZq X-Received: by 2002:a05:600c:3d98:b0:3d6:ecc4:6279 with SMTP id bi24-20020a05600c3d9800b003d6ecc46279mr32010331wmb.27.1674732182707; Thu, 26 Jan 2023 03:23:02 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n24-20020a7bcbd8000000b003daf7721bb3sm4156811wmi.12.2023.01.26.03.22.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:23:01 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B67971FFBE; Thu, 26 Jan 2023 11:22:56 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Alexandre Iooss , Mahmoud Mandour , Paolo Bonzini Subject: [PULL 20/35] docs: add a new section to outline emulation support Date: Thu, 26 Jan 2023 11:22:35 +0000 Message-Id: <20230126112250.2584701-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This affects both system and user mode emulation so we should probably list it up front. Acked-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-21-alex.bennee@linaro.org> diff --git a/docs/about/emulation.rst b/docs/about/emulation.rst new file mode 100644 index 0000000000..7ec7e09381 --- /dev/null +++ b/docs/about/emulation.rst @@ -0,0 +1,103 @@ +Emulation +========= + +QEMU's Tiny Code Generator (TCG) provides the ability to emulate a +number of CPU architectures on any supported host platform. Both +:ref:`System Emulation` and :ref:`User Mode Emulation` are supported +depending on the guest architecture. + +.. list-table:: Supported Guest Architectures for Emulation + :widths: 30 10 10 50 + :header-rows: 1 + + * - Architecture (qemu name) + - System + - User + - Notes + * - Alpha + - Yes + - Yes + - Legacy 64 bit RISC ISA developed by DEC + * - Arm (arm, aarch64) + - :ref:`Yes` + - Yes + - Wide range of features, see :ref:`Arm Emulation` for details + * - AVR + - :ref:`Yes` + - No + - 8 bit micro controller, often used in maker projects + * - Cris + - Yes + - Yes + - Embedded RISC chip developed by AXIS + * - Hexagon + - No + - Yes + - Family of DSPs by Qualcomm + * - PA-RISC (hppa) + - Yes + - Yes + - A legacy RISC system used in HP's old minicomputers + * - x86 (i386, x86_64) + - :ref:`Yes` + - Yes + - The ubiquitous desktop PC CPU architecture, 32 and 64 bit. + * - Loongarch + - Yes + - Yes + - A MIPS-like 64bit RISC architecture developed in China + * - m68k + - :ref:`Yes` + - Yes + - Motorola 68000 variants and ColdFire + * - Microblaze + - Yes + - Yes + - RISC based soft-core by Xilinx + * - MIPS (mips*) + - :ref:`Yes` + - Yes + - Venerable RISC architecture originally out of Stanford University + * - Nios2 + - Yes + - Yes + - 32 bit embedded soft-core by Altera + * - OpenRISC + - :ref:`Yes` + - Yes + - Open source RISC architecture developed by the OpenRISC community + * - Power (ppc, ppc64) + - :ref:`Yes` + - Yes + - A general purpose RISC architecture now managed by IBM + * - RISC-V + - :ref:`Yes` + - Yes + - An open standard RISC ISA maintained by RISC-V International + * - RX + - :ref:`Yes` + - No + - A 32 bit micro controller developed by Renesas + * - s390x + - :ref:`Yes` + - Yes + - A 64 bit CPU found in IBM's System Z mainframes + * - sh4 + - Yes + - Yes + - A 32 bit RISC embedded CPU developed by Hitachi + * - SPARC (sparc, sparc64) + - :ref:`Yes` + - Yes + - A RISC ISA originally developed by Sun Microsystems + * - Tricore + - Yes + - No + - A 32 bit RISC/uController/DSP developed by Infineon + * - Xtensa + - :ref:`Yes` + - Yes + - A configurable 32 bit soft core now owned by Cadence + +A number of features are are only available when running under +emulation including :ref:`Record/Replay` and :ref:`TCG Plugins`. diff --git a/docs/about/index.rst b/docs/about/index.rst index bae1309cc6..b00b584b31 100644 --- a/docs/about/index.rst +++ b/docs/about/index.rst @@ -23,6 +23,7 @@ allows you to create, convert and modify disk images. :maxdepth: 2 build-platforms + emulation deprecated removed-features license diff --git a/docs/devel/tcg-plugins.rst b/docs/devel/tcg-plugins.rst index 9740a70406..81dcd43a61 100644 --- a/docs/devel/tcg-plugins.rst +++ b/docs/devel/tcg-plugins.rst @@ -3,6 +3,8 @@ Copyright (c) 2019, Linaro Limited Written by Emilio Cota and Alex Bennée +.. _TCG Plugins: + QEMU TCG Plugins ================ diff --git a/docs/system/arm/emulation.rst b/docs/system/arm/emulation.rst index b33d7c28dc..b87e064d9d 100644 --- a/docs/system/arm/emulation.rst +++ b/docs/system/arm/emulation.rst @@ -1,3 +1,5 @@ +.. _Arm Emulation: + A-profile CPU architecture support ================================== From patchwork Thu Jan 26 11:22:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647115 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188802pvb; Thu, 26 Jan 2023 03:32:12 -0800 (PST) X-Google-Smtp-Source: AK7set9ayll/BmZrdiDwTwIpuGXYMf90SpVsQjbPhr3n4yJWAdtPMT+VDYTHLolnN8Rva++yqKtc X-Received: by 2002:ad4:4e05:0:b0:537:632d:11d1 with SMTP id dl5-20020ad44e05000000b00537632d11d1mr1493089qvb.25.1674732732199; Thu, 26 Jan 2023 03:32:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732732; cv=none; d=google.com; s=arc-20160816; b=CHmoBRCufzEegqOgkiPlc8gxMjV2tFoSU9q99Gt/QqbBCwSRw8tb8D8fMT7SBzs+aD /Okq3H6uCPebmMWWj7/IGwQ3HMGqO+YsVhUXufycZdsLqnKgdbCK6Xs0dmdT1sQnzc15 lASkzToccnZdy92GHdTKGS/G3dgexneoqw76UmeY7apGGW1ce2DKNdaxPfTtTqYPi/p6 6jrxTAPWBybV5UP2lwTp/2yQS8V0Sjmn8OfuQEUoC8jfxOVDYIXw9y/QXqe5n6fauIhB ZOzrWfvIBqXpkAUyh15+pk/Z/2Vn9XW//WrbwpD7dakJRYymwwVM/XTPhrZr0N+RXw5e dvMw== 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=yNzmMM0/3BQDahEZFPzAsDhN6zKpXbSxcLNK930hAI4=; b=UQP7bmBRcCo7cs3jMliCCWxnNq2CSyKwMTIxQHp59nWvZ6jpCCnotZTKXU4hJehk25 /NyjqfwH4HfIeuf6JDrbg6wTKKrce5yApQFNi7e3cFFSQe59g4iSeWTqo4kmGAVGhqwZ i333IoPPwsdUtIvpOZDvGADQTfa7JVIWsbxlWvfI0Lr7WoP61L2xHo+wq3qfTRHhL3s+ bGjCj270Khh1WzFli2O9veuVWhSUnz8R5R1lLqvaZJKJLyV83BTN4jApi3wf3zI5PCID /70jpp/zZ+NReq2aWDNbIvaVeAsUZmCqyx4YOE1MpZCalVbINWvTvQSzhRC6i0UJ+nQq WmaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=prSANjbg; 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 pv2-20020ad45482000000b00530d04281d7si618741qvb.232.2023.01.26.03.32.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:32:12 -0800 (PST) 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=prSANjbg; 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 1pL0UE-000589-8s; Thu, 26 Jan 2023 06:32:10 -0500 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 1pL0U8-0004dt-Hc for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:32:04 -0500 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 1pL0U6-0007oN-0J for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:32:03 -0500 Received: by mail-wm1-x331.google.com with SMTP id m5-20020a05600c4f4500b003db03b2559eso905085wmq.5 for ; Thu, 26 Jan 2023 03:32:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=yNzmMM0/3BQDahEZFPzAsDhN6zKpXbSxcLNK930hAI4=; b=prSANjbgBfQCY52O/+e13tQUPttSm96susxd9wAfyNTzQ8As5ZaaKPWMQY1ovHB1i+ U50R7MG4R5+p5MAXWSm4x2yAQqidq+l/T0rdut52Y9g1WTluKPCFrVqQTykQrXLklXbB yssdPak2r3yQmbYIKGP/NTnidMpPrd+9mbpAt6ju1uZWeYFxpdrQioe0oc/fTRStW3Mn eMq2nfpg4uqS5eV1DVi4O6EhbPgTy+OXlzIkbLIX6WMfsxEF+A6igEPfR7pRXEFe0LC9 TNGHlBC71g23eyIfNfPiHGZqva8dyxBmX78yQ7yiSS4nE2g1vvBrTPnJIxSQ6eeq5YlR eFgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=yNzmMM0/3BQDahEZFPzAsDhN6zKpXbSxcLNK930hAI4=; b=tgq2OTKLkPWtlzZv7cjqLJnoZTs5elimd4yO4JjWm5V4ZbD7K2AM99oXycHORtxiCk Suow/E9LmL7Rvusc5ueYgQTpPAtbfgUsoeKJfc1sziHXcvSQmwn7dLd+Wr0MfHRKRJBH DMBRMjVQhJC6fOXF98oBuSshJGgHisNrF4453p30Vm/hKeI9moh2jht1czjRpA+n8KF/ H33gPn/RArFkCg1cor3q3oEygV/zp8dxfxaEAvrz2yUIlYI5ocDvN5xlIcWpqnYUuFYb IUEehMhRn0jMIkwsC5ypWcBoo0YHA2gx/FQ4GSpM9CsNr3Fja50dv07+qvkZ7IR0QG5N 1C3w== X-Gm-Message-State: AO0yUKVqqqTomXgG6oCjq1Ludyx8K+pRUDx5UNf+P6R+YyO73w+i83A7 p1FwCJLdqyK3jtTa1l9kOEXilA== X-Received: by 2002:a05:600c:310c:b0:3dc:18de:b20d with SMTP id g12-20020a05600c310c00b003dc18deb20dmr7311976wmo.33.1674732719895; Thu, 26 Jan 2023 03:31:59 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h17-20020a05600c415100b003da2932bde0sm1483128wmm.23.2023.01.26.03.31.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:31:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 090091FFC5; Thu, 26 Jan 2023 11:22:57 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Subject: [PULL 21/35] semihosting: add semihosting section to the docs Date: Thu, 26 Jan 2023 11:22:36 +0000 Message-Id: <20230126112250.2584701-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-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=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 main reason to do this is to document our O_BINARY implementation decision somewhere. However I've also moved some of the implementation details out of qemu-options and added links between the two. As a bonus I've highlighted the scary warnings about host access with the appropriate RST tags. Acked-by: Richard Henderson Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-22-alex.bennee@linaro.org> diff --git a/docs/about/emulation.rst b/docs/about/emulation.rst index 7ec7e09381..635b085732 100644 --- a/docs/about/emulation.rst +++ b/docs/about/emulation.rst @@ -101,3 +101,92 @@ depending on the guest architecture. A number of features are are only available when running under emulation including :ref:`Record/Replay` and :ref:`TCG Plugins`. + +.. _Semihosting: + +Semihosting +----------- + +Semihosting is a feature defined by the owner of the architecture to +allow programs to interact with a debugging host system. On real +hardware this is usually provided by an In-circuit emulator (ICE) +hooked directly to the board. QEMU's implementation allows for +semihosting calls to be passed to the host system or via the +``gdbstub``. + +Generally semihosting makes it easier to bring up low level code before a +more fully functional operating system has been enabled. On QEMU it +also allows for embedded micro-controller code which typically doesn't +have a full libc to be run as "bare-metal" code under QEMU's user-mode +emulation. It is also useful for writing test cases and indeed a +number of compiler suites as well as QEMU itself use semihosting calls +to exit test code while reporting the success state. + +Semihosting is only available using TCG emulation. This is because the +instructions to trigger a semihosting call are typically reserved +causing most hypervisors to trap and fault on them. + +.. warning:: + Semihosting inherently bypasses any isolation there may be between + the guest and the host. As a result a program using semihosting can + happily trash your host system. You should only ever run trusted + code with semihosting enabled. + +Redirection +~~~~~~~~~~~ + +Semihosting calls can be re-directed to a (potentially remote) gdb +during debugging via the :ref:`gdbstub`. Output to the +semihosting console is configured as a ``chardev`` so can be +redirected to a file, pipe or socket like any other ``chardev`` +device. + +See :ref:`Semihosting Options` for details. + +Supported Targets +~~~~~~~~~~~~~~~~~ + +Most targets offer similar semihosting implementations with some +minor changes to define the appropriate instruction to encode the +semihosting call and which registers hold the parameters. They tend to +presents a simple POSIX-like API which allows your program to read and +write files, access the console and some other basic interactions. + +For full details of the ABI for a particular target, and the set of +calls it provides, you should consult the semihosting specification +for that architecture. + +.. note:: + QEMU makes an implementation decision to implement all file + access in ``O_BINARY`` mode. The user-visible effect of this is + regardless of the text/binary mode the program sets QEMU will + always select a binary mode ensuring no line-terminator conversion + is performed on input or output. This is because gdb semihosting + support doesn't make the distinction between the modes and + magically processing line endings can be confusing. + +.. list-table:: Guest Architectures supporting Semihosting + :widths: 10 10 80 + :header-rows: 1 + + * - Architecture + - Modes + - Specification + * - Arm + - System and User-mode + - https://github.com/ARM-software/abi-aa/blob/main/semihosting/semihosting.rst + * - m68k + - System + - https://sourceware.org/git/?p=newlib-cygwin.git;a=blob;f=libgloss/m68k/m68k-semi.txt;hb=HEAD + * - MIPS + - System + - Unified Hosting Interface (MD01069) + * - Nios II + - System + - https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;a=blob;f=libgloss/nios2/nios2-semi.txt;hb=HEAD + * - RISC-V + - System and User-mode + - https://github.com/riscv/riscv-semihosting-spec/blob/main/riscv-semihosting-spec.adoc + * - Xtensa + - System + - Tensilica ISS SIMCALL diff --git a/qemu-options.hx b/qemu-options.hx index d59d19704b..4508a00c59 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4633,10 +4633,13 @@ DEF("semihosting", 0, QEMU_OPTION_semihosting, QEMU_ARCH_MIPS | QEMU_ARCH_NIOS2 | QEMU_ARCH_RISCV) SRST ``-semihosting`` - Enable semihosting mode (ARM, M68K, Xtensa, MIPS, Nios II, RISC-V only). + Enable :ref:`Semihosting` mode (ARM, M68K, Xtensa, MIPS, Nios II, RISC-V only). - Note that this allows guest direct access to the host filesystem, so - should only be used with a trusted guest OS. + .. warning:: + Note that this allows guest direct access to the host filesystem, so + should only be used with a trusted guest OS. + + .. _Semihosting Options: See the -semihosting-config option documentation for further information about the facilities this enables. @@ -4648,22 +4651,12 @@ QEMU_ARCH_ARM | QEMU_ARCH_M68K | QEMU_ARCH_XTENSA | QEMU_ARCH_MIPS | QEMU_ARCH_NIOS2 | QEMU_ARCH_RISCV) SRST ``-semihosting-config [enable=on|off][,target=native|gdb|auto][,chardev=id][,userspace=on|off][,arg=str[,...]]`` - Enable and configure semihosting (ARM, M68K, Xtensa, MIPS, Nios II, RISC-V + Enable and configure :ref:`Semihosting` (ARM, M68K, Xtensa, MIPS, Nios II, RISC-V only). - Note that this allows guest direct access to the host filesystem, so - should only be used with a trusted guest OS. - - On Arm this implements the standard semihosting API, version 2.0. - - On M68K this implements the "ColdFire GDB" interface used by - libgloss. - - Xtensa semihosting provides basic file IO calls, such as - open/read/write/seek/select. Tensilica baremetal libc for ISS and - linux platform "sim" use this interface. - - On RISC-V this implements the standard semihosting API, version 0.2. + .. warning:: + Note that this allows guest direct access to the host filesystem, so + should only be used with a trusted guest OS. ``target=native|gdb|auto`` Defines where the semihosting calls will be addressed, to QEMU From patchwork Thu Jan 26 11:22:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647117 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188903pvb; Thu, 26 Jan 2023 03:32:28 -0800 (PST) X-Google-Smtp-Source: AK7set+nGjr6UCbXyPsT8F2y1yT+gmRYkvxdie4T9BMctYZU1xuTxdagS8qfd/CHH4k4modizVko X-Received: by 2002:a0c:e003:0:b0:537:6a1e:d822 with SMTP id j3-20020a0ce003000000b005376a1ed822mr13478060qvk.14.1674732748353; Thu, 26 Jan 2023 03:32:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732748; cv=none; d=google.com; s=arc-20160816; b=D3WtmoL7p7JR3IxUlsKtByASOWQ6LL1alHGG9zkHzUJ0A/6bOmd5msHcFIHka6kgFX nfwf/8RqjVCGKgGJdAEda5djrn59M5XgZ51j56Wt9621kpR1J2CDm29pQUdFHrhzTk5I fRO5E0RFmiBjhUltqn70heyVGZQUVQUkk7ouPXJX2a0ALqqIY5/8JWqrz0u7QuU3fhgh 0G2yiYrXNf1ju9SMjb2p9Puj8xTHY/hXkrPtpX2xivKNCq5jNpdu2xlpElJbXs3GFPIW iRB4Kovh/GxdMrGfGQWV5m26GYCsEBGmY+EvhjDBTbDs8745FwwEp8mTOiHHiP0bn+MH xEmQ== 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=8aQ8+DuEdk5wXV+KFknP/MfdIB14BC+8gU+cPtMz2qM=; b=G3Zf8CdSEsngKCZlk80O2H8q7NvyZ7P1Jpxpf2+8tZUd07M6vY3Jx5Ki7NAey2HS0r erLjGnhERAu2iNntLZj3euzr2bliGxwJomF3xI88DrJ6T8gUFFjiNCPu/wp8P3aFpZpQ Xw3hlDo2OZ/Mjk0OOgycQTkkXglSLlWmTUQ4M0aroY1XzQKPxnsJDIMhg2pNAvjcHfWe zQ5quguysz4A/v4HqNfTXxtmhNu2nyI33e45ZzHAy7MVDLIsPzfIMtsVk+WbmmFnX0iD S9xcxJHGYCiWRHRHdZP4/C1riGuNzMvUb+jolR2oO+sj5MiP/9miusJX7mwp8I6+fF88 sPPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=A9ToJMkO; 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 op33-20020a05621445a100b004ad5edaeeb5si608846qvb.357.2023.01.26.03.32.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:32:28 -0800 (PST) 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=A9ToJMkO; 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 1pL0UH-0005dZ-Ps; Thu, 26 Jan 2023 06:32:13 -0500 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 1pL0U8-0004cF-CD for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:32:04 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0U3-0007ni-Lk for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:32:02 -0500 Received: by mail-wm1-x329.google.com with SMTP id f25-20020a1c6a19000000b003da221fbf48so922959wmc.1 for ; Thu, 26 Jan 2023 03:31:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=8aQ8+DuEdk5wXV+KFknP/MfdIB14BC+8gU+cPtMz2qM=; b=A9ToJMkOgeFHGdfeyy74f6cw4LVU3Pkv7GJd5owrz+NRO1A57qJSgrU/xZEdDNWR2z YWSOSr5XYKUVmF+tAIv4KgXBJcaax55+b6p+BHb5urpVSIovL5uL2IS7cpPJ2VutDo3J VFITUzJZh3PRP3g6qT0zDYTsHKxWNvger0KAkpfPFwO1w289n5xdiCyW8k8YBJ6srgox csyiw4nFwvQqGR81XHxSM9iNc5KfdCFZqs9lFWqhXuV+sV/Bzs3rrH78ce6aQbqnowOa JiF2gNdA7XaO8N3+X7OPfRr0P3YgKpfO+1Ben33waRFbj8OlcxL63m48Dw0ms7z1UW5c BCGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=8aQ8+DuEdk5wXV+KFknP/MfdIB14BC+8gU+cPtMz2qM=; b=H4SihL4RTX77NpDGpfcKyGrxFC9r6qgK4ZZsNAD5qHZz0cUBe6YHbcLU0Emd/9j6cp xZ7UwiBwR5oPvgoHhWINQbJtDqRHzmBqHPBYR/2n0SmP9uFoo8suXTP5VcQnRrDlMUR/ UMLn8+jReOoTmThCQYMh7Q/uGrzxClhgNnvJzRpzPSFmstes7QFOku3ppHy/12ChiblQ UHeiXrvtWTSKnSo0XX+HYuJ7ysClOHcyvBjlS0TslD2J2LjckVpSMJ9ilw5sjc8hRv5v CqPanq/AW7FLSG+aqjcMocALBmKqtpKyxIb1kpCuV7w6hf7K9/7O6CCDxe2csPGHmOfw 0+Xg== X-Gm-Message-State: AFqh2kp9bTFVytYq1ZSbFf1WyAJNKPAxEklGBCl4ylfdVWUk8mlQefif 6dw7ZCWcgTFaD75tGZOq4F2NWw== X-Received: by 2002:a05:600c:210e:b0:3d9:ed30:6a73 with SMTP id u14-20020a05600c210e00b003d9ed306a73mr35044323wml.9.1674732717912; Thu, 26 Jan 2023 03:31:57 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m2-20020a056000180200b002bfb5618ee7sm1056433wrh.91.2023.01.26.03.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:31:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5BAED1FFBF; Thu, 26 Jan 2023 11:22:57 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Kashyap Chamarthy , Markus Armbruster , Elena Ufimtseva , Jagannathan Raman , John G Johnson Subject: [PULL 22/35] docs: add an introduction to the system docs Date: Thu, 26 Jan 2023 11:22:37 +0000 Message-Id: <20230126112250.2584701-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 Drop the frankly misleading quickstart section for a more rounded introduction section. This new section gives an overview of the accelerators as well as a high level introduction to some of the key features of the emulator. We also expand on a general form for a QEMU command line with a hopefully not too scary worked example of what this looks like. Acked-by: Richard Henderson Signed-off-by: Alex Bennée Reviewed-by: Kashyap Chamarthy Message-Id: <20230124180127.1881110-23-alex.bennee@linaro.org> diff --git a/docs/interop/live-block-operations.rst b/docs/interop/live-block-operations.rst index 135784ab33..691429c7af 100644 --- a/docs/interop/live-block-operations.rst +++ b/docs/interop/live-block-operations.rst @@ -4,6 +4,8 @@ This work is licensed under the terms of the GNU GPL, version 2 or later. See the COPYING file in the top-level directory. +.. _Live Block Operations: + ============================ Live Block Device Operations ============================ diff --git a/docs/interop/qemu-qmp-ref.rst b/docs/interop/qemu-qmp-ref.rst index 357effd64f..f94614a0b2 100644 --- a/docs/interop/qemu-qmp-ref.rst +++ b/docs/interop/qemu-qmp-ref.rst @@ -1,3 +1,5 @@ +.. _QMP Ref: + QEMU QMP Reference Manual ========================= diff --git a/docs/system/index.rst b/docs/system/index.rst index 282b6ffb56..3605bbe1ce 100644 --- a/docs/system/index.rst +++ b/docs/system/index.rst @@ -12,7 +12,7 @@ or Hypervisor.Framework. .. toctree:: :maxdepth: 3 - quickstart + introduction invocation device-emulation keys diff --git a/docs/system/introduction.rst b/docs/system/introduction.rst new file mode 100644 index 0000000000..67e01d4beb --- /dev/null +++ b/docs/system/introduction.rst @@ -0,0 +1,220 @@ +Introduction +============ + +Virtualisation Accelerators +--------------------------- + +QEMU's system emulation provides a virtual model of a machine (CPU, +memory and emulated devices) to run a guest OS. It supports a number +of hypervisors (known as accelerators) as well as a JIT known as the +Tiny Code Generator (TCG) capable of emulating many CPUs. + +.. list-table:: Supported Accelerators + :header-rows: 1 + + * - Accelerator + - Host OS + - Host Architectures + * - KVM + - Linux + - Arm (64 bit only), MIPS, PPC, RISC-V, s390x, x86 + * - Xen + - Linux (as dom0) + - Arm, x86 + * - Intel HAXM (hax) + - Linux, Windows + - x86 + * - Hypervisor Framework (hvf) + - MacOS + - x86 (64 bit only), Arm (64 bit only) + * - Windows Hypervisor Platform (wphx) + - Windows + - x86 + * - NetBSD Virtual Machine Monitor (nvmm) + - NetBSD + - x86 + * - Tiny Code Generator (tcg) + - Linux, other POSIX, Windows, MacOS + - Arm, x86, Loongarch64, MIPS, PPC, s390x, Sparc64 + +Feature Overview +---------------- + +System emulation provides a wide range of device models to emulate +various hardware components you may want to add to your machine. This +includes a wide number of VirtIO devices which are specifically tuned +for efficient operation under virtualisation. Some of the device +emulation can be offloaded from the main QEMU process using either +vhost-user (for VirtIO) or :ref:`Multi-process QEMU`. If the platform +supports it QEMU also supports directly passing devices through to +guest VMs to eliminate the device emulation overhead. See +:ref:`device-emulation` for more details. + +There is a full :ref:`featured block layer` +which allows for construction of complex storage topology which can be +stacked across multiple layers supporting redirection, networking, +snapshots and migration support. + +The flexible ``chardev`` system allows for handling IO from character +like devices using stdio, files, unix sockets and TCP networking. + +QEMU provides a number of management interfaces including a line based +:ref:`Human Monitor Protocol (HMP)` that allows you to +dynamically add and remove devices as well as introspect the system +state. The :ref:`QEMU Monitor Protocol` (QMP) is a well +defined, versioned, machine usable API that presents a rich interface +to other tools to create, control and manage Virtual Machines. This is +the interface used by higher level tools interfaces such as `Virt +Manager `_ using the `libvirt framework +`_. + +For the common accelerators QEMU, supported debugging with its +:ref:`gdbstub` which allows users to connect GDB and debug +system software images. + +Running +------- + +QEMU provides a rich and complex API which can be overwhelming to +understand. While some architectures can boot something with just a +disk image, those examples elide a lot of details with defaults that +may not be optimal for modern systems. + +For a non-x86 system where we emulate a broad range of machine types, +the command lines are generally more explicit in defining the machine +and boot behaviour. You will find often find example command lines in +the :ref:`system-targets-ref` section of the manual. + +While the project doesn't want to discourage users from using the +command line to launch VMs, we do want to highlight that there are a +number of projects dedicated to providing a more user friendly +experience. Those built around the ``libvirt`` framework can make use +of feature probing to build modern VM images tailored to run on the +hardware you have. + +That said, the general form of a QEMU command line can be expressed +as: + +.. parsed-literal:: + + $ |qemu_system| [machine opts] \\ + [cpu opts] \\ + [accelerator opts] \\ + [device opts] \\ + [backend opts] \\ + [interface opts] \\ + [boot opts] + +Most options will generate some help information. So for example: + +.. parsed-literal:: + + $ |qemu_system| -M help + +will list the machine types supported by that QEMU binary. ``help`` +can also be passed as an argument to another option. For example: + +.. parsed-literal:: + + $ |qemu_system| -device scsi-hd,help + +will list the arguments and their default values of additional options +that can control the behaviour of the ``scsi-hd`` device. + +.. list-table:: Options Overview + :header-rows: 1 + :widths: 10, 90 + + * - Options + - + * - Machine + - Define the :ref:`machine type`, amount of memory etc + * - CPU + - Type and number/topology of vCPUs. Most accelerators offer + a ``host`` cpu option which simply passes through your host CPU + configuration without filtering out any features. + * - Accelerator + - This will depend on the hypervisor you run. Note that the + default is TCG, which is purely emulated, so you must specify an + accelerator type to take advantage of hardware virtualization. + * - Devices + - Additional devices that are not defined by default with the + machine type. + * - Backends + - Backends are how QEMU deals with the guest's data, for example + how a block device is stored, how network devices see the + network or how a serial device is directed to the outside world. + * - Interfaces + - How the system is displayed, how it is managed and controlled or + debugged. + * - Boot + - How the system boots, via firmware or direct kernel boot. + +In the following example we first define a ``virt`` machine which is a +general purpose platform for running Aarch64 guests. We enable +virtualisation so we can use KVM inside the emulated guest. As the +``virt`` machine comes with some built in pflash devices we give them +names so we can override the defaults later. + +.. code:: + + $ qemu-system-aarch64 \ + -machine type=virt,virtualization=on,pflash0=rom,pflash1=efivars \ + -m 4096 \ + +We then define the 4 vCPUs using the ``max`` option which gives us all +the Arm features QEMU is capable of emulating. We enable a more +emulation friendly implementation of Arm's pointer authentication +algorithm. We explicitly specify TCG acceleration even though QEMU +would default to it anyway. + +.. code:: + + -cpu max,pauth-impdef=on \ + -smp 4 \ + -accel tcg \ + +As the ``virt`` platform doesn't have any default network or storage +devices we need to define them. We give them ids so we can link them +with the backend later on. + +.. code:: + + -device virtio-net-pci,netdev=unet \ + -device virtio-scsi-pci \ + -device scsi-hd,drive=hd \ + +We connect the user-mode networking to our network device. As +user-mode networking isn't directly accessible from the outside world +we forward localhost port 2222 to the ssh port on the guest. + +.. code:: + + -netdev user,id=unet,hostfwd=tcp::2222-:22 \ + +We connect the guest visible block device to an LVM partition we have +set aside for our guest. + +.. code:: + + -blockdev driver=raw,node-name=hd,file.driver=host_device,file.filename=/dev/lvm-disk/debian-bullseye-arm64 \ + +We then tell QEMU to multiplex the :ref:`QEMU monitor` with the serial +port output (we can switch between the two using :ref:`keys in the +character backend multiplexer`). As there is no default graphical +device we disable the display as we can work entirely in the terminal. + +.. code:: + + -serial mon:stdio \ + -display none \ + +Finally we override the default firmware to ensure we have some +storage for EFI to persist its configuration. That firmware is +responsible for finding the disk, booting grub and eventually running +our system. + +.. code:: + + -blockdev node-name=rom,driver=file,filename=(pwd)/pc-bios/edk2-aarch64-code.fd,read-only=true \ + -blockdev node-name=efivars,driver=file,filename=$HOME/images/qemu-arm64-efivars diff --git a/docs/system/multi-process.rst b/docs/system/multi-process.rst index 210531ee17..16f0352416 100644 --- a/docs/system/multi-process.rst +++ b/docs/system/multi-process.rst @@ -1,3 +1,5 @@ +.. _Multi-process QEMU: + Multi-process QEMU ================== diff --git a/docs/system/quickstart.rst b/docs/system/quickstart.rst deleted file mode 100644 index 681678c86e..0000000000 --- a/docs/system/quickstart.rst +++ /dev/null @@ -1,21 +0,0 @@ -.. _pcsys_005fquickstart: - -Quick Start ------------ - -Download and uncompress a PC hard disk image with Linux installed (e.g. -``linux.img``) and type: - -.. parsed-literal:: - - |qemu_system| linux.img - -Linux should boot and give you a prompt. - -Users should be aware the above example elides a lot of the complexity -of setting up a VM with x86_64 specific defaults and assumes the -first non switch argument is a PC compatible disk image with a boot -sector. For a non-x86 system where we emulate a broad range of machine -types, the command lines are generally more explicit in defining the -machine and boot behaviour. You will find more example command lines -in the :ref:`system-targets-ref` section of the manual. diff --git a/qemu-options.hx b/qemu-options.hx index 4508a00c59..fd5347657a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -20,6 +20,9 @@ DEF("version", 0, QEMU_OPTION_version, SRST ``-version`` Display version information and exit + + .. _Machine Options: + ERST DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ From patchwork Thu Jan 26 11:22:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647114 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188795pvb; Thu, 26 Jan 2023 03:32:11 -0800 (PST) X-Google-Smtp-Source: AMrXdXusdXanhBdFkuqWHm+F543kinKTQPkSklQBkw/haGd6S21PupSJMcWiXS4fm1o/PJdtrY6G X-Received: by 2002:ac8:64a:0:b0:3b6:3c62:f727 with SMTP id e10-20020ac8064a000000b003b63c62f727mr44674147qth.62.1674732731383; Thu, 26 Jan 2023 03:32:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732731; cv=none; d=google.com; s=arc-20160816; b=o1L4EQx67joldSSOtr8mQYvyX4Bmf3rfEzc+EUpm4OzdxktcdZ+6tImOhTUYEC1UZg w0oWmmz2iQFn+PWRz2tIwfmH5riuTFuGnyPHqhNSQcjQbkUwVoH6S1/KcpRRYf/bOhO1 l2VoaKwuZWaubLUTfTvJpADD4LV+Q34CVOo9z61n19YLyD32xAJS1q6gZ0P/tja/xypJ lsMwYqxTg2Xj9BsJWVQ2z3WVzFO3K0ec9bzG308HWYDFYxQIM2ob8zuU4N0+Dn6HSD4f 36TyOILrX/r+ntgkqNQJKlMc2Tpp5ZHmYMQROvWWbXXJkAL8KNqHiHwOuxmhngpXQsjp AG0A== 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=QH6WpMBuDha8Hg60KN3NpqiGFmq6gMFj84j8CE60c+o=; b=lfPeOOB+LekPBuBJzvpKE8zlfY/aQwU6v2qazBmmjFH9kbNvsppxmVF+FVsjIX5dwo KZ8DdjmVYVJZN34Oix/xS8mMe6IlFcrb8CCtsnVk/OVWIBs7LTcNvlDlcJTmiwGJjNoV C0nckStbtGN6hP74QAfnyZEm/faCMPFNYdk2AO0UYEYuw3beP51oZ53ODVhwkH5QNv/V eECvOFV/Yt1pKvb955ngWI6GK42fXPX2kcgTJorvA0Cjn98hhYbhANreaevvFvU45ho+ Ea+ihQrLTe4dF5wwcJb67xeMWuwDKXKGZEvK+Xo7tIR7mXDJ7HEua5yuJkQ6KdYDfZ9h yAXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aJc2UDnN; 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 a6-20020a05620a124600b006fccaa125fdsi767003qkl.504.2023.01.26.03.32.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:32:11 -0800 (PST) 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=aJc2UDnN; 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 1pL0UB-0004pu-IC; Thu, 26 Jan 2023 06:32:07 -0500 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 1pL0U6-0004XE-BQ for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:32:03 -0500 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 1pL0U2-0007my-Dq for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:32:00 -0500 Received: by mail-wm1-x32a.google.com with SMTP id fl11-20020a05600c0b8b00b003daf72fc844so3079994wmb.0 for ; Thu, 26 Jan 2023 03:31:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=QH6WpMBuDha8Hg60KN3NpqiGFmq6gMFj84j8CE60c+o=; b=aJc2UDnNkBuDec6zEPLXGbCknirzfZyiBFhTpIRlVvCZBg3RRvfaSKVzmQvvby3VwO HJykG1FyLaCFp3Se0pqQXpOhyminQ/ujo+XAi1GL6XmXo8YYmzuylRIiQXzO1ueqNwcr gtTy+1NLufkiGLnMJ80oQu4c5nEcITwwDqn/utq12P2qRzwTvqSEzzFLTk3/vGX7BR4w jYpPo36I/K/yfYRkNNVp9ENRzrM0ZYieYOh6FEofFyc+O2CJg/HlE7JTqaCjIhVfLeRK OQuVE5BNmcw7F0w2PSsEUpCp4GSLzIqpOZEVY9gK8usITDcJA8PTYf3VADxrin979pZ0 C+2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=QH6WpMBuDha8Hg60KN3NpqiGFmq6gMFj84j8CE60c+o=; b=u5xzTKnVkgZLWEvrjmgGrEyoHdnabw2Ei6Rd7B3OuBL+FI5s27FKQzR+jFmLK53ZuA XfBlQDSPKe2B63XsC4IYLXP6mTaMw/SDsDIRHpq6zq+mkT6J7Q+k923PiGelXXMron5B 4Hdzmxa5ddUYQlRViiIAln2evMJS7Y/vp/pt1q89OKstvobqbSMrZxLKxMnWRVR0Dzim RZksoSRcE61BVNKxr8q3DlbgWaFeIpJVAKcRRkMYd5vbuxcXmZBm7LrPwjlc4ocw8E03 oTr1Yn/kKjF1cHJV4VeI4daca6fFDL/I8lf6P8Yk7O3QWbbqYekTA90K7zkqSFlSrQcI wPJQ== X-Gm-Message-State: AFqh2koZNdCL4rJUKeYhPQYV73lq2sESNL7XuMzvFPx9qtSuv4U/mAEs Ecc0X2fjQprwMzdyV+bMBv+LEQ== X-Received: by 2002:a1c:ed1a:0:b0:3da:c07:c5fe with SMTP id l26-20020a1ced1a000000b003da0c07c5femr32202186wmh.5.1674732716805; Thu, 26 Jan 2023 03:31:56 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id r20-20020a05600c35d400b003db16770bc5sm5096076wmq.6.2023.01.26.03.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:31:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9295D1FFC7; Thu, 26 Jan 2023 11:22:57 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Keith Packard , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PULL 23/35] semihosting: Write back semihosting data before completion callback Date: Thu, 26 Jan 2023 11:22:38 +0000 Message-Id: <20230126112250.2584701-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-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 From: Keith Packard 'lock_user' allocates a host buffer to shadow a target buffer, 'unlock_user' copies that host buffer back to the target and frees the host memory. If the completion function uses the target buffer, it must be called after unlock_user to ensure the data are present. This caused the arm-compatible TARGET_SYS_READC to fail as the completion function, common_semi_readc_cb, pulled data from the target buffer which would not have been gotten the console data. I decided to fix all instances of this pattern instead of just the console_read function to make things consistent and potentially fix bugs in other cases. Signed-off-by: Keith Packard Reviewed-by: Richard Henderson Message-Id: <20221012014822.1242170-1-keithp@keithp.com> Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230124180127.1881110-24-alex.bennee@linaro.org> diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c index 5893c760c5..ba28194b59 100644 --- a/semihosting/syscalls.c +++ b/semihosting/syscalls.c @@ -319,11 +319,11 @@ static void host_read(CPUState *cs, gdb_syscall_complete_cb complete, } ret = RETRY_ON_EINTR(read(gf->hostfd, ptr, len)); if (ret == -1) { - complete(cs, -1, errno); unlock_user(ptr, buf, 0); + complete(cs, -1, errno); } else { - complete(cs, ret, 0); unlock_user(ptr, buf, ret); + complete(cs, ret, 0); } } @@ -339,8 +339,8 @@ static void host_write(CPUState *cs, gdb_syscall_complete_cb complete, return; } ret = write(gf->hostfd, ptr, len); - complete(cs, ret, ret == -1 ? errno : 0); unlock_user(ptr, buf, 0); + complete(cs, ret, ret == -1 ? errno : 0); } static void host_lseek(CPUState *cs, gdb_syscall_complete_cb complete, @@ -426,8 +426,8 @@ static void host_stat(CPUState *cs, gdb_syscall_complete_cb complete, ret = -1; } } - complete(cs, ret, err); unlock_user(name, fname, 0); + complete(cs, ret, err); } static void host_remove(CPUState *cs, gdb_syscall_complete_cb complete, @@ -444,8 +444,8 @@ static void host_remove(CPUState *cs, gdb_syscall_complete_cb complete, } ret = remove(p); - complete(cs, ret, ret ? errno : 0); unlock_user(p, fname, 0); + complete(cs, ret, ret ? errno : 0); } static void host_rename(CPUState *cs, gdb_syscall_complete_cb complete, @@ -469,9 +469,9 @@ static void host_rename(CPUState *cs, gdb_syscall_complete_cb complete, } ret = rename(ostr, nstr); - complete(cs, ret, ret ? errno : 0); unlock_user(ostr, oname, 0); unlock_user(nstr, nname, 0); + complete(cs, ret, ret ? errno : 0); } static void host_system(CPUState *cs, gdb_syscall_complete_cb complete, @@ -488,8 +488,8 @@ static void host_system(CPUState *cs, gdb_syscall_complete_cb complete, } ret = system(p); - complete(cs, ret, ret == -1 ? errno : 0); unlock_user(p, cmd, 0); + complete(cs, ret, ret == -1 ? errno : 0); } static void host_gettimeofday(CPUState *cs, gdb_syscall_complete_cb complete, @@ -554,8 +554,8 @@ static void staticfile_read(CPUState *cs, gdb_syscall_complete_cb complete, } memcpy(ptr, gf->staticfile.data + gf->staticfile.off, len); gf->staticfile.off += len; - complete(cs, len, 0); unlock_user(ptr, buf, len); + complete(cs, len, 0); } static void staticfile_lseek(CPUState *cs, gdb_syscall_complete_cb complete, @@ -608,8 +608,8 @@ static void console_read(CPUState *cs, gdb_syscall_complete_cb complete, return; } ret = qemu_semihosting_console_read(cs, ptr, len); - complete(cs, ret, 0); unlock_user(ptr, buf, ret); + complete(cs, ret, 0); } static void console_write(CPUState *cs, gdb_syscall_complete_cb complete, @@ -624,8 +624,8 @@ static void console_write(CPUState *cs, gdb_syscall_complete_cb complete, return; } ret = qemu_semihosting_console_write(ptr, len); - complete(cs, ret ? ret : -1, ret ? 0 : EIO); unlock_user(ptr, buf, 0); + complete(cs, ret ? ret : -1, ret ? 0 : EIO); } static void console_fstat(CPUState *cs, gdb_syscall_complete_cb complete, From patchwork Thu Jan 26 11:22:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647102 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188192pvb; Thu, 26 Jan 2023 03:30:45 -0800 (PST) X-Google-Smtp-Source: AK7set/zQLpUuH+vAwG0qmVNN7pLH5C4dc8I3lUQWRBbGwH4tjBsJX/7d/SSAAMSyCrjcjDqvUE1 X-Received: by 2002:a05:622a:1111:b0:3b6:334b:2cac with SMTP id e17-20020a05622a111100b003b6334b2cacmr11265331qty.61.1674732644933; Thu, 26 Jan 2023 03:30:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732644; cv=none; d=google.com; s=arc-20160816; b=EuyGU0+zOzlpz8lsWiVy4y/7EkEexCT0cT6zd0RKpfCGI5wvCtMMrvhN0d0qqXMnrj YKQVXJvrNebY7t3YhRYuwS+QR/IXfoe2Ww+r1i1/NfBkPQrSLTRhrT9EJP5vu4NqYXBm 45boPfEhqSTWyssC34ARwsCJpg7ouKSrJq/ymL4yo9kxvRhZgGJFMvgpC9W7H1KZD6io kZbLku4TfP/B6z2t2zgKJw+lhqxcYt7mkoyuQLJm6klH5jVzS1rb0UwM8pTUEQ3kvwJz 80gqXgHApSm3TWbnLp5vigJWRadcZ9Nsu/kwferdgBYVWm9PqI3Q8u6qA8ejLr0Y3oGB Hn6Q== 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=b1cv6Xx0tI+H6ZDHRYn5oqSD+jjjKPrUYP+aF8H3yMc=; b=aQCEaw9W3AVZywAAsVX/M/M+kCXM0V0ygEgi7OGDgbJKxkOuNbY5C/N33ncKRfbkoN weNCIL54aukOjV03s8xK/JvXGI/BVJ6MCWkp5Jgx3vDSSrTSCcJyq/hs817xc9qR2k7X thSvmcx1j+KDdVRSR0NeIxh1OvU8W5naavkQAqZfcz1HckvcEq7zOECVHm9gRZmzs9+L cIRvOvz5h/Rv96d8eq1mG/nyaCQxFoqxC5pl1Gbu7Ofxuvk40Yw/NLMhnnk1TueVBl91 qm+/nRMeQrtBo5tkhj6fBn1M3td4m8XO9qJEEfAWvA8vdtc8jU+unS7I6FgPYU7Dij8M stHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="wIcmHb/P"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r21-20020ac85c95000000b003b80b2c94b4si491319qta.702.2023.01.26.03.30.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:30:44 -0800 (PST) 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="wIcmHb/P"; 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 1pL0Lk-0004QV-Aj; Thu, 26 Jan 2023 06:23:24 -0500 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 1pL0LU-0002s5-44 for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:08 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LR-000494-Bd for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:07 -0500 Received: by mail-wr1-x432.google.com with SMTP id m14so968989wrg.13 for ; Thu, 26 Jan 2023 03:23:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=b1cv6Xx0tI+H6ZDHRYn5oqSD+jjjKPrUYP+aF8H3yMc=; b=wIcmHb/Pre2fZMYCVpl/97m6Mggm6kW7K9oiIfpicaTkETSbelDAheetXSos7LU7Oe klYzsm0QGQxZogT33x6pCMBuh1MXWvlFjIklEycQDuWZAo8zDKXSFLBaCe30r5Hp5pwb z3lWhwwYWcmtbSc4xloNeLROmKJm77v5TH0o3VVlvPpcmV5whIyU7ategceWF1snmly+ n5bpfOJEPliL4GAYWZBBjkrqwpRQy9gun/9MPmTOThjt5Dx26HgVc9UJ/j5gdIK+xOCB gJd5t7vrMyu9Elprm2Di3QvmXcetKMIRPhW5VtcNj9S+aA6TqrOjf4p7WHtlw0imMwPo MjQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=b1cv6Xx0tI+H6ZDHRYn5oqSD+jjjKPrUYP+aF8H3yMc=; b=gA4wqEzHLHNNVXj45lPQ/BdTN9io12uh/ozELOo4gSyo290w6YULBBZP9BmTT/M4cL 2HQJF7BATgeOaNJB0aw7keNmiTOLdckNBHLGX2DnvUgWrY6R4TuZXpci8IgZGEDqJNV8 Tvgi436KM6/VeecpfZWAIGvNKhpi8FU+tDq4hwhUaVcFL6Ctg54K5A45NGchV8Yp8Nrk GZXFiOBF3/GKyIGCYHRKSMtV+kGEW2HcfP5VvHTVOhgeYkIsPYYUEbruaDexFNShBayQ YHoyQgH40+LLZgnSwLpbV7LwaEnB2VVgyMQgo2SfEds4IcpjUUfmwRAhE79QpMLjBoq+ dfCQ== X-Gm-Message-State: AO0yUKW9CrhViNQ8LeYZeIId1rapud6+l2InKUD+kLjzjdQ6R/zcSfV8 3Jad2vxU0wbwat5kVWYBOCT1+Tgi858tY7sF X-Received: by 2002:adf:dec9:0:b0:2bf:b199:c7ef with SMTP id i9-20020adfdec9000000b002bfb199c7efmr8555545wrn.12.1674732183876; Thu, 26 Jan 2023 03:23:03 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id v14-20020adfe4ce000000b002bfafadb22asm1147046wrm.87.2023.01.26.03.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:23:01 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D2F7A1FFBA; Thu, 26 Jan 2023 11:22:57 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Evgeny Iakovlev , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bin Meng , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 24/35] semihosting: add O_BINARY flag in host_open for NT compatibility Date: Thu, 26 Jan 2023 11:22:39 +0000 Message-Id: <20230126112250.2584701-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.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: Evgeny Iakovlev Windows open(2) implementation opens files in text mode by default and needs a Windows-only O_BINARY flag to open files as binary. QEMU already knows about that flag in osdep and it is defined to 0 on non-Windows, so we can just add it to the host_flags for better compatibility. Signed-off-by: Evgeny Iakovlev Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Bin Meng Message-Id: <20230106102018.20520-1-eiakovlev@linux.microsoft.com> Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-25-alex.bennee@linaro.org> diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c index ba28194b59..e89992cf90 100644 --- a/semihosting/syscalls.c +++ b/semihosting/syscalls.c @@ -253,7 +253,7 @@ static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, { CPUArchState *env G_GNUC_UNUSED = cs->env_ptr; char *p; - int ret, host_flags; + int ret, host_flags = O_BINARY; ret = validate_lock_user_string(&p, cs, fname, fname_len); if (ret < 0) { @@ -262,11 +262,11 @@ static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, } if (gdb_flags & GDB_O_WRONLY) { - host_flags = O_WRONLY; + host_flags |= O_WRONLY; } else if (gdb_flags & GDB_O_RDWR) { - host_flags = O_RDWR; + host_flags |= O_RDWR; } else { - host_flags = O_RDONLY; + host_flags |= O_RDONLY; } if (gdb_flags & GDB_O_CREAT) { host_flags |= O_CREAT; From patchwork Thu Jan 26 11:22:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647121 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp189016pvb; Thu, 26 Jan 2023 03:32:43 -0800 (PST) X-Google-Smtp-Source: AMrXdXvRazi9wLSaJIsRzHwswXMguMY5U/ACqP9BjjoGOohjeAjPfXLTVvXuJbqkeUvSliBabjJE X-Received: by 2002:ac8:5ed3:0:b0:3b6:3596:182b with SMTP id s19-20020ac85ed3000000b003b63596182bmr47208654qtx.36.1674732763790; Thu, 26 Jan 2023 03:32:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732763; cv=none; d=google.com; s=arc-20160816; b=S2BWgDh0pX/NOSj4CJ0NqZXOKSjsTUtPYkkg48FKck1DLwbDFi5p9u4YV3UsXrmvCq CgmBLUnm1h68oefU1Y/rz/xDxlhfL3XWIRh1c7pCa6nz8i8x1wcKEEql+joxMsK0lHuV uTcSJi10XVVNV09B2PuSdtrrkmrPVY6dY4SH+59B2QsUx0U2N2Prs2rT3qBCr3HTEbbo XL/AcpEs6dSgE4L0QTYS4qKmyy07uN4TCIFpyXIj1wZQvs1DB+Bhp1ez5IZRggdT9mhh rNApMLLbaaaBxJ4QNG2LJQkkfql31WTAUOO6B9pDFUk8nSaGohKbJC9cay5ahaqwtly0 YN8g== 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=gwSqXLP10LrAD37JzH4KFdnVQSIUx4KIjtli2huFpGg=; b=xFWjnQXAYmxbqlI2bjaLn5Pqm/bOwbi7lzAiNZ0csXvufE9Cr7FJOQ6fcH8X3l+U+j qaPkqbjbLLlYxUO4tAiPadaGhzN41S+37aymtZsuJZwyssSK5+TY9E5zKWCdgotDDyBj zYvy+7UnqxiPzR7BXmU2uTIrn/iPHdUvw+wu0xmC4q5kB3D1ZC55nAB1C30BtJyBqLLm dMxhsZgEU4sNxwCBJci8yjQsw2pqMjwwsSl4ksn/px4Yim07Bfw5juOqy1KKO/eEC7IA ddFhurpHdvuX/BynO9fuA+oaZ2L0sfo4cDRbBvZ6mAA9IOgvnaVYHTFR/J3UexvPmWv/ WN3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jSx+tLAN; 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 g7-20020ac87f47000000b003a5630d6ff4si590650qtk.274.2023.01.26.03.32.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:32:43 -0800 (PST) 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=jSx+tLAN; 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 1pL0UJ-0005vS-C1; Thu, 26 Jan 2023 06:32:15 -0500 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 1pL0U9-0004ne-U6 for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:32:06 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0U6-0007oZ-AY for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:32:05 -0500 Received: by mail-wr1-x434.google.com with SMTP id z5so1450331wrt.6 for ; Thu, 26 Jan 2023 03:32:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=gwSqXLP10LrAD37JzH4KFdnVQSIUx4KIjtli2huFpGg=; b=jSx+tLANafS224HtwcYPqWMUmItf2LO5Ann/lAPrpd+KZi/vlwzqg7/hrt+5y4CAiA WwcglJ6F0QWd9bz4IhsBKAvrDzxsQaO3LVwUlRYFhO4kqUmHX9Zu4Pxohim+V1a9M74N vWhW17qe5INZh2HCCWieCYVir4/B0b2+b993VWKySBrhu7liAwNG/M5N9Ahhqgq2SKkl D0Woi33dYQU94oRvtTapvh74cY2uw6U1zlB2RhSbgAssm2kGUqzdgfy7K6f2KrYco1lT /uIgLOxCmNHIe7/aXXnpTj2p6KU1MnPVQnYPjXInmNUN1ztmnHUutOVHNiAQlqS7QcUb 56jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=gwSqXLP10LrAD37JzH4KFdnVQSIUx4KIjtli2huFpGg=; b=TUcxI9YGTwewUY0sxnfjSbODtnX2CFRpgnmxW728C22ZxSHzsZC5tlS2zXMylkXIXd C3EaRlGEMEmhnM90vSQGATDydftP73433D09dBknD2T6V7MbGnMEXJWFytaicnEbIrZf +3usyQN7hLRkNfbkN2tSAq4JNU8Eg0MNmWsarE90ow1+xaTD8oS2IA8kyDgQMk1wTaVh W1iiFf8QKfwzNlZ8PQmjm9L2IU3Gs2jGiFR2Wk53czG2BCU8tpjjTpHaAzldsM/xIYWU jK4IjcVOR+SEyUSRF0Rco5SV7i7e3fV2j1/sTXz8utmWYUyhoLsZfW19D1U6u+smjkVo Pa+Q== X-Gm-Message-State: AFqh2kpXlVaJcjAGuAhi6kczM9VMwnq7a9hf/g20RcMGQMx1jQirTWDi E0NKBX8e+OKSTwFkS9KCH2VwaQ== X-Received: by 2002:adf:a14f:0:b0:2bf:950e:7fc4 with SMTP id r15-20020adfa14f000000b002bf950e7fc4mr18186866wrr.39.1674732720755; Thu, 26 Jan 2023 03:32:00 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id t4-20020a05600001c400b002bdcce37d31sm1207378wrx.99.2023.01.26.03.31.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:31:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 249E91FFC9; Thu, 26 Jan 2023 11:22:58 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Robert Henry , Aaron Lindsay , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PULL 25/35] tests/tcg: add memory-sve test for aarch64 Date: Thu, 26 Jan 2023 11:22:40 +0000 Message-Id: <20230126112250.2584701-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 will be helpful in debugging problems with tracking SVE memory accesses via the TCG plugins system. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Cc: Robert Henry Cc: Aaron Lindsay Message-Id: <20230124180127.1881110-26-alex.bennee@linaro.org> diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/Makefile.softmmu-target index a1368905f5..df9747bae8 100644 --- a/tests/tcg/aarch64/Makefile.softmmu-target +++ b/tests/tcg/aarch64/Makefile.softmmu-target @@ -36,6 +36,13 @@ config-cc.mak: Makefile memory: CFLAGS+=-DCHECK_UNALIGNED=1 +memory-sve: memory.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) + +memory-sve: CFLAGS+=-DCHECK_UNALIGNED=1 -march=armv8.1-a+sve -O3 -fno-tree-loop-distribute-patterns + +TESTS+=memory-sve + # Running QEMU_BASE_MACHINE=-M virt -cpu max -display none QEMU_OPTS+=$(QEMU_BASE_MACHINE) -semihosting-config enable=on,target=native,chardev=output -kernel diff --git a/tests/tcg/aarch64/system/boot.S b/tests/tcg/aarch64/system/boot.S index e190b1efa6..f136363d2a 100644 --- a/tests/tcg/aarch64/system/boot.S +++ b/tests/tcg/aarch64/system/boot.S @@ -179,12 +179,13 @@ __start: isb /* - * Enable FP registers. The standard C pre-amble will be + * Enable FP/SVE registers. The standard C pre-amble will be * saving these and A-profile compilers will use AdvSIMD * registers unless we tell it not to. */ mrs x0, cpacr_el1 orr x0, x0, #(3 << 20) + orr x0, x0, #(3 << 16) msr cpacr_el1, x0 /* Setup some stack space and enter the test code. From patchwork Thu Jan 26 11:22:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647104 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188241pvb; Thu, 26 Jan 2023 03:30:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXvXmpA+WXwSp6uRskI116NAdAjK/Y5tflKN10FERe4maTJOkWtfUDVj/rzjCTWKburIJFS5 X-Received: by 2002:a0c:bed2:0:b0:534:26eb:a25d with SMTP id f18-20020a0cbed2000000b0053426eba25dmr50308342qvj.40.1674732653733; Thu, 26 Jan 2023 03:30:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732653; cv=none; d=google.com; s=arc-20160816; b=qZoaCYQrMqixeQgN2zv5Bg692zItgckERY+iasGFNmIJUAJwe6eboa0kASSxz8LXT2 XTLfOoNFbZu0kvGLFO3D53oSFcsE5BpjEVXigOFatc48LVMQ+Lc+SEcEJJHnzRDW246y ahUKsbpDSdZwiLPg3k2wNMdZC9thAFviZplK4uPh4wz1ljcniCVzGLTklZL/FDYP1NLU 8leiuUYlU7Jcgr6SBTi+r1BUYpG4zaONkCaj5BQa5gMs22OcNAsBW4h+aZ5Eu8/m+7gU /bGn7SpToVzdrDN5IwQTbeXoFM6gnPs1vZRKo72AlS/IeW5+MglKwc0e0LFZHVajx7x1 /3dg== 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=lJmfcRUvWgySiHRRzSTiq8BtkDV3N+un1/AMo4mWGPE=; b=q1iLjrpbFza/3aiwLCZrAbxceWSuY5W5dKiiAi3UXD6rJ4yV062xiaTea3BWq6uuBS Nbt7vkJOR4SdFLTE2OKNCOGSClo0lREYmplLHqk/+UMm+wCRDmfX0h+opM2AjHliPjhc bDCR/d9ZqBsBLUS5QgAZj6Q2es2rkzmWJCiqSrmMJsr+7xmGkYxhAwX9Ra67JHuEwAyo 98XC9k6VmlvY1+AKowJ6DlO5fnLwQzg4G7WF398iwYRfAzeXbG5GoJ2C9T27ZPi8JL3J G2nIm+3/9x4Agf3Hl45BHNkYMWPjE5InVyblXL5ZfiwIxy51gw+m5A3aQ85t59mRr9kh RPBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lgcJTr0X; 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 a17-20020ad441d1000000b0053519e70990si627943qvq.153.2023.01.26.03.30.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:30:53 -0800 (PST) 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=lgcJTr0X; 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 1pL0Lg-00047S-FL; Thu, 26 Jan 2023 06:23:20 -0500 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 1pL0LW-00032u-Ho for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:10 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LU-0004MV-Fb for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:10 -0500 Received: by mail-wr1-x429.google.com with SMTP id m14so969117wrg.13 for ; Thu, 26 Jan 2023 03:23:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=lJmfcRUvWgySiHRRzSTiq8BtkDV3N+un1/AMo4mWGPE=; b=lgcJTr0XRYnZNZfaLecz5ubSSNps8VZmMdDRoDXucd4Buo5d1cQ0sHY1wpLCETngde hsD2wm/65/w9mQMlu01nzU1mxVYhc+MvzjNKN4DQczXiH8vhCBHunxnuH0gOatidVPHc KGau5cLcA3Kiy/Fba2IKHjeDOThi4wsVCFw+dcN/LJGJGgNL0coUgZywa8ZwZrH/Nkiq EIZRzMx3iRiXudN04B1bKTSDj8rQ3N+V2Hb/LfpjibPczB2PMoPxtSCD9VJ9wzXCdMeC pjXX1XotWc+0AM4RXkl5/L4XVi+bILUlY8Q5jUUiGE0br197cB39NJb0x/oaojHSuniJ c3Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=lJmfcRUvWgySiHRRzSTiq8BtkDV3N+un1/AMo4mWGPE=; b=glSdj6nbgeu2WYHSjiqLxzBESR1k5lG+kB+8nLDXEN/uu0HFFrBjn5sw1sccQYGarg piJgQRyEiNR+wQXAnnNN1wlJez+U2RxVSSfF+FYn4R4ZqKDGdF+D2RM8fCEYswtWw0by MLZEWwBmNKlvwB1rTWjTrly/VTn9OTy7/8N6wfmTV+S/MZzUm/ltOaJbUXhGP2u5b4fA RQ2jg8Xco+JkdmsfuVjvzWdm0/8eZXAtJ1QO+bgOjXnAbhla7vT3eDJFF2syYQWp8GB5 Kp5hln77BFQ8BrXzkKN8Y0TAC8P3Ve1cfCk1g+p/OwUbO0VtbpL3UYM9v7qt29dnP3Nc l39g== X-Gm-Message-State: AFqh2kqfO/CYjVJ8vPt6jAXTOhcouVzK5/SQYZqjTAXRug1H+wqjRcMK nq5B7CdmrI+l8bl8E0PcCPJl2A== X-Received: by 2002:a5d:6d41:0:b0:2bb:328b:a66d with SMTP id k1-20020a5d6d41000000b002bb328ba66dmr30425971wri.60.1674732186648; Thu, 26 Jan 2023 03:23:06 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id f12-20020a5d4dcc000000b002be5becdb89sm1067929wru.3.2023.01.26.03.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:23:01 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5AFD51FFCA; Thu, 26 Jan 2023 11:22:58 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Emilio Cota , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Paolo Bonzini , Eduardo Habkost , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Yanan Wang Subject: [PULL 26/35] cpu: free cpu->tb_jmp_cache with RCU Date: Thu, 26 Jan 2023 11:22:41 +0000 Message-Id: <20230126112250.2584701-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: Emilio Cota Fixes the appended use-after-free. The root cause is that during tb invalidation we use CPU_FOREACH, and therefore to safely free a vCPU we must wait for an RCU grace period to elapse. $ x86_64-linux-user/qemu-x86_64 tests/tcg/x86_64-linux-user/munmap-pthread ================================================================= ==1800604==ERROR: AddressSanitizer: heap-use-after-free on address 0x62d0005f7418 at pc 0x5593da6704eb bp 0x7f4961a7ac70 sp 0x7f4961a7ac60 READ of size 8 at 0x62d0005f7418 thread T2 #0 0x5593da6704ea in tb_jmp_cache_inval_tb ../accel/tcg/tb-maint.c:244 #1 0x5593da6704ea in do_tb_phys_invalidate ../accel/tcg/tb-maint.c:290 #2 0x5593da670631 in tb_phys_invalidate__locked ../accel/tcg/tb-maint.c:306 #3 0x5593da670631 in tb_invalidate_phys_page_range__locked ../accel/tcg/tb-maint.c:542 #4 0x5593da67106d in tb_invalidate_phys_range ../accel/tcg/tb-maint.c:614 #5 0x5593da6a64d4 in target_munmap ../linux-user/mmap.c:766 #6 0x5593da6dba05 in do_syscall1 ../linux-user/syscall.c:10105 #7 0x5593da6f564c in do_syscall ../linux-user/syscall.c:13329 #8 0x5593da49e80c in cpu_loop ../linux-user/x86_64/../i386/cpu_loop.c:233 #9 0x5593da6be28c in clone_func ../linux-user/syscall.c:6633 #10 0x7f496231cb42 in start_thread nptl/pthread_create.c:442 #11 0x7f49623ae9ff (/lib/x86_64-linux-gnu/libc.so.6+0x1269ff) 0x62d0005f7418 is located 28696 bytes inside of 32768-byte region [0x62d0005f0400,0x62d0005f8400) freed by thread T148 here: #0 0x7f49627b6460 in __interceptor_free ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:52 #1 0x5593da5ac057 in cpu_exec_unrealizefn ../cpu.c:180 #2 0x5593da81f851 (/home/cota/src/qemu/build/qemu-x86_64+0x484851) Signed-off-by: Emilio Cota Reviewed-by: Richard Henderson Message-Id: <20230111151628.320011-2-cota@braap.org> Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-27-alex.bennee@linaro.org> diff --git a/accel/tcg/tb-jmp-cache.h b/accel/tcg/tb-jmp-cache.h index ff5ffc8fc2..b3f6e78835 100644 --- a/accel/tcg/tb-jmp-cache.h +++ b/accel/tcg/tb-jmp-cache.h @@ -18,6 +18,7 @@ * a load_acquire/store_release to 'tb'. */ struct CPUJumpCache { + struct rcu_head rcu; struct { TranslationBlock *tb; #if TARGET_TB_PCREL diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 04cd1f3092..25ec73ef9a 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -1064,13 +1064,12 @@ void tcg_exec_realizefn(CPUState *cpu, Error **errp) /* undo the initializations in reverse order */ void tcg_exec_unrealizefn(CPUState *cpu) { - qemu_plugin_vcpu_exit_hook(cpu); #ifndef CONFIG_USER_ONLY tcg_iommu_free_notifier_list(cpu); #endif /* !CONFIG_USER_ONLY */ tlb_destroy(cpu); - g_free(cpu->tb_jmp_cache); + g_free_rcu(cpu->tb_jmp_cache, rcu); } #ifndef CONFIG_USER_ONLY diff --git a/cpu.c b/cpu.c index 4a7d865427..21cf809614 100644 --- a/cpu.c +++ b/cpu.c @@ -176,11 +176,20 @@ void cpu_exec_unrealizefn(CPUState *cpu) vmstate_unregister(NULL, &vmstate_cpu_common, cpu); } #endif + + /* Call the plugin hook before clearing cpu->cpu_index in cpu_list_remove */ if (tcg_enabled()) { - tcg_exec_unrealizefn(cpu); + qemu_plugin_vcpu_exit_hook(cpu); } cpu_list_remove(cpu); + /* + * Now that the vCPU has been removed from the RCU list, we can call + * tcg_exec_unrealizefn, which may free fields using call_rcu. + */ + if (tcg_enabled()) { + tcg_exec_unrealizefn(cpu); + } } /* From patchwork Thu Jan 26 11:22:42 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: 647116 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188813pvb; Thu, 26 Jan 2023 03:32:14 -0800 (PST) X-Google-Smtp-Source: AK7set9hsdmDmwEXe4oPeC7ejKeGc7KnCJMi9K2RUF5yoOceLl6xnFTHiYMC0sFZIPQsoQG26I9t X-Received: by 2002:a05:6214:240e:b0:535:666b:b83f with SMTP id fv14-20020a056214240e00b00535666bb83fmr2249900qvb.20.1674732734352; Thu, 26 Jan 2023 03:32:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732734; cv=none; d=google.com; s=arc-20160816; b=d75OJ/taEzbhRlzvog6Y/sBTsfugqWE7d+rnFeO+8O3guUHcXVcHSAtAaEhI5gtUen bmahfaWGNT/mQzuOBHaPL0goeMvTE5f82aXDGYbSg43G7nkpth8avkYaGrADXsdB/KCM F6G1+d0BZqd9hrmHQFGsCDFwo2l1sR3A2IZyWsHUesu07YOdjz7p9PQ6IgXc/V5Bd9ct oBV7iL0mzjgxktQfp+SWod1bDROOOg593r3+Ln2i4MFKhbiRwT6hTCNtGl9CbuX6cLmS DwTYvvjYmkde6ICyfqTnmd/OYFRMyjp/qr6uf2XXtUD2c9tXvXTlHY4lAdqQcWXQ44SK tUEw== 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=jTUlBPS+ypvgj+Fr1uUg74hvNf7AayGAJIZigzJMmFc=; b=rK4IfUxiwwLBl/pRpYRVcBGTUVMhMs2sDeFe02Wqt0fKIPSN58Hy67SYtz6N7jiTlg ozYOVGnMdH8koX8qyjlItEAbhTpFZICMmpqIWQC8FSAk7kezFDeC/r1d7GXgRaItdFTO 1DJx1kpRFKptyvELx9HhFatpEZU7vEObzHWPdLsM3Vu2r7ABmVwG6MmFd45DuifAFO0e SuzNOcqhFxigNw+BP+tZ6dwsSKKQMB6rMLPNgdw6UVOyskUNdsseOFKdwsti8PSBe7oq qEwGOWH0EniJgwAS+MJs07SnoHVFbIS77YiLzd7DSjIoJ/0Vmi91lOYD7e9LRdAL1m38 rTlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YDd4nJmh; 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 i66-20020a378645000000b0070652170d25si726037qkd.647.2023.01.26.03.32.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:32:14 -0800 (PST) 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=YDd4nJmh; 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 1pL0UG-0005NR-10; Thu, 26 Jan 2023 06:32:12 -0500 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 1pL0U6-0004XD-C0 for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:32:04 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0U2-0007n1-H2 for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:32:01 -0500 Received: by mail-wr1-x435.google.com with SMTP id m14so994588wrg.13 for ; Thu, 26 Jan 2023 03:31:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=jTUlBPS+ypvgj+Fr1uUg74hvNf7AayGAJIZigzJMmFc=; b=YDd4nJmhodBtrQkwNZmG6FALc+gVwWZ6eqQwsJqz9bmYEEoR5P9BcdT+aKlDlM/bPw EK3e91/AJyf/emtaJHZ+SrOH38Zwxzlc8eXw8LwTynnYUe8F4cSr5LD7YQtNlE3iyyMd i6Gt3Hc7+i7oELp62ZndjrAVzh2J9E2f0yKfoJY0Te/ORgXyPGL6M8S1ze2c0imzODPA zkoYWYT37i2vU021t44ZG8hX09NFhuv7fDwxXzdRCJKrFHMCHd1bOrAcEyAj/nDxIG1c w2L7z36r4H1+ytsIIGomMXX0ZmwKEp7EDLfyasxz0BjghHea/YbgSslgMQKX2iG5NPVg u4rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=jTUlBPS+ypvgj+Fr1uUg74hvNf7AayGAJIZigzJMmFc=; b=7DXYOb0Dcfu9s+9btwkr0mtHWo/krZtvofwgFV9Pe+b4P9D7ZPkSMrasS9/ej4qcop T6kjTHkKpyQFYO8BG901ivfG3tulFhpNxN5uvPhsl5lmJObiSA+Ymlp1RGZJyOH7Y7TJ ZgTzrJxaX5h/j/uJok795ATk8KiTCKNiFzbP1SLTTyYA6WWqgwAfRiii/KrE2kxtNTbn fWxohrDuapm6/UIWIc8U7dN1xvn/nDFKdr3KqMk7HRADnZ27Vz3ZBMUMEVH5E5I0/NIL eWI9nQDBx5bnkfHpLc+76iZHzw2WdmBVOuZFrZEDH1H7StDCy1v/eeM4XQROZNncmy8k t0gg== X-Gm-Message-State: AO0yUKUAxpx2mjEgHGxHAKc8EJisLKnL6ANnjvyeysXnBkrXaTXfr2kO LkYsaNfRe/wsQLH9HbMt3rPeeA== X-Received: by 2002:adf:e48c:0:b0:2bf:ae16:817c with SMTP id i12-20020adfe48c000000b002bfae16817cmr8787820wrm.29.1674732717120; Thu, 26 Jan 2023 03:31:57 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id a4-20020a056000100400b00286ad197346sm1027375wrx.70.2023.01.26.03.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:31:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9880F1FFCB; Thu, 26 Jan 2023 11:22:58 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Emilio Cota , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 27/35] util/qht: add missing atomic_set(hashes[i]) Date: Thu, 26 Jan 2023 11:22:42 +0000 Message-Id: <20230126112250.2584701-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Emilio Cota We forgot to add this one in "a890643958 util/qht: atomically set b->hashes". Detected with tsan. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Signed-off-by: Emilio Cota Message-Id: <20230111151628.320011-3-cota@braap.org> Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-28-alex.bennee@linaro.org> diff --git a/util/qht.c b/util/qht.c index 065fc501f4..15866299e6 100644 --- a/util/qht.c +++ b/util/qht.c @@ -688,7 +688,7 @@ static inline void qht_bucket_remove_entry(struct qht_bucket *orig, int pos) int i; if (qht_entry_is_last(orig, pos)) { - orig->hashes[pos] = 0; + qatomic_set(&orig->hashes[pos], 0); qatomic_set(&orig->pointers[pos], NULL); return; } From patchwork Thu Jan 26 11:22:43 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: 647094 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp186260pvb; Thu, 26 Jan 2023 03:25:27 -0800 (PST) X-Google-Smtp-Source: AMrXdXvfR53kxo7M89RBDIXQvQTVcA7Pk2tnPBDsKHJC22vnTExm9NrK0eVCbagDn3dvbREDetpv X-Received: by 2002:ac8:4686:0:b0:3a5:7a30:bd22 with SMTP id g6-20020ac84686000000b003a57a30bd22mr50035449qto.53.1674732327531; Thu, 26 Jan 2023 03:25:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732327; cv=none; d=google.com; s=arc-20160816; b=Uqib8EAn4l1mXXrpdorQBTzrodiY0EMuCQYr9VKx8Hd9oxIjwx14g5M/4SUaa1LoFK yTg0wWolPFcrsdPTCh5kbtrOrTxgJbyP+FlnUj1/oyYJ8iM3Ydo38hNGG6IJMVelq/aL z+tStX62iIJjG0l+JAJ/f/VsJdHeiTpPhWKV91QKQUblJ6mTJ+bwZliWdIn6rNjaOknD WEveBVk8BPujY2hDqyFPBgLz2vYBi40+jJIIB+6aCDekPf2RNyHLic3CMK822n5bbCsJ 2SbHbNUI/lkWDC5JpG96oav/LKf/7FyWXA4U+Pdls3uR9n/mDihWiaCZBRHxWHpWhg92 BELw== 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=A69+dAntaMgm9t8HgL26p/jUP8rIwyImyTd2jAKYUvo=; b=rdqtVAyTSJascXh9TyATTTMT2iI0rmZ0RHkwLMZH8Vcb4EGp4HKj2075Bqhdzc24CX F4dR1VRO9XeNkQUTIGgLzZQl6D7IlFiTj2ZaiGDYbVSeol+6oI9fQMKrFV3i4MeaD5BU Qa/q/BK+KK1N7GQyCrn/s9SoxHE+vnGZyKRAB+b0t3N7UEc8qbd3jyBSIphNGt3KbDvF lm4otQOrjvm26F6XRQlmRJEfnwGMRn8vChOTid93I0y53McaAqDOnH/AhRuqmAznTZEp GWj6N+Pm8JwSqdRPaPix6URttBnchNA2guHf3tRV+iMCiiMj1a+hZnO4bIRV620OLLo/ Tvaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="guI/7Ul4"; 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 e17-20020ac85dd1000000b003a7eee6dc26si497268qtx.671.2023.01.26.03.25.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:25:27 -0800 (PST) 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="guI/7Ul4"; 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 1pL0Lf-000427-5k; Thu, 26 Jan 2023 06:23:19 -0500 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 1pL0LU-0002sq-Bj for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:08 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LS-0004EY-Gb for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:08 -0500 Received: by mail-wr1-x429.google.com with SMTP id b7so1441399wrt.3 for ; Thu, 26 Jan 2023 03:23:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=A69+dAntaMgm9t8HgL26p/jUP8rIwyImyTd2jAKYUvo=; b=guI/7Ul4red8NI9cBLMlhm/aBAMprxCKvAMunwXfmVhueIgGDu6er6LJFsRrWOg7iT x7JXDNgSoY5uZocjM1ISCsO2xjIGYHlnrNBizvGEEocbsyC+6z2b0z7HlIdbmt39a0Ec ox44I6Hz6ak813OJRElceWrK6cpQIwbjupSjkdYL2CMJSKaiubPUa0dofX30PQ2RNJ6K 7WzLPspgqVaXpVNX0iJ1EkH7w4eqLAxTjopTvCXXlp9cNYCZBNjIj9dpb8uicJu6J/rG PaJ7tAUdNFOMIn8I5zmC7dwjxDbw9da6uNO/gn1xZqeNr2sk/kSsRjI7UapI/RohQuyJ G2pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=A69+dAntaMgm9t8HgL26p/jUP8rIwyImyTd2jAKYUvo=; b=hRNPJqDPIK/RxIlgCP74R2QgES06gOEZWcy0zPs0SvDJCpNbrIW1W91raLPIj83v04 LPzIyVQFordAP/TEq+tx52VkmoBFIH3oHApcv+uOe7B52jZ7nLfaclD8GnSLCdg92n2s Mk1lmuiFXlbAp7n5o7cVwyaBtXHRVtaFfmvoB+ZXC0bLp1wTVhU36ul4M1xfZaaGmOJT UXxBfVl6KjhB65xu0j9U2qXUdekPmaKJ8mIwBNvjKmP+w+olFujzAZBAL7ySJctudJvj wq4hf84YsPzix7y4zmKp8CQyw4q4irvrMtZBBp5TeBiwXUA0Seus+MDzi8xOmLHILr0w a9sw== X-Gm-Message-State: AFqh2kpGSP1Ms0nXA1qwDoGC2LjWw5JIIaURr+cnhkeNLWSc5wc05yQa lT3vJb22N2PPRe8eeH0a2AjniA== X-Received: by 2002:adf:f242:0:b0:2b2:1db6:a6bb with SMTP id b2-20020adff242000000b002b21db6a6bbmr30761960wrp.20.1674732185002; Thu, 26 Jan 2023 03:23:05 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id x7-20020a5d6b47000000b002bbed1388a5sm1063695wrw.15.2023.01.26.03.22.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:23:01 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D0D771FFB7; Thu, 26 Jan 2023 11:22:58 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Emilio Cota , =?utf-8?q?Alex_B?= =?utf-8?q?enn=C3=A9e?= , Richard Henderson Subject: [PULL 28/35] thread: de-const qemu_spin_destroy Date: Thu, 26 Jan 2023 11:22:43 +0000 Message-Id: <20230126112250.2584701-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: Emilio Cota Reviewed-by: Alex Bennée Signed-off-by: Emilio Cota Reviewed-by: Richard Henderson Message-Id: <20230111151628.320011-4-cota@braap.org> Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-29-alex.bennee@linaro.org> diff --git a/include/qemu/thread.h b/include/qemu/thread.h index 7c6703bce3..7841084199 100644 --- a/include/qemu/thread.h +++ b/include/qemu/thread.h @@ -237,11 +237,10 @@ static inline void qemu_spin_init(QemuSpin *spin) #endif } -/* const parameter because the only purpose here is the TSAN annotation */ -static inline void qemu_spin_destroy(const QemuSpin *spin) +static inline void qemu_spin_destroy(QemuSpin *spin) { #ifdef CONFIG_TSAN - __tsan_mutex_destroy((void *)spin, __tsan_mutex_not_static); + __tsan_mutex_destroy(spin, __tsan_mutex_not_static); #endif } From patchwork Thu Jan 26 11:22:44 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: 647107 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188348pvb; Thu, 26 Jan 2023 03:31:06 -0800 (PST) X-Google-Smtp-Source: AK7set+B/6NGs0qPES7MCF07ihtl1GE/Ksnjy6qBeGcYTw4UhaAWME+U9gBIjJYBnsUy1I8YQqQR X-Received: by 2002:a0c:b401:0:b0:537:66ca:e274 with SMTP id u1-20020a0cb401000000b0053766cae274mr6616020qve.35.1674732666401; Thu, 26 Jan 2023 03:31:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732666; cv=none; d=google.com; s=arc-20160816; b=pIrx8PHU/1dd9AF77011oha9z6RXx/eSjz01xd7c4/YCfbCz6PX5zzu6jsHam8isOE 8C/jjohK716U4sRRtqGrONVBfzU2R4yn3WGU1Zw8b9kUaghzq2fZLHQdz5F41PcSbLuj kE8/T6NLn7twy+Koymj5bKU76E4kh6nOKXQ+Jx/jjX8VcehPMzIc7l4Bn7lPyBJ5Gpo3 cVLldgLafT4RrZXSfPhtHmHpPOT1ZlqyaChm5H0XzRxn1f11lhkRgj+Pfya0fGc4otzr u6l8u07XXGqm887+v45WrptEOozRCeYRYWlHe2YY84QHLbelsXB5WXXPUwtb1EhN5asE QuWQ== 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=Ttufimz8m6TWwCdaWrjBY4mIUp0yOsovRHGqvKBWW9Q=; b=ohUgtztsgILkHDbLyhMaUd0rLGeoYIUAxDBhkv87N4bLywxM7TP4T1NUIC+38LUN8Q n3JBu5FDnkygvs9ya8Kzrdxi2p9TmZ/IcgBOQ37fakdFe4MvJdj/yg7YfAHgwEiFw9KQ lk4OwKt5pPB3liGXU8OEwpMbCqEg7I6rVXSqYGznZNfyQoKppgmt58jEHJlMlTf/HeLf zSqMou5AdTIAKhsLPUTnocQqPiuLNGykvQvzTe57ziZZ3BvWJ6hj7xu9unXNpU1dv7C3 OaM+AbxndgYvEyIrfarNWGHO2gRFHMK506E81+Jhb2riKlk8kOiNYw4q3wHbzzjTIjv0 J6aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E8w3RD40; 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 p1-20020ad452c1000000b00531d0b89d34si557694qvs.431.2023.01.26.03.31.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:31:06 -0800 (PST) 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=E8w3RD40; 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 1pL0Ld-0003tx-RU; Thu, 26 Jan 2023 06:23:17 -0500 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 1pL0LT-0002o6-Gy for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:07 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LR-0003ok-4J for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:07 -0500 Received: by mail-wm1-x32f.google.com with SMTP id l8so901061wms.3 for ; Thu, 26 Jan 2023 03:23:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=Ttufimz8m6TWwCdaWrjBY4mIUp0yOsovRHGqvKBWW9Q=; b=E8w3RD40MLC73JUsVZ5BVyE2vlxnSZLFjH7XuJFMC2QgeEbFE+u+BrR3yq+pG6HJwJ IPFyKStTWjbcIjt5e2N1QSC+OOIoze4x96Zt2LZAvPW3c57taTfjm7JzGo0w9FKKHIGM Gx8TCQrhk1o8gqWrRGUD2+Pj7ztO96FeCbjC0NDmFKSsLebLlcVGXBoPiQQIRCYsScyX ieE5wlc56BDSyRkHUpz5pPgGoGY7TFcNAQs8lqs6CyN7J1U3Oq5yR/Fqs4xTGWiomRI/ XBicT3bGvMTmCck2SWjniNwihdO9QqPP/ZngKyaD5jyvNfYJJbhOnoPs3ZiY5RWrRf20 HF3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Ttufimz8m6TWwCdaWrjBY4mIUp0yOsovRHGqvKBWW9Q=; b=Ra4bUE23uwi2U/UDwindrKf1rp3R4JHUpCvQm+cykP2+dLrVRMMExYfeLLIQ0t8zgQ IghwAr5zWcfrNaIbIYnPtz6LVjwE3vl0aIyb61iLQxs80cDUaOrZn5ErG7yzBQf+4tP0 7G0qr6Uo6DJgM87c46ABpVMwhpKlJ+pJ/qAavmhQXrCND7trScFBwbeK+rnvO9c8HOHX glHzxJAUs3GpBqkTOhWmjIJE4dLIZ4oBlysmbRUqXUEn5L+wSXwZnM9KgUWk4E9saHpv UDLHlOMLJZrt09xHHMzk7Aiw9liRp9EGhlH4VIL1FxGAJrBIcE8Cxh1iTQhm6BjEJcf7 6auw== X-Gm-Message-State: AFqh2kp7Ri4juqB03yqjzQ7ayP2MGr9REFqM5PrM7OUnx/VfxSPF92Pc FZ64vYHPTVsvZ4RVCsRGa/Kozg== X-Received: by 2002:a05:600c:1c1f:b0:3db:2d7e:1204 with SMTP id j31-20020a05600c1c1f00b003db2d7e1204mr25321718wms.27.1674732184173; Thu, 26 Jan 2023 03:23:04 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id a19-20020a05600c349300b003cfa622a18asm4628272wmq.3.2023.01.26.03.22.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:23:01 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0B4521FFCD; Thu, 26 Jan 2023 11:22:59 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Emilio Cota , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= Subject: [PULL 29/35] util/qht: use striped locks under TSAN Date: Thu, 26 Jan 2023 11:22:44 +0000 Message-Id: <20230126112250.2584701-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Emilio Cota Fixes this tsan crash, easy to reproduce with any large enough program: $ tests/unit/test-qht 1..2 ThreadSanitizer: CHECK failed: sanitizer_deadlock_detector.h:67 "((n_all_locks_)) < (((sizeof(all_locks_with_contexts_)/sizeof((all_locks_with_contexts_)[0]))))" (0x40, 0x40) (tid=1821568) #0 __tsan::CheckUnwind() ../../../../src/libsanitizer/tsan/tsan_rtl.cpp:353 (libtsan.so.2+0x90034) #1 __sanitizer::CheckFailed(char const*, int, char const*, unsigned long long, unsigned long long) ../../../../src/libsanitizer/sanitizer_common/sanitizer_termination.cpp:86 (libtsan.so.2+0xca555) #2 __sanitizer::DeadlockDetectorTLS<__sanitizer::TwoLevelBitVector<1ul, __sanitizer::BasicBitVector > >::addLock(unsigned long, unsigned long, unsigned int) ../../../../src/libsanitizer/sanitizer_common/sanitizer_deadlock_detector.h:67 (libtsan.so.2+0xb3616) #3 __sanitizer::DeadlockDetectorTLS<__sanitizer::TwoLevelBitVector<1ul, __sanitizer::BasicBitVector > >::addLock(unsigned long, unsigned long, unsigned int) ../../../../src/libsanitizer/sanitizer_common/sanitizer_deadlock_detector.h:59 (libtsan.so.2+0xb3616) #4 __sanitizer::DeadlockDetector<__sanitizer::TwoLevelBitVector<1ul, __sanitizer::BasicBitVector > >::onLockAfter(__sanitizer::DeadlockDetectorTLS<__sanitizer::TwoLevelBitVector<1ul, __sanitizer::BasicBitVector > >*, unsigned long, unsigned int) ../../../../src/libsanitizer/sanitizer_common/sanitizer_deadlock_detector.h:216 (libtsan.so.2+0xb3616) #5 __sanitizer::DD::MutexAfterLock(__sanitizer::DDCallback*, __sanitizer::DDMutex*, bool, bool) ../../../../src/libsanitizer/sanitizer_common/sanitizer_deadlock_detector1.cpp:169 (libtsan.so.2+0xb3616) #6 __tsan::MutexPostLock(__tsan::ThreadState*, unsigned long, unsigned long, unsigned int, int) ../../../../src/libsanitizer/tsan/tsan_rtl_mutex.cpp:200 (libtsan.so.2+0xa3382) #7 __tsan_mutex_post_lock ../../../../src/libsanitizer/tsan/tsan_interface_ann.cpp:384 (libtsan.so.2+0x76bc3) #8 qemu_spin_lock /home/cota/src/qemu/include/qemu/thread.h:259 (test-qht+0x44a97) #9 qht_map_lock_buckets ../util/qht.c:253 (test-qht+0x44a97) #10 do_qht_iter ../util/qht.c:809 (test-qht+0x45f33) #11 qht_iter ../util/qht.c:821 (test-qht+0x45f33) #12 iter_check ../tests/unit/test-qht.c:121 (test-qht+0xe473) #13 qht_do_test ../tests/unit/test-qht.c:202 (test-qht+0xe473) #14 qht_test ../tests/unit/test-qht.c:240 (test-qht+0xe7c1) #15 test_default ../tests/unit/test-qht.c:246 (test-qht+0xe828) #16 (libglib-2.0.so.0+0x7daed) #17 (libglib-2.0.so.0+0x7d80a) #18 (libglib-2.0.so.0+0x7d80a) #19 g_test_run_suite (libglib-2.0.so.0+0x7dfe9) #20 g_test_run (libglib-2.0.so.0+0x7e055) #21 main ../tests/unit/test-qht.c:259 (test-qht+0xd2c6) #22 __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58 (libc.so.6+0x29d8f) #23 __libc_start_main_impl ../csu/libc-start.c:392 (libc.so.6+0x29e3f) #24 _start (test-qht+0xdb44) Signed-off-by: Emilio Cota Reviewed-by: Richard Henderson Message-Id: <20230111151628.320011-5-cota@braap.org> Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-30-alex.bennee@linaro.org> diff --git a/util/qht.c b/util/qht.c index 15866299e6..92c6b78759 100644 --- a/util/qht.c +++ b/util/qht.c @@ -151,6 +151,22 @@ struct qht_bucket { QEMU_BUILD_BUG_ON(sizeof(struct qht_bucket) > QHT_BUCKET_ALIGN); +/* + * Under TSAN, we use striped locks instead of one lock per bucket chain. + * This avoids crashing under TSAN, since TSAN aborts the program if more than + * 64 locks are held (this is a hardcoded limit in TSAN). + * When resizing a QHT we grab all the buckets' locks, which can easily + * go over TSAN's limit. By using striped locks, we avoid this problem. + * + * Note: this number must be a power of two for easy index computation. + */ +#define QHT_TSAN_BUCKET_LOCKS_BITS 4 +#define QHT_TSAN_BUCKET_LOCKS (1 << QHT_TSAN_BUCKET_LOCKS_BITS) + +struct qht_tsan_lock { + QemuSpin lock; +} QEMU_ALIGNED(QHT_BUCKET_ALIGN); + /** * struct qht_map - structure to track an array of buckets * @rcu: used by RCU. Keep it as the top field in the struct to help valgrind @@ -160,6 +176,7 @@ QEMU_BUILD_BUG_ON(sizeof(struct qht_bucket) > QHT_BUCKET_ALIGN); * @n_added_buckets: number of added (i.e. "non-head") buckets * @n_added_buckets_threshold: threshold to trigger an upward resize once the * number of added buckets surpasses it. + * @tsan_bucket_locks: Array of striped locks to be used only under TSAN. * * Buckets are tracked in what we call a "map", i.e. this structure. */ @@ -169,6 +186,9 @@ struct qht_map { size_t n_buckets; size_t n_added_buckets; size_t n_added_buckets_threshold; +#ifdef CONFIG_TSAN + struct qht_tsan_lock tsan_bucket_locks[QHT_TSAN_BUCKET_LOCKS]; +#endif }; /* trigger a resize when n_added_buckets > n_buckets / div */ @@ -229,10 +249,56 @@ static inline size_t qht_elems_to_buckets(size_t n_elems) return pow2ceil(n_elems / QHT_BUCKET_ENTRIES); } -static inline void qht_head_init(struct qht_bucket *b) +/* + * When using striped locks (i.e. under TSAN), we have to be careful not + * to operate on the same lock twice (e.g. when iterating through all buckets). + * We achieve this by operating only on each stripe's first matching lock. + */ +static inline void qht_do_if_first_in_stripe(struct qht_map *map, + struct qht_bucket *b, + void (*func)(QemuSpin *spin)) +{ +#ifdef CONFIG_TSAN + unsigned long bucket_idx = b - map->buckets; + bool is_first_in_stripe = (bucket_idx >> QHT_TSAN_BUCKET_LOCKS_BITS) == 0; + if (is_first_in_stripe) { + unsigned long lock_idx = bucket_idx & (QHT_TSAN_BUCKET_LOCKS - 1); + func(&map->tsan_bucket_locks[lock_idx].lock); + } +#else + func(&b->lock); +#endif +} + +static inline void qht_bucket_lock_do(struct qht_map *map, + struct qht_bucket *b, + void (*func)(QemuSpin *lock)) +{ +#ifdef CONFIG_TSAN + unsigned long bucket_idx = b - map->buckets; + unsigned long lock_idx = bucket_idx & (QHT_TSAN_BUCKET_LOCKS - 1); + func(&map->tsan_bucket_locks[lock_idx].lock); +#else + func(&b->lock); +#endif +} + +static inline void qht_bucket_lock(struct qht_map *map, + struct qht_bucket *b) +{ + qht_bucket_lock_do(map, b, qemu_spin_lock); +} + +static inline void qht_bucket_unlock(struct qht_map *map, + struct qht_bucket *b) +{ + qht_bucket_lock_do(map, b, qemu_spin_unlock); +} + +static inline void qht_head_init(struct qht_map *map, struct qht_bucket *b) { memset(b, 0, sizeof(*b)); - qemu_spin_init(&b->lock); + qht_do_if_first_in_stripe(map, b, qemu_spin_init); seqlock_init(&b->sequence); } @@ -250,7 +316,7 @@ static void qht_map_lock_buckets(struct qht_map *map) for (i = 0; i < map->n_buckets; i++) { struct qht_bucket *b = &map->buckets[i]; - qemu_spin_lock(&b->lock); + qht_do_if_first_in_stripe(map, b, qemu_spin_lock); } } @@ -261,7 +327,7 @@ static void qht_map_unlock_buckets(struct qht_map *map) for (i = 0; i < map->n_buckets; i++) { struct qht_bucket *b = &map->buckets[i]; - qemu_spin_unlock(&b->lock); + qht_do_if_first_in_stripe(map, b, qemu_spin_unlock); } } @@ -308,7 +374,7 @@ void qht_map_lock_buckets__no_stale(struct qht *ht, struct qht_map **pmap) * Get a head bucket and lock it, making sure its parent map is not stale. * @pmap is filled with a pointer to the bucket's parent map. * - * Unlock with qemu_spin_unlock(&b->lock). + * Unlock with qht_bucket_unlock. * * Note: callers cannot have ht->lock held. */ @@ -322,18 +388,18 @@ struct qht_bucket *qht_bucket_lock__no_stale(struct qht *ht, uint32_t hash, map = qatomic_rcu_read(&ht->map); b = qht_map_to_bucket(map, hash); - qemu_spin_lock(&b->lock); + qht_bucket_lock(map, b); if (likely(!qht_map_is_stale__locked(ht, map))) { *pmap = map; return b; } - qemu_spin_unlock(&b->lock); + qht_bucket_unlock(map, b); /* we raced with a resize; acquire ht->lock to see the updated ht->map */ qht_lock(ht); map = ht->map; b = qht_map_to_bucket(map, hash); - qemu_spin_lock(&b->lock); + qht_bucket_lock(map, b); qht_unlock(ht); *pmap = map; return b; @@ -345,12 +411,13 @@ static inline bool qht_map_needs_resize(const struct qht_map *map) map->n_added_buckets_threshold; } -static inline void qht_chain_destroy(const struct qht_bucket *head) +static inline void qht_chain_destroy(struct qht_map *map, + struct qht_bucket *head) { struct qht_bucket *curr = head->next; struct qht_bucket *prev; - qemu_spin_destroy(&head->lock); + qht_do_if_first_in_stripe(map, head, qemu_spin_destroy); while (curr) { prev = curr; curr = curr->next; @@ -364,7 +431,7 @@ static void qht_map_destroy(struct qht_map *map) size_t i; for (i = 0; i < map->n_buckets; i++) { - qht_chain_destroy(&map->buckets[i]); + qht_chain_destroy(map, &map->buckets[i]); } qemu_vfree(map->buckets); g_free(map); @@ -390,7 +457,7 @@ static struct qht_map *qht_map_create(size_t n_buckets) map->buckets = qemu_memalign(QHT_BUCKET_ALIGN, sizeof(*map->buckets) * n_buckets); for (i = 0; i < n_buckets; i++) { - qht_head_init(&map->buckets[i]); + qht_head_init(map, &map->buckets[i]); } return map; } @@ -638,7 +705,7 @@ bool qht_insert(struct qht *ht, void *p, uint32_t hash, void **existing) b = qht_bucket_lock__no_stale(ht, hash, &map); prev = qht_insert__locked(ht, map, b, p, hash, &needs_resize); qht_bucket_debug__locked(b); - qemu_spin_unlock(&b->lock); + qht_bucket_unlock(map, b); if (unlikely(needs_resize) && ht->mode & QHT_MODE_AUTO_RESIZE) { qht_grow_maybe(ht); @@ -749,7 +816,7 @@ bool qht_remove(struct qht *ht, const void *p, uint32_t hash) b = qht_bucket_lock__no_stale(ht, hash, &map); ret = qht_remove__locked(b, p, hash); qht_bucket_debug__locked(b); - qemu_spin_unlock(&b->lock); + qht_bucket_unlock(map, b); return ret; } From patchwork Thu Jan 26 11:22:45 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: 647110 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188403pvb; Thu, 26 Jan 2023 03:31:14 -0800 (PST) X-Google-Smtp-Source: AMrXdXsk+TIWo98OpyhI/SHH2okG3cNVxtbKx1M54RDUk/veBZT2rAJBRt4VZxvzqCGmwGXg+D8x X-Received: by 2002:ac8:7395:0:b0:3ac:c2b8:19 with SMTP id t21-20020ac87395000000b003acc2b80019mr48428253qtp.19.1674732674058; Thu, 26 Jan 2023 03:31:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732674; cv=none; d=google.com; s=arc-20160816; b=wVqEpFHG6jul0rcW8DdjUi8x66MLU8n0GW/2SsODDpwYr3iJ4vMhWW9I9maLNJzLn6 KRklSZ3fcSi9VWnvjc9Bnoq8ZzNiiy2HEWvPr6lIRPs1+jOpDVs2OZafp+PHczbyxcG/ UBl0FyHk6DiLSPsXgZ8bsH4x3T+J8VW8Qf6GZcwaHEb07J6tK61an0PGiQqL27DXFFKT aKRfm1gh6U47Uf5z4VvatGpNbnwBYj70DHHDMb3ErJbfSBoltGB9nyFTl6F+rZaSQI4p odH9wRsiPKsQSbrZwdpD8vHM52IkOE7EuPuG2oyz7KVt6B2sPqgIDTnr8/F2GQJo8Qc3 eIDQ== 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=Dxqv1wYRpSn53E/nUZT1yc2AZ9KkmDIimuwl5F539Pg=; b=YlH1qrkbqJ4HVXJnc9DQ+0465Q/KOK2B9jbWYDm5l5aWVj3Od7EzIwHkIrlxjiU4Ai ayZPcxkOfh92WT0cCxwR6tsuPPh/8ZOcsv3H4tQfGP46fmY/gSh2Je9GSc0rP8FYpw81 VRZzxB7z1Nyazh9fkn282RTh6dA9KdWM3/QFUX6M3SvwP3FEfRFjlgxup08TNKcgqZt2 N0FrUKjmhUqgwkS/Za0eJ7hHN/O3QiL3Q7t7rYSFhsFc7X31SqzRDMZ5+f6CPldWerEe yc5jnDehL9ayO1Ve3Zr6s6HevfKZ5gxikkkX90uoy7RzSl4/z49zDfXJNcU3OtkBQlmI /Xbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UmGqPgcH; 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 u10-20020ac858ca000000b003b633c2b328si517109qta.516.2023.01.26.03.31.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:31:14 -0800 (PST) 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=UmGqPgcH; 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 1pL0La-0003V1-Or; Thu, 26 Jan 2023 06:23:14 -0500 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 1pL0LU-0002sa-9Z for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:08 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LS-0003hj-6p for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:07 -0500 Received: by mail-wm1-x336.google.com with SMTP id f25-20020a1c6a19000000b003da221fbf48so906630wmc.1 for ; Thu, 26 Jan 2023 03:23:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=Dxqv1wYRpSn53E/nUZT1yc2AZ9KkmDIimuwl5F539Pg=; b=UmGqPgcHwRjDFzb8yZqMNA7/lydxW4B9patxi3MPuydLJUpWZDseyHwJquwGSB9/NH kpx0sbDrU8ZDLy4OB+NRP9DoSVa7q3wNB7sW5IqLP9Q7h6nPSYa9nFuQdTqxXRmQjEcz QCb29bqfRbAapdeO197dtL6Q2IWTXnj+F1Sx9o8U7sHkZv2pER+41YUJqE+o5Vf1sjm4 V3h95xHX75Zc5cdz80N8BmGclpF3GUUCqyePSH6fW6SJpMau6djyImuBCbH/lTbDb/pZ SjgS1gVGlOFxAlymF2m54iOz1jVG4hXwjJQEn6CsVG3/bGE5a7VZ2wNrLwRJKbURhmZI +Fgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Dxqv1wYRpSn53E/nUZT1yc2AZ9KkmDIimuwl5F539Pg=; b=UYmjtWWZ8ZQIyRC49UcI0jEtWHqa1+wUeIj7jxATwmO4M67f29N2Vy9MLXft0YG/Iy Eq8C0INSQO6xbt4/XPOwqwOHMWmAKdjjll5vBNXGb5h91E6r3kCfXJG0Av41B+gZFmJi uIviouPuqGfjRU00qFoxVDavXJ9UkwuyBwR81UtQ+cozo6G6VwsAiclkF71Kh6fFB4sk F99C3zYOis3PTzg3T2ZcW+tRfgS+Ef1aPvVGJ2wFC/PK9+vkIDJUZigZp62aaD6aJjd1 uuPIh6TiO/zVG+DQiPgdHVU96cIcQRncaD1m9acDc191i+zEBcppDDe1y/HW7Xt7m1NY TXzA== X-Gm-Message-State: AFqh2kr6dOmljpubIGg3w/Fe5ATKs+9bdaRyGvWReZqq5bKDx7asrLQE KYiZXFuNqKorJmmv7aZe6iD5ixPayGvcGhhF X-Received: by 2002:a05:600c:3b07:b0:3d1:cdf7:debf with SMTP id m7-20020a05600c3b0700b003d1cdf7debfmr33726409wms.26.1674732185341; Thu, 26 Jan 2023 03:23:05 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h15-20020a05600c2caf00b003d974076f13sm1345540wmc.3.2023.01.26.03.22.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:23:01 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3DBC31FFC2; Thu, 26 Jan 2023 11:22:59 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Emilio Cota , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Alexandre Iooss , Mahmoud Mandour Subject: [PULL 30/35] plugins: make qemu_plugin_user_exit's locking order consistent with fork_start's Date: Thu, 26 Jan 2023 11:22:45 +0000 Message-Id: <20230126112250.2584701-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: Emilio Cota To fix potential deadlocks as reported by tsan. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Emilio Cota Message-Id: <20230111151628.320011-6-cota@braap.org> Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-31-alex.bennee@linaro.org> diff --git a/plugins/core.c b/plugins/core.c index ccb770a485..728bacef95 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -500,10 +500,17 @@ void qemu_plugin_user_exit(void) enum qemu_plugin_event ev; CPUState *cpu; - QEMU_LOCK_GUARD(&plugin.lock); - + /* + * Locking order: we must acquire locks in an order that is consistent + * with the one in fork_start(). That is: + * - start_exclusive(), which acquires qemu_cpu_list_lock, + * must be called before acquiring plugin.lock. + * - tb_flush(), which acquires mmap_lock(), must be called + * while plugin.lock is not held. + */ start_exclusive(); + qemu_rec_mutex_lock(&plugin.lock); /* un-register all callbacks except the final AT_EXIT one */ for (ev = 0; ev < QEMU_PLUGIN_EV_MAX; ev++) { if (ev != QEMU_PLUGIN_EV_ATEXIT) { @@ -513,13 +520,12 @@ void qemu_plugin_user_exit(void) } } } - - tb_flush(current_cpu); - CPU_FOREACH(cpu) { qemu_plugin_disable_mem_helpers(cpu); } + qemu_rec_mutex_unlock(&plugin.lock); + tb_flush(current_cpu); end_exclusive(); /* now it's safe to handle the exit case */ From patchwork Thu Jan 26 11:22:46 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: 647100 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp187457pvb; Thu, 26 Jan 2023 03:28:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXvukQU3Gsf4/8fBnXtWhACyAVNAfosGiRC1KEPltUtTA4tTdR2UcjJJwIcXIB8Gxi6UAbJD X-Received: by 2002:a05:6214:5d82:b0:534:8549:14a0 with SMTP id mf2-20020a0562145d8200b00534854914a0mr55700019qvb.48.1674732538892; Thu, 26 Jan 2023 03:28:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732538; cv=none; d=google.com; s=arc-20160816; b=FNgHlQklve5kKqjPhHXWIbmdJ5of94mycnOPeis4SA6EETJSGtgDbhg3d78LjQ7GFh oIBqC+213W0ynJDR88FCmbYTWWbYYl5qZ5Os+iKW+9VJDInSWrq9oOSIx1BU1IN/Y8u4 9wybTA2qBbvzG2+f/BngznGMu8JRhvcPRhvI3m1dMriYn/0UNOF9RimwyX6RFgX4VLBJ TG+PLKgxfMQiFikEh4dnAaudGxsbW8xxPaQNDrIo9aW3sHH12752Io8ivJ4WAmewIEFX eds2ceTHHMxuM7Z438O20FXMKDak6pxplzUn8Pt/1xMVt6OYzGoMQ3QQZQ9E0rJ4u2V4 OFuQ== 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=WMKYhd9TX4wsL34GOByCJGYMOpnSk1b4tc7gsSxzvRM=; b=NTIbClCr4S/1XTzDt0Ebo+TXHxB19hfufUKH44cm+xb+6l55sWgVRgkXS7D/vXzrJa tcSlygoGQfQt4YpqUheyayYi3mBgMtJi1TSCpZmQbj0CMZDXL202P3mfLQ/HNLEiCgGJ 6AdOkBmPnQkD3ILWqNHo/sIQTMfweGCJ27oDQS4bX8FHQAQbtGWjmwF4vDbHZamIyexT gmCyohDBk8VD6fAcZ5x8inAtcvQvshPEBUpX9cslfEODnDT0tJMevyZ7wsmtF7Vlna1e NYvtqLMkW+qta8h9Scs9IdCb9kwwtPav391Gx6+9in1AWxEspynvOqswT7SMrtqW3ff8 ++Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=u+5u2p4v; 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 q29-20020a05620a2a5d00b00706b0f2c81fsi845671qkp.669.2023.01.26.03.28.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:28:58 -0800 (PST) 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=u+5u2p4v; 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 1pL0Lj-0004Mk-50; Thu, 26 Jan 2023 06:23:23 -0500 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 1pL0LS-0002kY-Oy for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:06 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LQ-00045J-Mn for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:06 -0500 Received: by mail-wm1-x32f.google.com with SMTP id o17-20020a05600c511100b003db021ef437so888662wms.4 for ; Thu, 26 Jan 2023 03:23:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=WMKYhd9TX4wsL34GOByCJGYMOpnSk1b4tc7gsSxzvRM=; b=u+5u2p4vaAWZr4f07Nh1y32VBVlmmLzft3qPns81O99Jczdvi8izkMn2TrtA+8tz57 9PIV925RFtCVuStjDs/64XHdRcjiHa0r338mku6nhddTsgp1NweGWzQ0EH6HE15V0rRG XeKovDuzFw+Ta1RwQVvsxfNVpjxMrr/H02MsF6GwgSca5ZesgUxzKxCk96EchPHnaLqL XPcZfAkK6Z+69GbxXy40ZNzElevQ0THZ5gk5zSqLkep7XEgdAKYa1E2MtL86Qt6wyRXW ozzT53V7IaRdFU7kaDREdDMI1YUYoTeeY6c30q2TewVZgFJNDJz7g2wQ+so4+r495yPb s6Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=WMKYhd9TX4wsL34GOByCJGYMOpnSk1b4tc7gsSxzvRM=; b=jE9iSdLLBz4SkNmKnhKNBxmPO5RGtgUAA74Xn6fhSmIhIrFnVDVi70d3n4W1uiKd23 GhCDR0L8LlWvie1uIaPQ5BIx+4mJ4lrTujriQCpVKetqexVS/jgjS1Hq/SPeR/PA5zZw s/liiOfwvgkOmDDxBUGtRy3VQEfEb13M+YsXCgsRMPCi9geO9cUgTcLTYBcJdph8VXVi PDu0hj0xaKyPFcdN0AaqZXQK06sJ6U7tn0FJQvbLqNzh1bLFvl45fm/TXdfNAU9Dx4Q7 5wxTZjD0HUHRvdzLrqvp1+OllEc83eHYE0tTqQuzwPRPJEyoP0ShGqbDSdTEqafrF6+3 22Hw== X-Gm-Message-State: AFqh2koxyNFmEGdiCrrYFykLwvWYiGm6d7euaEOiZ+uKsE3YflAC1UYb wv3IOwus8Fx5qVDGc6CtniMK9Q== X-Received: by 2002:a05:600c:1e1f:b0:3db:e13:750c with SMTP id ay31-20020a05600c1e1f00b003db0e13750cmr33608407wmb.29.1674732183037; Thu, 26 Jan 2023 03:23:03 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o7-20020a05600c2e0700b003dafa04ecc4sm1170327wmf.6.2023.01.26.03.22.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:23:01 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 706421FFCE; Thu, 26 Jan 2023 11:22:59 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Emilio Cota , =?utf-8?q?Alex_B?= =?utf-8?q?enn=C3=A9e?= , Richard Henderson , Paolo Bonzini Subject: [PULL 31/35] plugins: fix optimization in plugin_gen_disable_mem_helpers Date: Thu, 26 Jan 2023 11:22:46 +0000 Message-Id: <20230126112250.2584701-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Emilio Cota We were mistakenly checking tcg_ctx->plugin_insn as a canary to know whether the TB had emitted helpers that might have accessed memory. The problem is that tcg_ctx->plugin_insn gets updated on every instruction in the TB, which results in us wrongly performing the optimization (i.e. not clearing cpu->plugin_mem_cbs) way too often, since it's not rare that the last instruction in the TB doesn't use helpers. Fix it by tracking a per-TB canary. While at it, expand documentation. Related: #1381 Signed-off-by: Emilio Cota Message-Id: <20230108164731.61469-2-cota@braap.org> Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-32-alex.bennee@linaro.org> diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index a772e14193..e0ebedef84 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -118,7 +118,10 @@ struct qemu_plugin_insn { void *haddr; GArray *cbs[PLUGIN_N_CB_TYPES][PLUGIN_N_CB_SUBTYPES]; bool calls_helpers; + + /* if set, the instruction calls helpers that might access guest memory */ bool mem_helper; + bool mem_only; }; @@ -158,6 +161,10 @@ struct qemu_plugin_tb { void *haddr1; void *haddr2; bool mem_only; + + /* if set, the TB calls helpers that might access guest memory */ + bool mem_helper; + GArray *cbs[PLUGIN_N_CB_SUBTYPES]; }; diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index c7d6514840..17a686bd9e 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -579,7 +579,8 @@ static void inject_mem_helper(TCGOp *begin_op, GArray *arr) * is possible that the code we generate after the instruction is * dead, we also add checks before generating tb_exit etc. */ -static void inject_mem_enable_helper(struct qemu_plugin_insn *plugin_insn, +static void inject_mem_enable_helper(struct qemu_plugin_tb *ptb, + struct qemu_plugin_insn *plugin_insn, TCGOp *begin_op) { GArray *cbs[2]; @@ -599,6 +600,7 @@ static void inject_mem_enable_helper(struct qemu_plugin_insn *plugin_insn, rm_ops(begin_op); return; } + ptb->mem_helper = true; arr = g_array_sized_new(false, false, sizeof(struct qemu_plugin_dyn_cb), n_cbs); @@ -626,15 +628,22 @@ void plugin_gen_disable_mem_helpers(void) { TCGv_ptr ptr; - if (likely(tcg_ctx->plugin_insn == NULL || - !tcg_ctx->plugin_insn->mem_helper)) { + /* + * We could emit the clearing unconditionally and be done. However, this can + * be wasteful if for instance plugins don't track memory accesses, or if + * most TBs don't use helpers. Instead, emit the clearing iff the TB calls + * helpers that might access guest memory. + * + * Note: we do not reset plugin_tb->mem_helper here; a TB might have several + * exit points, and we want to emit the clearing from all of them. + */ + if (!tcg_ctx->plugin_tb->mem_helper) { return; } ptr = tcg_const_ptr(NULL); tcg_gen_st_ptr(ptr, cpu_env, offsetof(CPUState, plugin_mem_cbs) - offsetof(ArchCPU, env)); tcg_temp_free_ptr(ptr); - tcg_ctx->plugin_insn->mem_helper = false; } static void plugin_gen_tb_udata(const struct qemu_plugin_tb *ptb, @@ -682,14 +691,14 @@ static void plugin_gen_mem_inline(const struct qemu_plugin_tb *ptb, inject_inline_cb(cbs, begin_op, op_rw); } -static void plugin_gen_enable_mem_helper(const struct qemu_plugin_tb *ptb, +static void plugin_gen_enable_mem_helper(struct qemu_plugin_tb *ptb, TCGOp *begin_op, int insn_idx) { struct qemu_plugin_insn *insn = g_ptr_array_index(ptb->insns, insn_idx); - inject_mem_enable_helper(insn, begin_op); + inject_mem_enable_helper(ptb, insn, begin_op); } -static void plugin_gen_disable_mem_helper(const struct qemu_plugin_tb *ptb, +static void plugin_gen_disable_mem_helper(struct qemu_plugin_tb *ptb, TCGOp *begin_op, int insn_idx) { struct qemu_plugin_insn *insn = g_ptr_array_index(ptb->insns, insn_idx); @@ -750,7 +759,7 @@ static void pr_ops(void) #endif } -static void plugin_gen_inject(const struct qemu_plugin_tb *plugin_tb) +static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb) { TCGOp *op; int insn_idx = -1; @@ -870,6 +879,7 @@ bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db, ptb->haddr1 = db->host_addr[0]; ptb->haddr2 = NULL; ptb->mem_only = mem_only; + ptb->mem_helper = false; plugin_gen_empty_callback(PLUGIN_GEN_FROM_TB); } From patchwork Thu Jan 26 11:22:47 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: 647091 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp185684pvb; Thu, 26 Jan 2023 03:23:54 -0800 (PST) X-Google-Smtp-Source: AK7set8dCT726iBlUx1rAK+SEUObhYxXsTYP0W7qo1MGFwPjPoblwLAWof56A9UdOi/OscZURhgT X-Received: by 2002:a05:6214:598a:b0:537:7e93:2265 with SMTP id ll10-20020a056214598a00b005377e932265mr2360131qvb.40.1674732234126; Thu, 26 Jan 2023 03:23:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732234; cv=none; d=google.com; s=arc-20160816; b=p2fYNOV/8uMskWjEX6MOyL53wc6qWDz7+e8yHRdAk/Aufn/AOc9c9CcW8Owzs+uEmG zDTPu8/D5WPoghHZ6zvxEeXYbOczpCv3pVAlwXSLTgUBXz9TjGBqXtaAHJyKajmG743/ IcM/T+XvQin7NGidmiN6kk/SamAJWfdF+6PquWYc0BhMPFhCPf9+DXTvEaWZcWx/xsZN VRm/9r8Rml5uo3/FKwMOSoGjEBQSQmF9fBG8ozph5Er4k4E9ZKoFLMzNqGI1Pm17IHf5 kxKMAZC3rytKNw8y4sSut4l/yOydoH2b0tKfNfzRjP4BiM8JXJgZnhlvN3ETA+ng/bWM +tkA== 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=vuHIkf4e6GqtJJGRDN7Gz8dOSuK3Oawb4EIUEUIUh9o=; b=vGXqs+CtnSoD3zBFDHfEgarXgpC1pDkpVJKiOwJOx9Tf55t4cUD/geM7hl/92MdPHA hjRoMSUeDodnjyVxY4iEJhg4qZkm33UO06qUY2dgjECIoaRwt6RA9uko8HrnGs8XgBle 28pavmFlM+h4cRAKOyBTY2qiCYFa27H/9x9fiClGatmwYp1QwPQUnk7L4vKBS3aW8Giz /eHI7JyfIEO5XOIppVk1WvMIeNj1n+PxVs3PFUwEj1q3bcwDa9zgPuRBpBrLWPQpqHqj /poGtOJDyGfxozBnarSSSO8gA4ELi6DZX9Nnz5IXIxMGUh8jq8sZfVx75pfNpJN9eNzH 0xag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B8K0411T; 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 f12-20020a05620a12ec00b006fc2db94a39si753542qkl.661.2023.01.26.03.23.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:23:54 -0800 (PST) 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=B8K0411T; 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 1pL0LY-0003Ev-A8; Thu, 26 Jan 2023 06:23:13 -0500 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 1pL0LU-0002xI-V3 for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:09 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LS-0003eA-PX for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:08 -0500 Received: by mail-wr1-x435.google.com with SMTP id m14so969078wrg.13 for ; Thu, 26 Jan 2023 03:23:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=vuHIkf4e6GqtJJGRDN7Gz8dOSuK3Oawb4EIUEUIUh9o=; b=B8K0411TdwY+DKBgVJXc7IYNsW9FyFIzT3N6xfcBP91n5xTPuf0/FfqZXLIFa4glHh gcmQ3e7Ztrf8PeFrdXKG8AkXfJtV9uqGz2ItJma69QhA+bdQTfHLwkSevxkPaxN1oUjx EkjHJUMM/JWpx4TEsxgBiD/XPMNDW11S50d3hLfH+x79lE2aP+fbsJnibsZkS0t5vRY/ 3OFoskaYpUH/KMGCRzcw/nUg2fVpJrRiKmvE1xX3LJoVpFaSQOuPDfYYgxHi9HeeWnHd eoOKtw5aStXtd8bRx3cOQbBrbkAJjEJ7MFzUg1j50BnNrVJEkgUw23fJKoxgb3DM+JB1 9D5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=vuHIkf4e6GqtJJGRDN7Gz8dOSuK3Oawb4EIUEUIUh9o=; b=dd3hdK7iyAG0lObeKl0AWz9H6aTWHY27XCdZgxCiRqwIYkJZlXWmC5zKfdFImeKI9z 2a/usD+kxYeEdfBRl/U5aUIqQKT1UUiqCrF/rDgOVL3nYOwA/yIR60VId278EyU44/FR /kkfWqztkRNPPDgIFiUMk/qsI0pIZIakTwF8FVaKajI5sTGpoQxKMngt3rJsmXtCX+h+ PluPrpO/4BvSeKJdmSzLUrqQxiJmputBLncV0mK+T1IGxiIG6/K17pAakLN9/eE2l0kj 6yZFZfyT7sb7Yc0SyopQe5+mfI+hTmEuVw71ppnLfuv8kIM7RUhVaZDB3FgmqEVio7PN vF5w== X-Gm-Message-State: AO0yUKUFGuBA7w0wXuYcQqfmqu3PTsnZ20YPHA3jpdjFyoBna6YzAchb OQ2mJeACwSuxoHLSp9R3c8PduQ== X-Received: by 2002:a05:6000:1f05:b0:2bf:bc38:17c1 with SMTP id bv5-20020a0560001f0500b002bfbc3817c1mr4802157wrb.4.1674732185848; Thu, 26 Jan 2023 03:23:05 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q3-20020adff503000000b002bfae1398bbsm1042967wro.42.2023.01.26.03.23.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:23:01 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A6C111FFCF; Thu, 26 Jan 2023 11:22:59 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Emilio Cota , =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Paolo Bonzini Subject: [PULL 32/35] translator: always pair plugin_gen_insn_{start, end} calls Date: Thu, 26 Jan 2023 11:22:47 +0000 Message-Id: <20230126112250.2584701-33-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Emilio Cota Related: #1381 Signed-off-by: Emilio Cota Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230108164731.61469-3-cota@braap.org> Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-33-alex.bennee@linaro.org> diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index 061519691f..ef5193c67e 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -100,19 +100,24 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int max_insns, ops->translate_insn(db, cpu); } - /* Stop translation if translate_insn so indicated. */ - if (db->is_jmp != DISAS_NEXT) { - break; - } - /* * We can't instrument after instructions that change control * flow although this only really affects post-load operations. + * + * Calling plugin_gen_insn_end() before we possibly stop translation + * is important. Even if this ends up as dead code, plugin generation + * needs to see a matching plugin_gen_insn_{start,end}() pair in order + * to accurately track instrumented helpers that might access memory. */ if (plugin_enabled) { plugin_gen_insn_end(); } + /* Stop translation if translate_insn so indicated. */ + if (db->is_jmp != DISAS_NEXT) { + break; + } + /* Stop translation if the output buffer is full, or we have executed all of the allowed instructions. */ if (tcg_op_buf_full() || db->num_insns >= db->max_insns) { From patchwork Thu Jan 26 11:22:48 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: 647119 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188938pvb; Thu, 26 Jan 2023 03:32:33 -0800 (PST) X-Google-Smtp-Source: AK7set/2jYB4mFbq1iYISEIcq8qXQRT3iM7ybpFLGD0pZM4a5i5RrzQZOucA20JbZqm1HhjKOey1 X-Received: by 2002:ac8:5995:0:b0:3b0:2fa:8a90 with SMTP id e21-20020ac85995000000b003b002fa8a90mr2857790qte.8.1674732753631; Thu, 26 Jan 2023 03:32:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732753; cv=none; d=google.com; s=arc-20160816; b=QJU3NNAfpGGE8Els2ih+XVTBZTMzbXnVEBxutShuHKhd7CKO4VBbP+GztVxunKwnFb lf1ZcWOkJ9G3I+m4s99TrOS9GnMxSYETA7IcyQVB/gSASMcuQGVWS7KxN66cW4pI1G8V 8Lc8W+lJTAL+NeGMC7KD6LDzMCoEWvhcWaNTwoRytvppcnSIsuEMQcM2jRnjVvpsnQD4 3ldt1gCbCrcyfr73ZVJ9g2yJ9DzPIT4MjvECCm0pPDJ1GoR8715oENY6jODtQLBFWSof 9gqpLmYgPK9GMDzJKn08OzEZEFp/1Iz4LEZmm/TXoEPzTEE5O7rjIqdD6Q7y04NjsM8p ip5Q== 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=UUquEbB7BYPXscqNOEIUMtAR42gGz+ZdtvQ3iT3SzLc=; b=wT6SSJfgQ01CC//5/+QgJuGNK3xc/4ob/PKNDVtpe3uV9hWHUKzTxUOlmm34uDWgsi VpiUX8kB1yrYURCxdH1uXIZ3fmzx6QDkbypwXIFEyoeKKRJvZ/JF36JdmRjSyI80fYqM ycaIe3D9HmrmnBuj+H64n2/qGfGOG9GZIwAG3wtXabvb1gD0antgOuBysJ8UoR8cFZj+ G837A2NzbbWd+e6XqLwWrWHNiCHktuenCcYmESb60qVrn6ipWKKwnsohgjsg77YdWyNP mrCR6nxVNSjS1SXAaWPT7AvpFuM/eCPIA3+qWHoDw+qJ++J4Id9oCLKQ3PnnTMS+lhvt fRDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=A1Tv29Lv; 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 s12-20020ac85ccc000000b003b63c1ab226si544569qta.535.2023.01.26.03.32.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:32:33 -0800 (PST) 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=A1Tv29Lv; 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 1pL0UH-0005dX-P6; Thu, 26 Jan 2023 06:32:13 -0500 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 1pL0U8-0004dq-Hl for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:32:04 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0U6-0007oK-0e for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:32:03 -0500 Received: by mail-wr1-x431.google.com with SMTP id h16so1423229wrz.12 for ; Thu, 26 Jan 2023 03:32:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=UUquEbB7BYPXscqNOEIUMtAR42gGz+ZdtvQ3iT3SzLc=; b=A1Tv29LvCbi5K7bwZcYIThXUjA7I5lxhTz5ACqBMAT4hAYcyYsH6FxUzzYZokGKlS3 W4kFbr6mA31A/l9nRrRmQE4zpyHHhdXwyOg/Vs6dZVdPq0nseFRCQtBBX6syXbgtCgEA mlvxYoLp3y35dgOrcPMlxvljHV00xm2eGbwrhW7cnIa+512AH0PegEw3TqHjZg/U2W7L 0ubaw2MCClYVO771w27XBSY5WbY3g2meJwwXVf7S6EmINC9RAi2J0iAPnjUVz9x807Cw 4hH4cyYyH/DCSc31dYJv4xRJ7yLmAd9VVZJ/DV2m5M78HxsZqSJ7aoCdjoz7f9UV8e8z gn5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=UUquEbB7BYPXscqNOEIUMtAR42gGz+ZdtvQ3iT3SzLc=; b=YBtHq1/ZgdjI7U2VbqJPs3izey77o6HjGFrc5zOBPFkVyYr0/SnsWLDNmHm16tEJNN irpeFX+Uxh90cqevfAqY9fjL2UJhIAHfTyNok380A5GPLocfPcDflfeoQTqOyojW1Kvj Yzyl7KVt3IODw7SZcsvCsw8VVdJCqV2cl5OPhNrcR+rUHgevHXCYf+gq/Q5Ddh01tI98 yiUfPWD0eMmkRuMw9JXtyYT8nT/gEKZK/9WnSWAA+JWYd97sSI2dGVsMUz56svxo4lLi oZ+eN7mkf6bLv4K52kx+GNUOaOwy68Zl/SYhmetHQgcLx0rLxF+w36pt0BNetfKn3FEa 7Jpg== X-Gm-Message-State: AO0yUKUMWAUCFR3yGpKVcAupTaqCBREkbcz06Any+IDE0z3mwk3bCUa1 +G7bQ4mcRZHMtEPcDCOv/gsFtg== X-Received: by 2002:a05:6000:1102:b0:2bf:c338:b02a with SMTP id z2-20020a056000110200b002bfc338b02amr1909964wrw.36.1674732719706; Thu, 26 Jan 2023 03:31:59 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m15-20020a056000024f00b002bfae16ee2fsm1137275wrz.111.2023.01.26.03.31.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:31:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F18211FFBB; Thu, 26 Jan 2023 11:22:59 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Emilio Cota , =?utf-8?q?Alex_B?= =?utf-8?q?enn=C3=A9e?= , Richard Henderson , Paolo Bonzini Subject: [PULL 33/35] tcg: exclude non-memory effecting helpers from instrumentation Date: Thu, 26 Jan 2023 11:22:48 +0000 Message-Id: <20230126112250.2584701-34-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.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: Emilio Cota There are actually a whole bunch of helpers that don't affect memory that we shouldn't instrument. They are helpfully identified by the TCG_CALL_NO_SIDE_EFFECTS flag which marks out lookup_tb_ptr as well as a lot of the maths helpers. To avoid the string compare we introduce a new flag for plugin internals so we skip that too. Related: #1381 Signed-off-by: Emilio Cota Message-Id: <20230108164731.61469-4-cota@braap.org> [AJB: updated to skip all no SE plugins, add flag for plugin helper] Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20230124180127.1881110-34-alex.bennee@linaro.org> diff --git a/accel/tcg/plugin-helpers.h b/accel/tcg/plugin-helpers.h index 9829abe4a9..8e685e0654 100644 --- a/accel/tcg/plugin-helpers.h +++ b/accel/tcg/plugin-helpers.h @@ -1,4 +1,4 @@ #ifdef CONFIG_PLUGIN -DEF_HELPER_FLAGS_2(plugin_vcpu_udata_cb, TCG_CALL_NO_RWG, void, i32, ptr) -DEF_HELPER_FLAGS_4(plugin_vcpu_mem_cb, TCG_CALL_NO_RWG, void, i32, i32, i64, ptr) +DEF_HELPER_FLAGS_2(plugin_vcpu_udata_cb, TCG_CALL_NO_RWG | TCG_CALL_PLUGIN, void, i32, ptr) +DEF_HELPER_FLAGS_4(plugin_vcpu_mem_cb, TCG_CALL_NO_RWG | TCG_CALL_PLUGIN, void, i32, i32, i64, ptr) #endif diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index 6f497172f8..8dc291d030 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -405,6 +405,8 @@ typedef TCGv_ptr TCGv_env; #define TCG_CALL_NO_SIDE_EFFECTS 0x0004 /* Helper is G_NORETURN. */ #define TCG_CALL_NO_RETURN 0x0008 +/* Helper is part of Plugins. */ +#define TCG_CALL_PLUGIN 0x0010 /* convenience version of most used call flags */ #define TCG_CALL_NO_RWG TCG_CALL_NO_READ_GLOBALS diff --git a/tcg/tcg.c b/tcg/tcg.c index d502327be2..fd557d55d3 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1674,8 +1674,10 @@ void tcg_gen_callN(void *func, TCGTemp *ret, int nargs, TCGTemp **args) op = tcg_op_alloc(INDEX_op_call, total_args); #ifdef CONFIG_PLUGIN - /* detect non-plugin helpers */ - if (tcg_ctx->plugin_insn && unlikely(strncmp(info->name, "plugin_", 7))) { + /* Flag helpers that may affect guest state */ + if (tcg_ctx->plugin_insn && + !(info->flags & TCG_CALL_PLUGIN) && + !(info->flags & TCG_CALL_NO_SIDE_EFFECTS)) { tcg_ctx->plugin_insn->calls_helpers = true; } #endif From patchwork Thu Jan 26 11:22:49 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: 647105 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188243pvb; Thu, 26 Jan 2023 03:30:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXtzbXzXsbdA+CRYva4aQEVokET1MlcoaJWZ9m18MFzkk5wPiDla30EWbCmi8yyFABuOHfFG X-Received: by 2002:ac8:5a95:0:b0:3b6:2f0d:1924 with SMTP id c21-20020ac85a95000000b003b62f0d1924mr68381130qtc.32.1674732653817; Thu, 26 Jan 2023 03:30:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732653; cv=none; d=google.com; s=arc-20160816; b=l0SkU73g6gGz4mYetyNEttqc6zG4S2kaNK9W7Rji76FXb8+FgZM5zRKtEx5DDQHg+5 +CvlgGZmwWH3mwid/IFyQmnMgeD8pRdklKAsb3mJAzN2gzERUmRBZaaFBnSOLYZiuQpi Aaqcxs9XW03Q0+HBu0ACBH3xDRxDGdPKi+UQ7wh6Femwx3xCDX49cujhEZKq3Tvcw4R+ rtkMLEI9Sd0jPshS2MNlcXbZD5xzQnjbOnzmCi24L15mSlVZyuegxvNVvf606iF9iDLg 5dKPUOKX4TPDFjpy961CGNJ9KrLJeTgBFNYTIBuzhwpbVFqQpwzn+Du1krIJ5Jw7gGAx XvWQ== 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=f9f+VLtMfEl0g+TsyrZ76kRHyOpYPXOzBzVbN5p8WhM=; b=PCss7sNWzIw2xyl4d6+E3ctaj26g6TznbeBaTent3XXBtJZquXDRGMU5yL9KR/73eD kcm931/5TFUwQ/EPNhSq3T3N0AGdDwNNQYNutZAyWRkxQGkGj+Pr0m4GCl7NE6Al6VWd DZlOrQpX0MHU2TZ3hh5iRNzKPeccYxRk5qE1Z/zA1vV81NU4C3C9BdjHSOg0DXzhm8Xg GXSpJ/GKh7DCsdwX7gQCMe+hTXTIIvNzD0IHOoMSpc/WLGXJeYAjvktu0HhenvVvaZ1P 360CDiRf46GVGiLwuyH/nEeNB8P4ZFHfh1Po2+pFuBt79cUh1S3puEtiTCFYBskaKsHD 1ibA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="WVJIE/eG"; 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 f19-20020ac859d3000000b003b7fba06da8si555219qtf.380.2023.01.26.03.30.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:30:53 -0800 (PST) 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="WVJIE/eG"; 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 1pL0Lc-0003fm-91; Thu, 26 Jan 2023 06:23:16 -0500 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 1pL0LW-000335-In for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:10 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LU-0004Ne-Iu for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:23:10 -0500 Received: by mail-wr1-x431.google.com with SMTP id m7so1417154wru.8 for ; Thu, 26 Jan 2023 03:23:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=f9f+VLtMfEl0g+TsyrZ76kRHyOpYPXOzBzVbN5p8WhM=; b=WVJIE/eGbJWNVm1lg0Lqr5C59YO82ZGtiKH5D0e6JBKFrHrufXoevHQfOVw+M0SRZL aDULhBSdyG1hXnkQtgf8elfKCOtvYxsBr3zzzG2wi7XgoAesbtjj1WvkP6H0JsmVCNSe nC5HiQmoYnTUWyiqH9+mIOTby2z41hAPLmYnTnkO6ICLzWOFj+tNKrM6Ko/P4E4WbpI7 69Mz98TwEWDYHg0UvKS6OH3kMW196RbNWK0wrSk46kEnS7csQ+JVh/zlFOYsIWBeVCWL bf6/7F9qsgktTzJ+Ll2l5pP2+HwEpUFu0ULyXLBG+/JlerApZd52Pl81W9xQuLurkccP BGSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=f9f+VLtMfEl0g+TsyrZ76kRHyOpYPXOzBzVbN5p8WhM=; b=xmIbyjqrg1BH84YLrj9gty1522wHDUBg1+xs1QHGPprn7QLHMs0gF2kawqx2fU4gX7 9lERS7m963eX55ipBlYzdnBv0g9HVDM5J5P8btIyOmAxMn69MxosgrX11Z7ZAvvwz566 0nSo/Wdhnkg1b4nyLvxA9dGoGx8G+MCwp88YzCz3j55/CzgNODz8cE3fcon7P1GkIuGO u4Y7qnzfFt1tqPS+lmEeHjCbyPQq80vXIz0CcdQOnn+c64q7C+S/S+Nsi7ElGcn2xTTI EHMGEFf6v+4TuuB+YgHT6r7JnEfWoq/DYjOgrqH1UQlm6AmzxRD01M3CXa3V7bRa8mt+ Pyrg== X-Gm-Message-State: AFqh2koyjJuNFXz36uxlr2kE6ev+Ylhb4hTuYgd2LKe6E7mcySXV2oll gNLiV2KmLQNkEL2D5kfY/pHGuA== X-Received: by 2002:a05:6000:689:b0:2bd:ffad:1bce with SMTP id bo9-20020a056000068900b002bdffad1bcemr34239101wrb.59.1674732186960; Thu, 26 Jan 2023 03:23:06 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id x13-20020adfdccd000000b002bbddb89c71sm1049761wrm.67.2023.01.26.03.23.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:23:02 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 308BA1FFC1; Thu, 26 Jan 2023 11:23:00 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Emilio Cota , =?utf-8?q?Alex_B?= =?utf-8?q?enn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Richard Henderson , Paolo Bonzini Subject: [PULL 34/35] cpu-exec: assert that plugin_mem_cbs is NULL after execution Date: Thu, 26 Jan 2023 11:22:49 +0000 Message-Id: <20230126112250.2584701-35-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.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: Emilio Cota Fixes: #1381 Signed-off-by: Emilio Cota Message-Id: <20230108165107.62488-1-cota@braap.org> [AJB: manually applied follow-up fix] Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230124180127.1881110-35-alex.bennee@linaro.org> diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index e0ebedef84..fb338ba576 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -59,6 +59,8 @@ get_plugin_meminfo_rw(qemu_plugin_meminfo_t i) #ifdef CONFIG_PLUGIN extern QemuOptsList qemu_plugin_opts; +#define QEMU_PLUGIN_ASSERT(cond) g_assert(cond) + static inline void qemu_plugin_add_opts(void) { qemu_add_opts(&qemu_plugin_opts); @@ -250,6 +252,8 @@ void qemu_plugin_user_postfork(bool is_child); #else /* !CONFIG_PLUGIN */ +#define QEMU_PLUGIN_ASSERT(cond) + static inline void qemu_plugin_add_opts(void) { } diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 25ec73ef9a..9c857eeb07 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -504,6 +504,7 @@ static void cpu_exec_exit(CPUState *cpu) if (cc->tcg_ops->cpu_exec_exit) { cc->tcg_ops->cpu_exec_exit(cpu); } + QEMU_PLUGIN_ASSERT(cpu->plugin_mem_cbs == NULL); } void cpu_exec_step_atomic(CPUState *cpu) @@ -980,6 +981,7 @@ cpu_exec_loop(CPUState *cpu, SyncClocks *sc) cpu_loop_exec_tb(cpu, tb, pc, &last_tb, &tb_exit); + QEMU_PLUGIN_ASSERT(cpu->plugin_mem_cbs == NULL); /* Try to align the host and virtual clocks if the guest is in advance */ align_clocks(sc, cpu); From patchwork Thu Jan 26 11:22:50 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: 647120 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp188993pvb; Thu, 26 Jan 2023 03:32:41 -0800 (PST) X-Google-Smtp-Source: AMrXdXsp/42FuFN1n9vPjaNsHqTNUVYLL9ToULzrjuAd+JuUuhxBYdJYzEbV6oFFFaFV14t2/Izf X-Received: by 2002:ac8:4801:0:b0:3b5:2a7:b4f5 with SMTP id g1-20020ac84801000000b003b502a7b4f5mr41033320qtq.10.1674732761541; Thu, 26 Jan 2023 03:32:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732761; cv=none; d=google.com; s=arc-20160816; b=mVVe5Bj3wPce2V1dFp5dX9v2m869zIJt9EU8yrNL7SHaLP8JFgUhLWg/5FTDtpEloF qtGvMsCWVC8yqyLXfYCSlGU8yjGNuxYrinYFXNMfSWkn0L3sADSt8Nf6hYNCkQShy8uP 9QQXHJ+yXjWiDoLzPdqpvrqpUwpzfDDlV5xeMNzeQcPMO0wqMzQR/tGAwhOLN7lZ0Tys d0iCSAQDzu+43+fglkNKfzlysbZYD+YrmnsIjKGKO6XQZkZfoNtNwR0xjwHvftPSeBTj hhLu1oHAH2iPf3DlVorIHHt+pphnjnrV3SnCyZp6iAvy41PJD9uZ9SOaagHbQoYVDOUB 7btg== 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=KAedoRL+04dN+eFrsiPk6/tHLkIJLlCMSJ8k6o72Dag=; b=Obhp9YvqvvxOutuxwNsjnTT9gBsSCIz9UVBe2rX4yjSBM4ACaYG0HLcxj6NQ1XWVXi EZoOSSbut0B7+onJ0AP6TlGiKNf/MUcSZ8SNNwjLD/S9S5BMl20C+aOtFOS+z4SL80GL PshF9w8Lityi8Pw17K/ab3XjPBFS0UBlRKXtCZreAw0F7ytzgqwmP4PQIQvZDeaNUkTo BiIfVB7cW22/bV2orpzFAJeGnLxX0pgcQD9Pexp2qfTJF0nKmg1WaH5WTWw8WD6rKYCR HrBTY6cDKg5vD5ozMDToLh+HvnflPzweKJ0ZHOuSu/C+xCoS/kokJJFKEoVsPY6NmqEt qmyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EXLjZW9+; 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 d12-20020ac85d8c000000b003a816490ad8si570260qtx.240.2023.01.26.03.32.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:32:41 -0800 (PST) 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=EXLjZW9+; 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 1pL0UE-000570-1d; Thu, 26 Jan 2023 06:32:10 -0500 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 1pL0U6-0004XF-CM for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:32:04 -0500 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 1pL0U3-0007nk-LD for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:32:01 -0500 Received: by mail-wr1-x42f.google.com with SMTP id z5so1450225wrt.6 for ; Thu, 26 Jan 2023 03:31:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=KAedoRL+04dN+eFrsiPk6/tHLkIJLlCMSJ8k6o72Dag=; b=EXLjZW9+gkxubutLdQDK10aAO4mCkE4phdzQ2QQXzoucZtrF5O5LJaTSdjJSZWO4m+ gcKSZ+5YwJag+sD4wFWGPrl2qNN3OuMPOsH427K6l8PxnaJLMgg3J6UVGqhDZUI0jcPC LeUO8cd63DspAf+EH01UCPCH0MRC30lBWZS2iR3/Be32wUlv0ZfH70uWojI6EN+xTSnh gNa1BoKDBE4wfvfhtPHAO/ImnivKd6V6PfdDyFdfE8jHe/bj0L7hXUAK30vSSkuVKkY1 QOzEsZz63iPd0oEYyK7PrLvMWizT8kIBz9mdqv7vVgM8XzS6NFH36bUUblA+rnyto89N gcCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=KAedoRL+04dN+eFrsiPk6/tHLkIJLlCMSJ8k6o72Dag=; b=ZGdKC2ftJa5odyHpzIks5uUjLSNBohoosnUZdOYs1WmcTmAEnLSaayHMbug1ZtGbKO O/5839/0AjchE5pJgecOKQuOqhdXSUHVvOS+elNFO/7EVXp2T18sK3+dKtg1vdmpcFaH gMasMxPTSre1t0O1/VzrbZTDNLZ330h9mzuBHX9u4WOrutsEhQgMOO/FBbLo7eHxa0uj fZvaObdwJO3YNRwwBzzlZagTx8AAWNCWvTydK4FwAI3iMv3R6BWVVGzO7CSzJmrwP1bR BDFEFlCa/ct7p1fMy9tbR6NCCj0J8gUBc6v4a7N8j8M2vfJmzqffxqPjpa7ZZ1axBq0f T64A== X-Gm-Message-State: AFqh2kpYB9zkTEWN3F1uk4uXZHulRPyR5y49kYJ8zz8OKQPgq7IbKB4q Zbphj6AOfVC0UIeaG82sZGhNIQ== X-Received: by 2002:a5d:5a85:0:b0:2bd:f5df:2689 with SMTP id bp5-20020a5d5a85000000b002bdf5df2689mr33546123wrb.47.1674732718211; Thu, 26 Jan 2023 03:31:58 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id t4-20020a05600001c400b002bdcce37d31sm1207327wrx.99.2023.01.26.03.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:31:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5D3B11FFD0; Thu, 26 Jan 2023 11:23:00 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Alexandre Iooss , Mahmoud Mandour Subject: [PULL 35/35] plugins: Iterate on cb_lists in qemu_plugin_user_exit Date: Thu, 26 Jan 2023 11:22:50 +0000 Message-Id: <20230126112250.2584701-36-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-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: Richard Henderson Rather than iterate over all plugins for all events, iterate over plugins that have registered a given event. Signed-off-by: Richard Henderson Message-Id: <20230117035701.168514-4-richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-36-alex.bennee@linaro.org> diff --git a/plugins/core.c b/plugins/core.c index 728bacef95..e04ffa1ba4 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -514,9 +514,10 @@ void qemu_plugin_user_exit(void) /* un-register all callbacks except the final AT_EXIT one */ for (ev = 0; ev < QEMU_PLUGIN_EV_MAX; ev++) { if (ev != QEMU_PLUGIN_EV_ATEXIT) { - struct qemu_plugin_ctx *ctx; - QTAILQ_FOREACH(ctx, &plugin.ctxs, entry) { - plugin_unregister_cb__locked(ctx, ev); + struct qemu_plugin_cb *cb, *next; + + QLIST_FOREACH_SAFE_RCU(cb, &plugin.cb_lists[ev], entry, next) { + plugin_unregister_cb__locked(cb->ctx, ev); } } }