From patchwork Tue Jan 10 17:38:57 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: 640895 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2882699pvb; Tue, 10 Jan 2023 11:31:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXv8zw4wXH9o9X8KBYtyRO9+NPy71QVpq7xg4M21EPcFPrxn3W80JQl8J2OnAYuOURBibaHZ X-Received: by 2002:a05:6214:3d86:b0:532:1448:eacd with SMTP id om6-20020a0562143d8600b005321448eacdmr29446295qvb.43.1673379097437; Tue, 10 Jan 2023 11:31:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673379097; cv=none; d=google.com; s=arc-20160816; b=A+60MBaPxciTZdRskM1S2GBBTItZdv3K4Y/RAhsuOWl/elHsOYVgkG8fEQiR0nmRtQ FBJoSxjK6sfUmTrptGcETI8MmVDs/uWsREzyH0E4H7/Wo5g27XePwXn+EW9QDaGJDBNA TR5SPBsDmGgeKFkFxZCzK8wjtVtY5XreY/fxaJR3oU+92zv2nEEehyeKBmKEq0qUSDj3 4POBHk1zs3DF3ap9yQCKsBQrnxXMQRjnYZx/0ukHL8GILOOHqVuUmoWKn581ANcez8dl raH66vbPuNIt3R1zhA6VvxhgnaHgXwJoeg9q+bubs0xU52LmoupJWTbgmTMsIFkZFPB5 kosQ== 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=bkRhIgXl5AItP6ba03zv87lTI4x9mQkrreMEEEjOaX8=; b=yvGg7NpC/gzIhhDxBOnNFSse9+OyDDIcjF4hYogiSwAtWUNRvRGTHFUxrG0553HX8z nO0FKPz0EJ6UKa2p6S5jrI5q8GxL1wuN0fH9i39XNIW4kT3IwQw2vIUMShj3nmZi6HgR jaUKEKO9AGovZ8HJuFAcdn06Nf4U5/CEqzeoX3s4GKmRu92aQpG2ny0emUsZqB2ZvLlT 0coEpZGfaf/zGo63QaaAmUrba3Jf9zFI5W4w94pFdW8l9S7oQw8XwPSM3v9/vPPcABal H+UJwrKCVkIjcIWWmaM9u2HjhjVBX/2syXBlT+Cags5H4xMcjSuk3RVh64jpm2dnurUo kpCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=b65qHxeO; 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 ke25-20020a056214301900b00532150b90d1si6397689qvb.225.2023.01.10.11.31.37 for ; Tue, 10 Jan 2023 11:31:37 -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=b65qHxeO; 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 1pFIay-0003Le-Ek; Tue, 10 Jan 2023 12:39:32 -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 1pFIaw-0003KI-EP for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:30 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFIau-0001D0-Cy for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:30 -0500 Received: by mail-wm1-x32b.google.com with SMTP id bg13-20020a05600c3c8d00b003d9712b29d2so12528731wmb.2 for ; Tue, 10 Jan 2023 09:39:27 -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=bkRhIgXl5AItP6ba03zv87lTI4x9mQkrreMEEEjOaX8=; b=b65qHxeOTQRmnPnZNHnkijD7BVkvWLLedhS9k2IQf9v+Ct4+frnUPvYpicUSKRFRUl UAZdDPxBwfcII5/H2yIt0umM1km+hMSNqmcs/UsKbDdOpfZapj52J2PKXGk/ULeov2i4 HmtYjqCXG7o5E9u/h49fssbpS23L6cIredoTtEroZunXCDA+OB2Wt8kmqKXTg0caW1ql Fltfg5yvyN4c5JzqW4kzCu08NI9CwmbfBc32fU1JIyPTdahjQXPiQkL1nqAPnzqTlKix oVNWq65oVI/7R2Pbo8PtGt2IgsyhghSZ1ylC+hJ3NGYiixbVJg73c1mEryEHsUJPgQ02 B1WA== 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=bkRhIgXl5AItP6ba03zv87lTI4x9mQkrreMEEEjOaX8=; b=Ba7lu6R8/nMd97xFj3JsQCwvwMtAPekugmuYvquhvCaFAFIlWBKNp6K25YNUq9hau7 /PKyH9CoGl6KdU9eMTLiBbqzQzHRXhGoLeXWfQ7AcYPBvq17nXAVhNWNntUdHK9owVcQ /XU3wCrnBwsYvkFBzBbinrbeM4erCS0my9PlTYcF5bbE46/3P63M4HA41G+W22U0zKHQ hOYq65AzZyu9JmzHs5tSowgWH13T+N8mN6r55opbA2sKJRHLpfi/f8GwmxApBtoX0ZKD utdM3vyESMhZUV4xmoKIDwEc+vc6ofhtMO2H5I8+BQIwQKsIwxoOK9qgqANRFy4En9tm yZrQ== X-Gm-Message-State: AFqh2kpoLrzfO1T7Lm+HG5HDlS8r/jCOBFEX5/EEaRVU8U/FMpEWhvcm 6vBBY28ppxToizCvkrQcFsMPDA== X-Received: by 2002:a05:600c:1d8a:b0:3d9:ebab:ccff with SMTP id p10-20020a05600c1d8a00b003d9ebabccffmr7904161wms.33.1673372365605; Tue, 10 Jan 2023 09:39:25 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id x7-20020a05600c188700b003c701c12a17sm19162023wmp.12.2023.01.10.09.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D41211FFB8; Tue, 10 Jan 2023 17:39:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson Subject: [PATCH 01/26] scripts/ci: update gitlab-runner playbook to use latest runner Date: Tue, 10 Jan 2023 17:38:57 +0000 Message-Id: <20230110173922.265055-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 --- v2 - only register aarch32 runner, move service start post both registers - tested on s390x --- scripts/ci/setup/gitlab-runner.yml | 56 +++++++----------------------- scripts/ci/setup/vars.yml.template | 2 -- 2 files changed, 13 insertions(+), 45 deletions(-) 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 Tue Jan 10 17:38:58 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: 640873 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2857544pvb; Tue, 10 Jan 2023 10:33:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXvZ29GneC/vLpjVrrzg4cjpWVBJyyilUcA3mPphu6b7O157S3R4xUkRaNid+EDLaF3TCpOP X-Received: by 2002:a05:622a:1f85:b0:3a6:a5c3:fd28 with SMTP id cb5-20020a05622a1f8500b003a6a5c3fd28mr6250525qtb.35.1673375629929; Tue, 10 Jan 2023 10:33:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673375629; cv=none; d=google.com; s=arc-20160816; b=T3wmbSUYlthoc5NcssVKLwg1AiEMy0XJYx39knJvZOfjBZE1NcJ22SRTaK8CsvBKsf 5GWoeacG8SCGMfAmizsvG+0MvQDftCxUyjzNv2HXuGfnqCrSlUwKo10BPfB07jhaiLXy pBG6OiXMz84tp/VKfjWsEjb7E4G9Fh0pYS8hpB+LtLMHPFzQ/v5gEO/NMeuFyY+iFAvc kPGWPD7mNLtnV8xuZgAfGFhH36ML7iPz65POQnBjuGcn5ylmcVcSYRVDvmRPDdE8pOod 5GSUl96Kx08Qn7A64FYxv+nDYlNNmBNk82MRoiKOcma964VTPCwFt5aeFQZz5Tp5Rd/1 xRUQ== 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=/Ym9gdSPhZxMkyn4UTQeALU+Eaq7pKLjjgJFPFRFMFo=; b=BpA8Aq45XjVISh/xJc8wV21Ohx+S7hH8SAh49j23bhbjPsG7LFlGr01yoB2NaKRdgH 2upuPm34sBKOnY0xGzc4xpJCE7t1WaVLUYmof/pTkmNg/+G17ok2m+b3R/37RlwOXCPb RvJvVDMCWUObkEwb/vtoI3OETKz2cu1wmOYjD9hE9liFg9j6NJPOhivla/TL6AE6mkNn pCbFaBrn9yZW5NObj0+c4V7303s8r1sYYSKqOXjf+okAoB0fPrwV7l4RyvTpzK8caMgw MFzUdRNrz8Y9pdllkH1aylYBHoY2AWHj7MJDY/Pt3OOPTjFsFA93fNMRi6HghFp0x6HC IwuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IwMri1Ur; 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 b15-20020ac8678f000000b003a55c9ed459si6355467qtp.561.2023.01.10.10.33.49 for ; Tue, 10 Jan 2023 10:33:49 -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=IwMri1Ur; 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 1pFIav-0003Jc-7z; Tue, 10 Jan 2023 12:39:29 -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 1pFIat-0003Ir-Od for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:27 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFIas-0001Ce-9N for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:27 -0500 Received: by mail-wm1-x335.google.com with SMTP id k22-20020a05600c1c9600b003d1ee3a6289so10700607wms.2 for ; Tue, 10 Jan 2023 09:39:25 -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=/Ym9gdSPhZxMkyn4UTQeALU+Eaq7pKLjjgJFPFRFMFo=; b=IwMri1UroJmqHHjGkSCCc4vj3TAjqOnAE7F6UGLMCNnr/x2Uo6+FWheQqvFnhRZEql l1XdRHbMNcEx40WrV3fKDbxVcirzk/rJSf/a9vr/dEeX+YunbZFtAy2gjrMZPI+wp/Hv aFhSWtwdlVw8ujSfRWVOyeXjAvYg9n2Nx/x9bTkS+xL8c7FpIghRMXYu6HRToTd3Gm6G 88P1WM+LUVf3pdYoEwtzDRrVntyHBbavJqmmZf5B+m6qoR/1us8PGdfBlSRH9N9WiJL6 lJ3uyjOefOIrDVjgEiCVUq0jeWW9CfeXIJf+FOaRTpz8Jmr+x+olrpZd527Kj6zZa6v0 NCBg== 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=/Ym9gdSPhZxMkyn4UTQeALU+Eaq7pKLjjgJFPFRFMFo=; b=LFEFzPOzixTF3mWBgQCen5BqbtDesWTIi2TT5FHID2XDXh8f+k4g0FATU211IGwYl5 K2KlF9PJCusK6PnwcHD4XhcJsfvGL9YnY7Jk/Ex9DccxvCrqW5XKY+tgjW5u/+Zdg191 fENSuhjKLCAA5jNlDaENwiSQzBNUHTt7VC4o9xbXCzEx4Kqj9xae5EeJ96T2dqotRflD eKdLxK1fsWaW2xx6Z0peI9Wmg+nVbiuW2/KFMBhWySdHum3dei+vWMt2P/X321eb1ufo tJWAXqSRSgqE4jmcelXDGi94Huag4IPPBmTgIIeRnQfFWrmrldf4P1/Z4uvVIVWovKTa 2DYA== X-Gm-Message-State: AFqh2kqDN/JOgh5lFzCOUUuc+JWYKiN6L1UMaRaqaDY7c8pw3pHTIsK1 XvxiMir2loB4LRt305fKAatJTQ== X-Received: by 2002:a05:600c:35cc:b0:3d3:3c93:af34 with SMTP id r12-20020a05600c35cc00b003d33c93af34mr60557033wmq.2.1673372364626; Tue, 10 Jan 2023 09:39:24 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l36-20020a05600c1d2400b003d9fb59c16fsm2455833wms.11.2023.01.10.09.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EE1101FFBA; Tue, 10 Jan 2023 17:39:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson , Mark Cave-Ayland Subject: [PATCH 02/26] gitlab: add FF_SCRIPT_SECTIONS for timings Date: Tue, 10 Jan 2023 17:38:58 +0000 Message-Id: <20230110173922.265055-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.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: Alex Bennée Reviewed-by: Thomas Huth --- .gitlab-ci.d/base.yml | 5 +++++ 1 file changed, 5 insertions(+) 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 Tue Jan 10 17:38:59 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: 640868 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2852268pvb; Tue, 10 Jan 2023 10:21:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXuTk39DwToV48VgY+Euv5AF62sFE+OBV7kJnCXKk6GmmUGgDHNnSb55/aTF//osgRIKlQFv X-Received: by 2002:a67:1ac6:0:b0:3ce:9b5a:476 with SMTP id a189-20020a671ac6000000b003ce9b5a0476mr17423048vsa.8.1673374908735; Tue, 10 Jan 2023 10:21:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673374908; cv=none; d=google.com; s=arc-20160816; b=pcuExbtSadFzQRx0w/q9uKpai3UFFkiAyGTIuYEKWKEDeRvHCRwAkW1hnCqrjJ133d c7RdwxCyGzCkwzO1DONoNO96tBimj88aJgKxUU41TNO5qySl7rZhQnU+vxnD87KTseDj D72ZAtbAlmYSV7RbN0Nngi09o9KsqoZKoc1v4XaqU4EjTz0IZgwQutTDK9L3WaHWIb7O NRMhNBLaJXLi+4jAOVFODbXko/LpbY7dsNTGaaa3lkkvZcyVOxFFFn5YgiY8Ron8jUUp aPqDONbRORv7eeCmw9mpvOS2eZXCQ+jOryZRvtqxyPXBQ/qkSJoYT8sOo4v4dXsD86sR BF9g== 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=tWrA1H3MbdFdqlxyQ4CmgYC/VVivnEmfuY1CfmoIerQ=; b=uUMzxxSEWhhf7Xv4TrIVL51t4pc/kcIJvH+7wOUQA6bdLuGm/ReAO2WdjLyMURPFK8 sa/4n2kK159N91aFr2xEUkLHGjb+air0MNoeB/oSyRT15pYvUSy8g+u8IumVEAORA+sd I7pqn9AYbxXY3zZnmJElfDTu8VyLrVrHO9Cif5zdTBkJaRwu2eOa1DodGTa8bACbgXdy 0zVBJEkSwp8LgvLhzv2din+CjoqxLE9lpCp8CCIbB6c/rELRygmSWKxbZZcASQlApsOv PXSxOthMJahH/eYy1XylJBQb62ZdLRvgJOhSFJ6tZlfEq5E6T9Pcy4f+YQ9VM3dd/vSn Z71g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qQLSAW5P; 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 u126-20020a379284000000b006ffcc5220b8si6322684qkd.691.2023.01.10.10.21.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 10:21:48 -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=qQLSAW5P; 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 1pFIax-0003L1-Uc; Tue, 10 Jan 2023 12:39:31 -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 1pFIaw-0003KH-EG for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:30 -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 1pFIat-0001Cn-KT for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:30 -0500 Received: by mail-wm1-x334.google.com with SMTP id o15so9366073wmr.4 for ; Tue, 10 Jan 2023 09:39:27 -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=tWrA1H3MbdFdqlxyQ4CmgYC/VVivnEmfuY1CfmoIerQ=; b=qQLSAW5PGctkKTEh+rYAhRF4FVowuclvSvXAhe4QCF0zdxorHLZe8FDKGs/W6eAqr2 nDNsOmz0idm6O0J7EpknyDlx2UnwrXdT/ZG1BqfQd0CAc7cWvssGai2QDOwI72sFq25Z 0KnbQX74rQvBcLyB7Qp3U5dcEbtdc5ia8MbfNfSXEdZWp8erq/ImDht73/okwDYqhTtE 6olwFfx599dxBuhzFf/nw/27VY/kX+Z3uUhYAk3Jpyfdf10fzNbhY1BRC70wctrCnWIb oGloVLo2ib4mw78N9P8dYOwvOrSuTKVy5dvsqNyTDkHbvTiLGCOVGMVCWAJ3YgMRERdg VfYg== 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=tWrA1H3MbdFdqlxyQ4CmgYC/VVivnEmfuY1CfmoIerQ=; b=wNKcpnezzWvdGVRqs8KJ/r0PigGq5TLUKnRD1/cVXkO2bFdo5+KeSMA+d0AOb3zWJh BF+xMTCmBwCroh74r4KSDthXIEoddiwwO110/pnyzc6KO0275GgIhpjgxD5ue+Tfyend DIXopzhR+DydZ/44s7HA1MSxQbFhL0iXsDZZmvNJa1wCpaES7pN41nMpuEXGDjMkR0bX QIkQTo8F7WIUClQuT6/kH0Qf14XotvX8VK/wcSafi44p2CsHXmlwITMTSiw6H5len8dB UyyylB9gLdiPIYerw4yOqqXVPNmF3zpuGnM7t68rZWoPX+TyxOk4FQmAInIQ2/FJQSAe zRog== X-Gm-Message-State: AFqh2krfUvnWFCndXbpvQF0OxBNe61HXJGv667QQYfeHnEpXY+z9Qzqv NWqNcNJs7IC4jpPHziZP5Qgp9A== X-Received: by 2002:a05:600c:1da3:b0:3d3:4dbc:75ef with SMTP id p35-20020a05600c1da300b003d34dbc75efmr49662134wms.17.1673372365289; Tue, 10 Jan 2023 09:39:25 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n23-20020a05600c3b9700b003cf71b1f66csm18055801wms.0.2023.01.10.09.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 131CB1FFBB; Tue, 10 Jan 2023 17:39:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson Subject: [PATCH 03/26] gitlab: just use plain --cc=clang for custom runner build Date: Tue, 10 Jan 2023 17:38:59 +0000 Message-Id: <20230110173922.265055-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-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 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. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Tue Jan 10 17:39:00 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: 640856 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2838514pvb; Tue, 10 Jan 2023 09:55:02 -0800 (PST) X-Google-Smtp-Source: AMrXdXucsLQCu3x/T/3Ulu7h6uQLZ4c6jizcIqLya/Dm/ypPYUJcRi7iT/uGVXTTrLot0FlgnmLF X-Received: by 2002:a05:6214:5245:b0:531:8089:2f0f with SMTP id kf5-20020a056214524500b0053180892f0fmr89794560qvb.13.1673373302404; Tue, 10 Jan 2023 09:55:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673373302; cv=none; d=google.com; s=arc-20160816; b=k20Pj6PlK2dNr7W/tjx/07SYNd+L2U3u1kW5lMznjmN0ZcLthM8IIw9eGiiGzhngnd DA6GFvO7U7ZI3j+qKqaR25ZXdaqybaTlW1H2LFzmSyBJ45LTViO/uDZXIl2N0tC4cxuT d3IrdiH4ry0+c5gg1eGqwOI1IRoE6j4zxX87TXWbkkoSSFL+EQOtaz/No/UKkp8hklN3 zj29up9ouXQBT/RVneLGmZhDfwT1DVLckUmxyvTrOXrfoGvogZ4sIcD/Ntr/mCidkLLF wF9LgBw3yev3iRGy2MudBOKp/svKVZLw/OCnVAas3H4E6K7eAUS9Vdv39b9LHsYjWGNc BxIQ== 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=OUd9ildWmy9isAgbHX/TLo9qeZ901KMhVb24iOZZFpk=; b=UZOtATBXemdSZKE3X8K1LvPTHZZXK+Q50DQtp6Rvw+f0GjGnXymntFR5iKHvbBCgKb XVblVUSoQnHF0Z5KTBoxrYIcd/zQw5Ht12r0a/6eSFhoCJS8eYkC3N77G+YobYDa2LLN bwrktidQ46uUbzltKhNuMxMT7jIHBUV5f5MKnuf3dTk601LTnql3OK954Wte4fY+xoYd R9PZDMAgP5/LMGm5Trcx+EKVNiYgqgKa1yKpHWiJrKxDcCmMqXZzJrM4aUWDgozMu4Le 0Yf4px07/yiBWgYcc+0To8z0NfytVbkyaV+hdPyi1JeUjVFlgX+XV2uUiYph8hzouizY eP1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AsHCXpfD; 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 a3-20020ad45c43000000b00531dbe0ad3fsi7537238qva.401.2023.01.10.09.55.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 09:55:02 -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=AsHCXpfD; 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 1pFIb0-0003NK-3W; Tue, 10 Jan 2023 12:39:34 -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 1pFIaz-0003MD-6B for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:33 -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 1pFIav-0001Dl-DY for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:32 -0500 Received: by mail-wr1-x431.google.com with SMTP id h16so12575073wrz.12 for ; Tue, 10 Jan 2023 09:39:29 -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=OUd9ildWmy9isAgbHX/TLo9qeZ901KMhVb24iOZZFpk=; b=AsHCXpfDnJjoLLAo8LppSfgbnWkCyA1lbhjMbu2/93s6q1Lt/GZRTkgsLhYJmJzbh4 d3mWkKAzrWgBKS8NvspK2gOQh4uvtipamOdQKJsUA9mn6ihdHVqes12UOdBlD9cI1v6Y Hg4Psok8FwPbtdgvl8GQdc5Y2QGAv9PlOR7L8dkz4rSSga+n/vae9hNqaLI89/1WMFZ4 R5nmoNRqAKyHOI6/Nz1yMQCraVaDCE4W2abUvMPB/1QLY6ppazaK/bsckMbeCE41qMRn t7lw6dVmLlh03vCymOvbtKxfBIcj92itSJffZhr67cYBDuMO+gf0NRqhqyLL8T0BMRah pD6Q== 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=OUd9ildWmy9isAgbHX/TLo9qeZ901KMhVb24iOZZFpk=; b=EoclZtWvBu80ou5Hg+C6VWH043DY4ZDSygKg5PS9G+YxLWml1dAFESCs7IITKUawu/ QSxjnpcQS22ceSYpBBZ8Y5sTEjOVgK2aYdDoCEyBk745pgwHWN9B/VLC/EHvXibZYNBl hOgBVyrE56VHDYPLIQAI72orPBsvv8RAqhgKaNJ+4MhYbueksgqRuhN5oc1BC8k7nE65 OpIBtVz+Q97p1yKZzL4uS+lR8HQuY1tclzY5WQL+iCKFhx5DnVGqqCIUtEas4/PRC2cL faRHcdWy28gxgGWZRh7JosZDL+G37PtCpViy6Dn6umIVJPum9cSbMoBOhgWZIHK/qhI6 BaYQ== X-Gm-Message-State: AFqh2koQDdwT1g0ftwjhYLRWuD48P98ickOoB3j1CAmAxUegavsjxSlf gSfFunB9wovzEctmnPt1XQnQSA== X-Received: by 2002:a05:6000:81:b0:2bc:1b58:8264 with SMTP id m1-20020a056000008100b002bc1b588264mr5924059wrx.49.1673372367820; Tue, 10 Jan 2023 09:39:27 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bu3-20020a056000078300b002bbe7efd88csm7303894wrb.41.2023.01.10.09.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:27 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2EC711FFBC; Tue, 10 Jan 2023 17:39:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson Subject: [PATCH 04/26] tests/unit: drop hacky race avoidance in test-io-channel-command Date: Tue, 10 Jan 2023 17:39:00 +0000 Message-Id: <20230110173922.265055-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We don't 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 --- tests/unit/test-io-channel-command.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 Tue Jan 10 17:39:01 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: 640863 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2849385pvb; Tue, 10 Jan 2023 10:15:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXv4UB67t+qro3QGiJvGGshTIWDvQbuCSZPNE7oMoL4hVUqjQrY0napd2OLxRgnbLMlEJ09/ X-Received: by 2002:a1f:28cd:0:b0:3bd:5d06:70cc with SMTP id o196-20020a1f28cd000000b003bd5d0670ccmr33909128vko.6.1673374514935; Tue, 10 Jan 2023 10:15:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673374514; cv=none; d=google.com; s=arc-20160816; b=ZjmbZO6qSVxtd591c8XV8P8lyYztHqpOh4pfCeVNfjAHqyIQ5fWAhnMzDuuAA//nge pPI0QoJAqVaOeevYYexxQ127Q5WDnaAD12Xv5afxi1+QquL2yudBr6ourfas0Ln3SRcV M/brov5wGywpUohW1ZIIeDthM24FFnqgKSxOSzZe/kTvlM7I6vxlt9SBixfdEA0uXzQX oAi9svxxgZIfxkH0W/x1P/0hFRP+/rdubKo2oklv49kybJLsQyUjfAhR8R8LYdzRTnEC ufHI55SK3lLsC/GOnwP+86W38kyzR6DGUA6/uYy0cZhUV8+0vVljrSeuRPFlTEOvat38 H6zg== 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=aSooXar7HpN3Wg9/9ZGVkzt9+EmW4klxjSnXakXRJjM=; b=oKDFO/cnL1cv6TMiFNHeeecAmnEd/ww/BgUjMhYT8QR9onHDrRf+sJixApv3WleyCU LBI2MFvYkINlHdTsCMZBJAZTVyoFjNs3Cg7KCXG84Nhmd6EE1u/6Rbu6RkT8OVe+NBWu 87fzG3v1dC9KjwOEXj/MrcLO7Xon8P93Q6qQask0PSvLBrXwY+a25uAtEvFnAgMe1Rez CbWOPvaI0eT7h/qwmBOEaXKzeGLyVhm5U3dVI97mTVnXdZye0YEicrgRel45v8gKRdbH Ukm9NChOSWzBRAUf6jxH7qK6KMm1IMJIonpyzgVliLhGaHWlSurJ97AVyDjuKz7ySVom yOVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="R/kK5xrf"; 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 s11-20020a05620a0bcb00b006fa09b601basi6865512qki.528.2023.01.10.10.15.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 10:15: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="R/kK5xrf"; 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 1pFIb1-0003Pn-V5; Tue, 10 Jan 2023 12:39:35 -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 1pFIay-0003LB-3n for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:32 -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 1pFIav-0001Do-Bt for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:31 -0500 Received: by mail-wr1-x436.google.com with SMTP id co23so12596632wrb.4 for ; Tue, 10 Jan 2023 09:39:28 -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=aSooXar7HpN3Wg9/9ZGVkzt9+EmW4klxjSnXakXRJjM=; b=R/kK5xrfBtRf/FxzNct8OW+Ct8EtfkNKN9MVPkBmsUcYSdqu6ziqQlw1/Z9Wd3IsTL fouN9mOtm6Q6CKMogZ3qJvTKCg18EZfY4nWs46FJXTysQxPxbnAw3oYHgmZ/KIEC804o nu6eNPMdgnHNB9++e9yU7DE/vlJwGv+AoGbY4EsUhLpoBKm01nKgOc9pPTpOP9e96ieE 8+L4PUfN7gqsahm37q6HmZUdQo0ryh+TLl5nvreFKBZ6MVQv8aAllVaTgmRRbnWGexd1 xFR8lnX04kUD0PCtywjnhGRb0ClkDXdmD5R11I3bev091ftG27vx49URubDBFRrk8Nu5 IaJg== 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=aSooXar7HpN3Wg9/9ZGVkzt9+EmW4klxjSnXakXRJjM=; b=PI//TRq9MWMCjoKhdLp3BJ8ABVtSh8ZmADm/mSrLLlN0VtKnMYqOteEWQ/EXQF3/4A e9Nwj3jfCcuHX3OVc8lNab8Pojzy40fmanb3TQ9XtxQOh7qdJ2RhQ7Rsk1PHSQHHhOYP QVv29XIfR9nfa2DzkehQUMLR0nTA05dNE0TuNTqYtFsBTPvQGEaHP4ZOWMpjolunMAmV Jw9uUiAeY32r4PRl7BMmjNVyDpRFbDFVm0Lr3dS6jB/wlqa2kp+1PqubK4h6Zow8eB8q YfbGPlry4D7vMsNxgIGuuLN6iat3ZXi6oF9D7DPhP1D74dk3SxVqOLcapmkB20cQSSBc YK6w== X-Gm-Message-State: AFqh2krVh/++amDX8+4bf2MxAi9LNMv8D+FVU+VcgydMLltx+liFYxph e9XTfegFypYJogv8hIrb3Lv1og== X-Received: by 2002:a5d:56c1:0:b0:288:d139:3690 with SMTP id m1-20020a5d56c1000000b00288d1393690mr30091172wrw.67.1673372368039; Tue, 10 Jan 2023 09:39:28 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id k9-20020a5d6d49000000b002bc8130cca7sm3712663wri.23.2023.01.10.09.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:27 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4ED601FFBD; Tue, 10 Jan 2023 17:39:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson Subject: [PATCH 05/26] build-sys: fix crlf-ending C code Date: Tue, 10 Jan 2023 17:39:01 +0000 Message-Id: <20230110173922.265055-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-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 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 --- meson.build | 2 +- scripts/shaderinclude.pl | 16 ---------------- scripts/shaderinclude.py | 26 ++++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 17 deletions(-) delete mode 100644 scripts/shaderinclude.pl create mode 100644 scripts/shaderinclude.py diff --git a/meson.build b/meson.build index 175517eafd..b3c6db8343 100644 --- a/meson.build +++ b/meson.build @@ -2781,7 +2781,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 Tue Jan 10 17:39:02 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: 640894 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2881389pvb; Tue, 10 Jan 2023 11:28:13 -0800 (PST) X-Google-Smtp-Source: AMrXdXtBUAINuZotaRb2wTt4MK4jihwZrCjn6cIuk0QnwCemUJNyLp5+2fezbJl4Y5IeHYRXx24y X-Received: by 2002:ac8:660f:0:b0:39c:da20:5f8 with SMTP id c15-20020ac8660f000000b0039cda2005f8mr5330991qtp.2.1673378893121; Tue, 10 Jan 2023 11:28:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673378893; cv=none; d=google.com; s=arc-20160816; b=mbGb6lReeVCXSGtLenDQMPYtVg0orhusl8ccBF8m1cxdcaHTGrpNWFMDJsR6bdu8BY gI+FY5f6E/vb2vVSdtXXVi1jYxUFbyw3VR/uItO5Q9K4Ch1bRAI1zRIlFuIfqBHzkkrj zML18pjjQHHuvRTl+kQ45tJkwSYVa2mY7xv6ttiaKEbByFP2TFDDu0DqLDhOuFy+bWBJ pdsHjNMBAu15MrG8fV8DTW0b2Uo3HB+ysC9htoRNfrizODhqNxQFNEAyk2jZmSNz33jL Tz+egPMtC+3sQPJbmE6PXRIOEiBPKH3z0LGJ/6MxOxqXuv2R414VcrfGGaVAPNYL3sDN XgRA== 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=6fZnQvIJIidUw8gfSAFc62jHoyrBtFd/nsmfx/H20uY=; b=l+nhY+xeBTBTnElLviGAOJxhInY32He++jbqSt4wOycfNIDQjQAXHBOgryEeFEoGaE EMeWAEAZM74JCZYzqQKlTsSD4QdZd/S/KwO8GQVhnmWKvrRgVzwc4GTbcKD/LFvyJsu7 mUPUfosTeVL1hHp8j0bpGZosecsYqozI3iRAaX+z1TSc1QohsDmFlr7OPCS1q/8cbr96 mAmqYG7BxHb1r3449q1Rd5s4qpAPp/1lLkLP90/lG32T44hCwY5clT1AkIXCvWQNj7XY QNKtB1GYrWXen31lg7cpxdlJVyOcjtHB2GnKjJevZrouGdZrSZVwmkhxXAV3/UGraa0t BTcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jPPNsLbn; 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 bs16-20020ac86f10000000b003ab89c25a19si7518358qtb.3.2023.01.10.11.28.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 11:28:13 -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=jPPNsLbn; 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 1pFIb3-0003Sg-N7; Tue, 10 Jan 2023 12:39:37 -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 1pFIb0-0003Or-VR for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:34 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFIax-0001Es-RM for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:34 -0500 Received: by mail-wm1-x335.google.com with SMTP id p3-20020a05600c1d8300b003d9ee5f125bso6022111wms.4 for ; Tue, 10 Jan 2023 09:39:31 -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=6fZnQvIJIidUw8gfSAFc62jHoyrBtFd/nsmfx/H20uY=; b=jPPNsLbnnIxo/pXYTxvlQi3DAmoNmimjvXG/YU0TkjjsLv9DOqtRHcxSwCOwBCL6Mt E5H9kxSDQj7DnJXs+IORZgO5gNDBnWIY4VyhsFfHgTnQnqMoB6IM+1MH7vQcR0btoraX a8VNOpW7GwrX6Oy5BycpLwb9xUIOYTbww+/m8KlO+IDjv3fouOb67VFF9sL2XdQp/OgM OCkCEtAATrpH0kKfPqCNwXpBsCmoUKkHsUmaVQEk1KTrpVgCCd/BLr0SLyFM9qLuwpeY gfdJzXLHX0HjjACff3K/XJ65SIFEYAfsYMOx82Tnndu36WIJgpHARWJ7ikZNLxcZuan+ uyzw== 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=6fZnQvIJIidUw8gfSAFc62jHoyrBtFd/nsmfx/H20uY=; b=lJ3gxmGKr0isaumdY/IC0LYdjF71/AvJD+1aEeelIWw+LSdvYoadGc/5/XvRzd4xYO rQ8wADtm7etTqb0Dk1hqsjbrlkLBpnpoT5EbehdntXCD5LPd8bsGOkDxWk45TRbISkAK 4tilZnplupUzpFLa3e/RpvK7GGSnjutMWH5GFmRZdGe+OaREyJ6ZP/h+olsBXSSEN20S Dh42sScI8/VfEK461B/trOiZfB5u4CV5B8cpt5yP59hBKHLbsdV/ceI7z3GLmQOtexnA uaXXBS7x46OaTkqXYIxyO+6iXFghoftgEqg2NtwS85dAEFSJ7RoAyqDh/R9Kx4nzONrr 21SQ== X-Gm-Message-State: AFqh2kqspMCEgO+7zRd4JWrfupKKuirfuJNH26M5UuvGD3e/HVxr+SQi cAy0DpDh3KEKwQ0S6jpmTFhwMQ== X-Received: by 2002:a7b:c8ca:0:b0:3cf:728e:c224 with SMTP id f10-20020a7bc8ca000000b003cf728ec224mr50592798wml.6.1673372370441; Tue, 10 Jan 2023 09:39:30 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n7-20020a05600c4f8700b003c6bd12ac27sm18087617wmq.37.2023.01.10.09.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 67E481FFBE; Tue, 10 Jan 2023 17:39:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson Subject: [PATCH 06/26] .gitlab-ci.d/windows: do not disable opengl Date: Tue, 10 Jan 2023 17:39:02 +0000 Message-Id: <20230110173922.265055-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.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 fix shader compilation. Signed-off-by: Marc-André Lureau Reviewed-by: Thomas Huth Message-Id: <20230110132700.833690-3-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/windows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 Tue Jan 10 17:39:03 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: 640869 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2853048pvb; Tue, 10 Jan 2023 10:23:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXuGwMToUmgmZFN5V8bMCHejUL6EzEPDGX8d1ZKvWJGSc1XDQ6B4ZhkArPjc51pS27WDKIL3 X-Received: by 2002:a05:6214:5983:b0:4c7:64ab:1b98 with SMTP id ll3-20020a056214598300b004c764ab1b98mr116090077qvb.42.1673375017128; Tue, 10 Jan 2023 10:23:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673375017; cv=none; d=google.com; s=arc-20160816; b=EMgDdyfBdCa+BUYXH1szFuSFeubnLONAeS8rgHgai98uXs8BueEqJu9OxyN2KrwxIA fziqx2zWTa07GmV50p16g2PKnsaF/IaKfE9ItgCOeLpszDG2RsptY22N6zyerZcV1U+w SL+yZ+UE8erYAw/yJahszd2J2ACV6AJRfJHVyWFVBuaEWWizJKZ0+J7Pdz7HGVrLI77D zesHd90wff64Fj1TjN/D3BgpDq/a95THQ+mBGaPpHScza/rcR5O2gwdzCPrIvtyGN0V9 t/ZtB84eHYdmnmXndcYHDmvAIKIoWxk/ZN7VBhlFyvi0zXlpJNLe1DqTO8rhwUWJQ7Ch KxhQ== 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=/rFoN1+6hqCTYGYDksjk1ynmsYhV/AhUVVwODaCS298=; b=Or8yooSE9WQegSJTYh4m3QiNRNyyfLSCe1oUdNgJlBlU+NaG8ebe+j6QcYwg3wLGhV 4+NWQMdf0TquCK2aJh6knqYFpL+o+sFtXhEjnXqo9Z890Kj9N8AZ6+7KNE5iAfF7raTv YXVZ0SCsHgHUezHDBAZVQep7YtCiNCpLFbZr42LzF/lph9CMUrOU6RAE9O5NaYIAMbgG Q6Isw13x92ZBiM824dhvsgYQvGatpP91eq49ueObBy5fslhiAXqjZhSyxYqL8y4GKAga Q3YF0DDt9lKcWP5s1n6dCnunrEvTIKTsCcdQKgwzYxDan51ya2ZQe3fzYXypRMqG8Wn0 naTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bkmPqtSy; 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 hf8-20020a0562140e8800b004bb83a1b2d4si6559946qvb.263.2023.01.10.10.23.37 for ; Tue, 10 Jan 2023 10:23:37 -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=bkmPqtSy; 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 1pFIb4-0003TZ-Hu; Tue, 10 Jan 2023 12:39:38 -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 1pFIb2-0003R9-OD for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:36 -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 1pFIaz-0001FK-53 for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:36 -0500 Received: by mail-wm1-x336.google.com with SMTP id k26-20020a05600c1c9a00b003d972646a7dso12505875wms.5 for ; Tue, 10 Jan 2023 09:39:32 -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=/rFoN1+6hqCTYGYDksjk1ynmsYhV/AhUVVwODaCS298=; b=bkmPqtSyWkx4x+JxMiE38XylY27VjsZcvOsQ7DHuqx6ioKV20yPY6EHdStr5iEqVvd HeMhUZtP9kkgDJ2j1dKW6TnT+RFjVFbNfbRWuCSOwzJn/fIrfIkbWJJuKwDfyGPKmXUp Hg2WL3hDuNJfpcv3nQOZxDYp5PJzhP9E7D0U/Ri/oPWJR4Zt8jsrSeyUFAWviXI2NJsK +y3vy+gv43bmcMjEcUNBTOUHXLg25Y2cir5ifuutB2SDp3aLXcIZRY+Jyb8mHVBPNUlJ jSzyZ8xnhDW7B+8/7FNNPo6gmz2GXhUnx2meXjw/ys75h8hQhJpAAapOkZ4OR8fz6rvs oDTQ== 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=/rFoN1+6hqCTYGYDksjk1ynmsYhV/AhUVVwODaCS298=; b=PGRRJz91FfCF/0FBDkUaVLK9VpvTuKoXGsEUtAv7UhXrZHjB0D7lt3opAzhDyTbtN4 ZdkJ5e3eu40+VBmINwcwdKz7ifEShSK7Wu5Mwvppt5KQqSCjyaVa87/9Jv/JHQrMz8XH 6LBFEL6W/cR2KUdr4VBFSsztjFg5sBRygqxFWhH89hJQz39DJYn3AE2tSI6Wvfg6O0AO Zahc62d+AZTWrGlea6mEHh1Vg12dIWq1556R7x6+SU8RMZuOLDmCncu+ZM+uoo+1/Q/Y mZt1rgNjjlPpXi7QJziWIhaeLGEOoHSUDClmoDGTBksYh6+y2/QDXrsEKTDbAVGSEg7Z V+lg== X-Gm-Message-State: AFqh2koObsMql1UCkkzU2QyoNVRgr0QhBqfILWhz0fe/ehSmcvdZDAk6 ISlqRMO98fdN45CPmB6OFtfvgQ== X-Received: by 2002:a05:600c:3596:b0:3d2:3b8d:21e5 with SMTP id p22-20020a05600c359600b003d23b8d21e5mr49094455wmq.14.1673372371421; Tue, 10 Jan 2023 09:39:31 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l36-20020a05600c1d2400b003d9fb59c16fsm2455956wms.11.2023.01.10.09.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 803761FFBF; Tue, 10 Jan 2023 17:39:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson Subject: [PATCH 07/26] configure: replace Perl usage with sed Date: Tue, 10 Jan 2023 17:39:03 +0000 Message-Id: <20230110173922.265055-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Marc-André Lureau Let's try to reduce our Perl usage during config/build-time. Note: this patch might be dropped if "configure: remove backwards-compatibility code" is merged earlier. Signed-off-by: Marc-André Lureau Tested-by: Thomas Huth Message-Id: <20230110132700.833690-4-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée --- configure | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 2281892657..9a944698b4 100755 --- a/configure +++ b/configure @@ -2571,11 +2571,9 @@ else if test -f meson-private/cmd_line.txt; then # Adjust old command line options whose type was changed # Avoids having to use "setup --wipe" when Meson is upgraded - perl -i -ne ' - s/^gettext = true$/gettext = auto/; - s/^gettext = false$/gettext = disabled/; - /^b_staticpic/ && next; - print;' meson-private/cmd_line.txt + sed -i.bak -e 's/^gettext = true$/gettext = auto/g' \ + -e 's/^gettext = false$/gettext = disabled/g' \ + -e '/^b_staticpic/d' meson-private/cmd_line.txt fi fi From patchwork Tue Jan 10 17:39:04 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: 640871 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2855677pvb; Tue, 10 Jan 2023 10:29:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXukeAEbiS+uIpY00zha95xOFd6+nEvimGPbY/qWtG7Pcohgv3k+OL17Vp6vkD/FkUU/IuAb X-Received: by 2002:a1f:e685:0:b0:3da:dd8e:c11c with SMTP id d127-20020a1fe685000000b003dadd8ec11cmr2505453vkh.5.1673375399277; Tue, 10 Jan 2023 10:29:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673375399; cv=none; d=google.com; s=arc-20160816; b=OoTqnX9nn9xf0WxCwmn7dNPPU7HzmGijHxpqhvsY9f8F5BXuDP+A87xHykaez11bSO ZUgikqj2Srbokw6XCsDzobDqPg4vI9TPm4VXJkc3vnTLFuzc12anfa+5TyCPDieXZb/t 9v4l9ZXgMl31//BrwpP4KtwCPEmf7YK4pUup6D2TdQyVFd2fEN3cYnluuZCGIobs3br0 12ToC82s2AERe1YVgCq9sPNqo7wYWjFQC3qudMcfRGBOtrrRkv+J+cwjLlZe7RxL5bQ0 91aOUJPzaySlLrK2TMpnEieW/npaRCNxX3WKfPoTcHhQQPrBbMLzuuBXQtM8A0KnVpIL d8Qg== 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=EduU7oyQ6B1wSk7o4iq1oV+aNe30CeGVDzVVE6Byo1U=; b=aocdxW/ft9rLaQ3xhDPD03pXJ64PmnlxwpFC2Fms9KzQuyr+kJzDovFlz6k/fBN1Vh 93I7SUbuM352TK60aOwaZwAtyWMDi+e15IZ49+vEtIF7tbesxp7AZMmKsUuJN0tvvxZr QCXzWCGgiB9/y+U1t8s9nROb0uB91HACALOaJqL2lqTm6hOAaYm04hI/Xo4T1PHRngFm 3FcqH1KOe/XNuP6RlmA3ujRncR1St6WWKyc0kSaIfkTX+dD4SGQeiVJhvDKR8Nxs5VPH bgmBwSG9in8D5IVIkZpBSIwaf4/ztCNcM7SHz0wVhzzvW09sOxXm3I16MRIKANpYPhpK ZDRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="J/SLktG5"; 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 br37-20020a05620a462500b006fee881a686si7021584qkb.26.2023.01.10.10.29.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 10:29:59 -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="J/SLktG5"; 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 1pFIb4-0003TQ-Eo; Tue, 10 Jan 2023 12:39:38 -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 1pFIb0-0003Nw-HX for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:34 -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 1pFIaw-0001EH-C0 for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:34 -0500 Received: by mail-wr1-x429.google.com with SMTP id az7so12593383wrb.5 for ; Tue, 10 Jan 2023 09:39:29 -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=EduU7oyQ6B1wSk7o4iq1oV+aNe30CeGVDzVVE6Byo1U=; b=J/SLktG5dnNdWcoI2sj+EGyXN4ZGgy9GSddr311R/xXjH5nDjgxre/+0f4tnbM+w+9 r3VyliSrk4nOGVhwndXGfRTSLieV6jJKkl4nLMSUw4n4ZhkWCBS+5FakG5m8lWtLWxEy GHXHLgM137zDwG/RrDijc+lqsh+J2NrXia1sKLhG/+oWold6iVelIYc9kusEkvc8T1WG pOx2UGMNoRa3UL2+KqSDYWO2hNT1KJARmxd8p95r+2vauRHWorhMFDt91Tm8dcjDQ6Jl +ytViHwh9YojkD7jW7I6RnVuoRHL/OR8wcrzjdVjRRC/hO9zrTL2oTD2oTUWXercYVhf w3ag== 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=EduU7oyQ6B1wSk7o4iq1oV+aNe30CeGVDzVVE6Byo1U=; b=2QRuDogDTFH0BSZNYol4tUNbl5a7M5N+DLy5kx24JilSRXtme58nrgGd6A0nek+idD m1zJg+tLRy6iUKLQv9E/wLEzKMVr2mekJaDNmXxFLGvvvzmH+eacgpMFqgSjRrYRTcuu iHCo6NHS1jixCdy+0Oqm0iFPTLe29bdXnhS1PRAHrqB45hghM6M5vLOdCvkh6vQHasu0 Ke7zd8FnBlTT2seUCuLP9rPsbDBxPpTPtjRiB62tb3SG7H4ngr0qFTt8nS62pBRxuQlt CYJi5DYIuts7NBc0g/An9AisamV0KEicpDAQ1GsdKJBO07Hga/70J6GFz28UpI/qR5Dt ZW5g== X-Gm-Message-State: AFqh2komhChims+snmDjJRUiIRbiPHGdvnZl3Jc+VJ0sxJQn2/DVFcec bJzT5/UTKMIWJknfWq+yAL+saA== X-Received: by 2002:a5d:58e6:0:b0:26f:aaff:e98c with SMTP id f6-20020a5d58e6000000b0026faaffe98cmr38136006wrd.27.1673372368960; Tue, 10 Jan 2023 09:39:28 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id f6-20020adffcc6000000b002bbdcd15e44sm8082510wrs.37.2023.01.10.09.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:27 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 98B631FFC0; Tue, 10 Jan 2023 17:39:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson Subject: [PATCH 08/26] meson: replace Perl usage with Python Date: Tue, 10 Jan 2023 17:39:04 +0000 Message-Id: <20230110173922.265055-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: 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 --- tests/qapi-schema/meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 Tue Jan 10 17:39:05 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: 640872 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2855862pvb; Tue, 10 Jan 2023 10:30:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXusCT5zZLyaLch0/ej6kaxXCK80QZrxW5GcX+Eol3UoNDHtY2EH8v7WVPK3ozyt6OVK4i2o X-Received: by 2002:ac8:4b4e:0:b0:3a9:6cff:e1a6 with SMTP id e14-20020ac84b4e000000b003a96cffe1a6mr88970806qts.0.1673375425837; Tue, 10 Jan 2023 10:30:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673375425; cv=none; d=google.com; s=arc-20160816; b=NCXJfJzZnndJ4v+4HJ3f8fgto7kgbWDWBFDz0OQxhOQKuuysS6lnyPTG0TzZaA/cIs aQiqt95/j86F/vzYmvTQZInSdSlchmGg8DyLw9mIKwtKXi+nBGv3f92WOqLsERE2nvZH Ecz8ZDu2C+E05usQbKvTdHBKElYfT+F0vvRwiw5eYEvXt82Ue+3JwYXI6n2bLbJOk6lf a2KBtklQ46Ov/cObmGygOfWfBwTCqYo2ItvhFyFe6eZu5YKxRcVCTf/IYX3Ff7aACc5D SKVHMDM8n3dqWnlV+eN7qHLVK6e3jOcbEsYHEZVEYO2WLXe4DOjbxjDI0vi4qnqkXnpl Splg== 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=KS77SMPj4oKmkGa5jb8BcpyB1iTizAYKK45SCLEMfy8=; b=iU/E57deb18uR570kEhV7yH8fHOnjIv5EduHXw9bkUS/zjhaC/iBaPDpGHJU8Ulu20 xZV2pt4zjqOq/UIfcPhaIoRhkYWF8QJfu2MmhltLKo0sk+gAV+lnb5V0uODi80wa1Ze+ kR8V/KcDGwVmQ12mW0wZjz7L7Kn/iX1OyJyYNumoVel0PE6oTzrr6+1N+nIDRbEi8srG 4pGnAYNrnAbNlJF5H0277oUJNY4usTgM/eanvZAK8YXELDDqjzwE6CZ6fHt7sne/6r1r kmpT/Qbgf7w7zhVQ8FPZMk8idssyZdwKDAtVwLBOM4whsjOfY3gy6/fUlr7Zj8biv2gs HbgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MSxc2lEm; 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 gc9-20020a05622a59c900b003a50e662e0asi6967876qtb.623.2023.01.10.10.30.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 10:30:25 -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=MSxc2lEm; 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 1pFIb6-0003Vz-90; Tue, 10 Jan 2023 12:39:40 -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 1pFIb2-0003Q6-5x for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:36 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFIay-0001FA-HB for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:35 -0500 Received: by mail-wm1-x32c.google.com with SMTP id i17-20020a05600c355100b003d99434b1cfso10710362wmq.1 for ; Tue, 10 Jan 2023 09:39:32 -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=KS77SMPj4oKmkGa5jb8BcpyB1iTizAYKK45SCLEMfy8=; b=MSxc2lEm3y/sj0EFcT+UZGb7aRRGFbdfUxSTq98zahaqKi+iB3DdOXE8uRbu7Sbcj6 d08PlTYHZcc4oEnwPEWNXshy/QPZqqgcEYKIxHelpy7mz7hnqqZDoomZqK6AZuFXBxrS eJegnEen1pv1MoSBvNvgG9zobMfNJXWIqiFAGfWQTLLIIiYcqPlA+7qHG2iqcwUZUtTJ hnsKQJEIhbsS/G1vFi8uBmx5VFn+YSpb6BdJxJxC+Tv9VsOOMsgUVEtB/yrBxk48PyGT g0Zf0OljUxKS470R3Cb+yoldPBUjiAQ97V8ZxX5H3bivl9EaW4ano3s/Dpv/IVgNyqDP FtIw== 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=KS77SMPj4oKmkGa5jb8BcpyB1iTizAYKK45SCLEMfy8=; b=6fl5VLA+6I/HZJVd8cMK6nQZpYSkIo8LHFeCo88KF4jgSCxPWrw+VHZxtZ8Ol2cfVw tX72CYKm+fFUCPQ5yCP8pEPBxY/2KkUgCD0xbbQcfvXoWRCe2sXCjmzk1ZpxM5FxaA+4 ZYANghTnJp2yQb2X7sPqVnYq1JsfTC7ljmUZDGMTtLTYeoTqFWwTvx1nP9Xz7Dfunjqb ARtauUV+EDUyD92Y3ngqxTd7AK5urP66iQXFqpCUhVdkvDnAR4+TO0rbervt/qEmqHGA N0HiAhlXmLAOkmbkjFox+GGqmLHsLDgYWmTz94xq22bWl9CIg81i6sRPAN0XGQlxJeKr 6tcg== X-Gm-Message-State: AFqh2kqIa+vTetzXdJPABthDa6h1j6cN+v6nBc90SnQYCanDR5PpSv9Y t4+letDj9k2JPJNxbg4WQ3+OoA== X-Received: by 2002:a05:600c:4920:b0:3d3:39a9:e659 with SMTP id f32-20020a05600c492000b003d339a9e659mr52944263wmp.21.1673372371139; Tue, 10 Jan 2023 09:39:31 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id u16-20020a05600c00d000b003cf4eac8e80sm18814426wmm.23.2023.01.10.09.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B0BAE1FFC1; Tue, 10 Jan 2023 17:39:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson Subject: [PATCH 09/26] docs: drop texinfo options Date: Tue, 10 Jan 2023 17:39:05 +0000 Message-Id: <20230110173922.265055-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: 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 --- docs/conf.py | 13 ------------- 1 file changed, 13 deletions(-) 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 Tue Jan 10 17:39:06 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: 640854 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2836332pvb; Tue, 10 Jan 2023 09:49:40 -0800 (PST) X-Google-Smtp-Source: AMrXdXtDcOEVkzgbdJPd/Ll2SKE9BO+HJ3sH4izFiPthoXV429OgfK6bQ3HBRTGZ6eelr+JefSoy X-Received: by 2002:a05:6102:3561:b0:3ce:d4b1:1bf3 with SMTP id bh1-20020a056102356100b003ced4b11bf3mr10213854vsb.12.1673372980288; Tue, 10 Jan 2023 09:49:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673372980; cv=none; d=google.com; s=arc-20160816; b=uiaCjx5QkdoYurkF28rtKrIDCT5R+IQFtZ6geo2oENQ3B8/UnhYnheR8EI6kNJE7xP c97UNKzOCYsn72x6k1Psitl73ynp6R2YEdxjQq+e/O1/9tgFM8SJIv9IohsCXp0hW7/K qWGsMMKZTjTEaShNFNvXVnstDSu+HvRcR8ef4VdrvGC5RjyIXMraTwSe8DMc54Yyxo+B zwYZfIo9R6FKgWvz/b09FS8LExsDhFgD1QFZ5XHnzxidbovcgEEbVI0TNaIXhyu+XX1m lexMsvR/wWKWBmN05iDuU2wzt8ppk8gn+vuctmaGK036rvM1vafH+4PeKqre9hPlfHdM +UWw== 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=u3TU/8RzaZb629pQjFkGYP4tXIvtx8DBQyp5aN1lI9E=; b=V2rmMzjG//zI25264Y4peHM4NvTlbmisIxxXtGaSGp787yuDTEG9HIF7ttNjCioKGM F0BUiTowynmgJLWGgg1lI8UjiaVwRd+yP8b2piqEz1SFfjBysmyqB/ASbs5RZMExw9Vn bXaAyGetb5WebBYwc2AfqPGfyuPonIZ8EIDwC2c/KAG2dXgfyDyXwE5ffniP1skB5E/x SEQ7PTWpwqASlg3Z4+xup3Xoi22IDEykC2wkDDMC6HaFHmw8KlLI0k7ILheMTbjP6L0q psrjYKHKnaVoGJ98O23KC4DfHo8FZ8AOMN8EAr55bDSW4y9FhNitJqAUuZtE27qwQft8 +LYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qLniBV6x; 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 u13-20020a05620a430d00b006ff0d5b01a0si7096426qko.44.2023.01.10.09.49.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 09:49:40 -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=qLniBV6x; 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 1pFIb7-0003Xb-QR; Tue, 10 Jan 2023 12:39:41 -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 1pFIb3-0003Sf-KV for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:37 -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 1pFIaz-0001Fo-Re for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:37 -0500 Received: by mail-wm1-x332.google.com with SMTP id m8-20020a05600c3b0800b003d96f801c48so12517538wms.0 for ; Tue, 10 Jan 2023 09:39:33 -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=u3TU/8RzaZb629pQjFkGYP4tXIvtx8DBQyp5aN1lI9E=; b=qLniBV6x5L6mhsf5I4aqYvnw3JrANWc0Isci/4hxCkG2frOhYSbBmG8lAW0JFfH1yw BmK9VIkVEmn3ds6BwRhYUdFlQwZ/GAPxKh4TuJTXECTfagAdaEjdVjMmp2mThuWs4N+q 5B821BcpXagshFiFh4AdSbLC/3AJDTntm570BrI90aLXk3m91RU8cMuQOZ4voh5p4RYg ISU8DB2UQttg+jsi555jfVzeYW1ZQK7OOHQ2einxo1UsLGh5Enc2BVgbJYqwIO4USB1p OAZeZL9nA81u5/xLK0x1R6w2o4+rJwDkZP2r3UIJ3H3uZUFjXy5xtCw0leUQ+9wt7ImY IByg== 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=u3TU/8RzaZb629pQjFkGYP4tXIvtx8DBQyp5aN1lI9E=; b=ZFV/6H6g+UE+fte9YUBPNjZDEvTcDjxe6MdfSb20XiDFBMwdoKP7TCHNSVE6PTx4Sv +CAvGilnBCWpsbqfQzLXLVuP3GNb122s49zhtw91uOsNGMddA3w/2o5u/DFwlSKmlThg Od7Q6dcuMOXWS9J3bQ50dM9P5uippFkSuyfhZLMGNZKbA6rGRgLtl2Q8xosNqtWz7uFn IpSTYZwe/RtKeen/fYdIo5PUMIFKTQcTH1kv6x3x0ZUvRPir2dqAH12RnWlnJ+WhMhDl NrAx4HIvhl6fz1oWaGOCv/8lwLCKQ+xM05yOpqKl0ejtesk4LU+SbT1gKeMnwlc3rK0K jWiQ== X-Gm-Message-State: AFqh2krtxBsGEz1r8IhfVuzpXK5ttQ9AHtu5BmDEp4ENnQSMQggugIwR 6UG7hD3XYFTuwlsYz4z5BYGrAw== X-Received: by 2002:a05:600c:1503:b0:3d0:8722:a145 with SMTP id b3-20020a05600c150300b003d08722a145mr48839355wmg.40.1673372372375; Tue, 10 Jan 2023 09:39:32 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bg42-20020a05600c3caa00b003b4cba4ef71sm23492283wmb.41.2023.01.10.09.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D39191FFC2; Tue, 10 Jan 2023 17:39:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson Subject: [PATCH 10/26] Update lcitool and fedora to 37 Date: Tue, 10 Jan 2023 17:39:06 +0000 Message-Id: <20230110173922.265055-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-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 Fedora 35 is EOL. Update to upstream lcitool, that dropped f35 and added f37. Signed-off-by: Marc-André Lureau Reviewed-by: Thomas Huth Message-Id: <20230110132700.833690-7-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/fedora-win32-cross.docker | 4 ++-- tests/docker/dockerfiles/fedora-win64-cross.docker | 4 ++-- tests/docker/dockerfiles/fedora.docker | 4 ++-- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) 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 Tue Jan 10 17:39:07 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: 640862 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2849295pvb; Tue, 10 Jan 2023 10:15:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXslgS/TTRGe+dnOCTwKSAdEUu4zTntjD16RVu/3mgMzyrf2Z1RVjUPUNogeU4BF2zdFJFlV X-Received: by 2002:a05:622a:1927:b0:3a7:ec54:cfa2 with SMTP id w39-20020a05622a192700b003a7ec54cfa2mr94071645qtc.56.1673374505104; Tue, 10 Jan 2023 10:15:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673374505; cv=none; d=google.com; s=arc-20160816; b=jY3lU0fgxcZ72dKfyj6lEmI70xhC0RbX9KTAcJtZZZMG5du5GsWWpXFEW6WrQiXNKW R7IZhYS7CLhyn7wI+2OZs+hHFStLZMpWkX5mRyCL12Dt+3fJowf3Zp6REk80hFU/vWiq 8J6aVpVWX51SEwGbgwS/uuPncutLU/dPxU59MsFRmnUb/50mfhs2zRMLK0mirmd5Ijw0 Hl0Uc8MKSHrdY1XV79itSYWhwcKftuceEk+Q6djy9SDVE0P50id5AGbSCDsK+zuMpGUl rbYqniQJIPsO8oU23ZKtAWvCQlWDSpGdzwQvsFVJQE+Dhh07GWZjQlwrqTMYHIHLyQhR g/0w== 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=z0YfL8vRVyh3lous/0s95D/+xZNaaK4U/ROvzEEMvDk=; b=BBezmju0kl26dBKzBWRmUvDLRvXUQi22ta53hn6aR8wB9DNZ2B+0ho8XeVUtuBf6v3 AvJYc84w+ZIqLp+wN7CCXD0kXNV188QHyoTbVZesnNUpV4AeaDncXicF3zYkTyEdT2E/ GYunfF7Dcpt8zubaS4ZgEBuC0A2hCZ2JBA42AWn2t9Y640umOrXCPPN2rMPxMxBCQPkl 40gGKaEzS0sTbPOFB9CxmJXl5SqBJTeMLdR7s8CcNdT/myGeAot4AgMWkth0Xz2y0e2b m5cM6YbQj1ZD3fFTsBVTwHdPGLDiyii56JB4OGL9PbXWEi9k1zGFs1GhZqU1GUrtREB1 dSIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HITl9Ba8; 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 bw5-20020a05622a098500b003ab85b5785csi7009703qtb.433.2023.01.10.10.15.04 for ; Tue, 10 Jan 2023 10:15:05 -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=HITl9Ba8; 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 1pFIbB-0003c9-Ge; Tue, 10 Jan 2023 12:39:45 -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 1pFIb7-0003X1-6P for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:41 -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 1pFIb1-0001Dm-VR for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:40 -0500 Received: by mail-wr1-x42f.google.com with SMTP id e3so3373100wru.13 for ; Tue, 10 Jan 2023 09:39:35 -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=z0YfL8vRVyh3lous/0s95D/+xZNaaK4U/ROvzEEMvDk=; b=HITl9Ba8lZxtccssMGTgqO0xZJHhfU7GN+IM7uSaqArFjCC7vXKNRGMhIkDLCaWiXI 2aJyY4fWbdBBmZdDBSmqJ+kOlQH61eaHk5ybk8OBiuOHtILorq7k7Gpzg+ECQCFnpJaM T8ZDxdkToIUq6nXQxIbXE1oAbM21wyerClJpTXEH8aM/NzqKqOiGcqLAR9yjGslENT+b NVCk1Omv3Ilr5VXjX7vnghLzXDAIBbhIchenWTnKG+Q2zE3aVCT1Vl9DipcTdiyPf5C0 f3HX0t0JNqQrmmVzuYghTggTmViWCxuxrCHqeA+HCxwrhT0YPotCFqS7UloYRsAJk0fY ugvw== 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=z0YfL8vRVyh3lous/0s95D/+xZNaaK4U/ROvzEEMvDk=; b=YM+MIC1fG1eSbdrAm6TJU/dvRFTPQHdoxP3IQo6EVoA8sF7Q1NTcZLqQ2ixpvMNGWM 3r5qFSu7thNR61xT9c0VNiQML+rWG+3cVgXWItY2iI11tJ5/5V9sQPbS7CWxW0QqMLW3 NxE6uCy5UhWld0dkBqhRPeO9AKFWqYm/IQHYRV293TPaFUZ9ZAi9poAXQurA7KHsI8u4 pCTlPkMZrVcjm2bkuCCdBe5wN+s9lODHP7XyEef6J+zwJzU7wTXUzYCYjtGdpu/AfrOW HfmIenmfzdcJmyRaF1QO4KQMDLPToiijX3aDGafNLI+9F0FGMIkYNXt99anU0Kn5SmpZ /Zug== X-Gm-Message-State: AFqh2kpCFsXw3pxtfQFySjalbmEIg2YKE5ODcz7dVjt6WfA4x79kpyVK zuNqmtmuXMrFi/jpGop0b2wacg== X-Received: by 2002:a05:6000:a19:b0:2b1:c393:cbe with SMTP id co25-20020a0560000a1900b002b1c3930cbemr14964056wrb.11.1673372375229; Tue, 10 Jan 2023 09:39:35 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id v14-20020adff68e000000b002365730eae8sm11744722wrp.55.2023.01.10.09.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:32 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 32A091FFC3; Tue, 10 Jan 2023 17:39:24 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson Subject: [PATCH 11/26] lcitool: drop perl from QEMU project/dependencies Date: Tue, 10 Jan 2023 17:39:07 +0000 Message-Id: <20230110173922.265055-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-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: Marc-André Lureau Signed-off-by: Marc-André Lureau Reviewed-by: Daniel P. Berrangé Message-Id: <20230110132700.833690-8-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- .gitlab-ci.d/cirrus/macos-12.vars | 2 +- scripts/ci/setup/build-environment.yml | 1 - tests/docker/dockerfiles/alpine.docker | 1 - tests/docker/dockerfiles/centos8.docker | 1 - tests/docker/dockerfiles/debian-amd64-cross.docker | 1 - tests/docker/dockerfiles/debian-amd64.docker | 1 - tests/docker/dockerfiles/debian-arm64-cross.docker | 1 - tests/docker/dockerfiles/debian-armel-cross.docker | 1 - tests/docker/dockerfiles/debian-armhf-cross.docker | 1 - tests/docker/dockerfiles/debian-mips64el-cross.docker | 1 - tests/docker/dockerfiles/debian-mipsel-cross.docker | 1 - tests/docker/dockerfiles/debian-ppc64el-cross.docker | 1 - tests/docker/dockerfiles/debian-s390x-cross.docker | 1 - tests/docker/dockerfiles/debian-tricore-cross.docker | 1 - tests/docker/dockerfiles/fedora-win32-cross.docker | 1 - tests/docker/dockerfiles/fedora-win64-cross.docker | 1 - tests/docker/dockerfiles/fedora.docker | 1 - tests/docker/dockerfiles/opensuse-leap.docker | 1 - tests/docker/dockerfiles/ubuntu2004.docker | 1 - tests/lcitool/projects/qemu.yml | 1 - tests/vm/centos.aarch64 | 2 +- 23 files changed, 4 insertions(+), 23 deletions(-) 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 Tue Jan 10 17:39:08 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: 640882 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2872555pvb; Tue, 10 Jan 2023 11:06:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXuO0GOO1Bnvsz9J9ny95GZ1I/h+eKZ8JWzlEOc7F48LPMIGoE22lg3utyNkcQaZP03s2v+l X-Received: by 2002:a05:690c:f8a:b0:4c2:b74d:9cea with SMTP id df10-20020a05690c0f8a00b004c2b74d9ceamr21782533ywb.28.1673377590763; Tue, 10 Jan 2023 11:06:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673377590; cv=none; d=google.com; s=arc-20160816; b=KvQqZFm5Iwr2UNrG5SS+83y+LH7CJtd+TV8azo2rkW7/pUC+eZi59vH3ojU1Ehk6H3 d/N9kmthALmrSbagHYa7T3TRol96C1QnPgzhQ9HVKutH2X+MuvulQl2t4bXvmkLjF6l/ 0DdRPvGFo8m0d2z/oa96WoSuS/sa8/+kXTWMyYu2OxS+PUQ2X1CVYfhyPJqrY4WDMCUR Yi/rv1rdrSWQuE76CAbOrR03JRKU3TnTxvZfLAXogLIks9jahCMYdUZGt2CAe1l07HoJ rpqunrMYDJy60zrSFmZn3MicxCNh4e/TSJVKqQ9w3nJ1wv4iddt/cJnTV4BD5Mh7c5Ng YwIg== 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=abhryp1MJV0DshEz140LPVlJItKpk8kE7C1e6LVlgyk=; b=XiZc/w9oGcqSgVkvMN666FXTSW/s/uYe+Py2wkS/FseNmjIuMUDv8nyMQQLzCFeJSS JWz8h9jm55XVxZq81WjBmJWS/4AmypIWjxbzdmwzBi46a+Sf07GnYHAiwkLBEXQdsZiM C4T4JXHTznpMoQ8n91C0cmQxCYN60V6deWuuTjyDU61KxOOrfHVdkj2WMGh7geKrPzqU HQLsIZCJTGDFIocdAUzE2ezCSGJ66tiLOmj96TpcUgV2SaOM9giFEKg3w31m12gjmHlN LKFHUrL642k8TTAyMbkBsacQeD4zfXfQoxFwtM2S7a4ECnnP2ytg0hCMkuPZzWePjXBY kCmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=csqJe6v7; 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 v20-20020a05620a0f1400b006fc3fa22f44si6613275qkl.221.2023.01.10.11.06.30 for ; Tue, 10 Jan 2023 11:06:30 -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=csqJe6v7; 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 1pFIbA-0003Zr-3l; Tue, 10 Jan 2023 12:39:44 -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 1pFIb6-0003WH-CX for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:40 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFIb1-0001D0-8y for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:40 -0500 Received: by mail-wm1-x32b.google.com with SMTP id bg13-20020a05600c3c8d00b003d9712b29d2so12529066wmb.2 for ; Tue, 10 Jan 2023 09:39:34 -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=abhryp1MJV0DshEz140LPVlJItKpk8kE7C1e6LVlgyk=; b=csqJe6v7jA+kHs4y7ep3gkOg1T7o7NcEP6WrN+ci5ugIC3/lZAZHWMxlC1nAZHFr9G 5wuTLFnzL9POGL7T621j8fiztWucuiZj7NKmHOds2wFcqhglgX8GjI5Rc+xUUyfjSnGi 5jD0NQfkBMlAo185Rotv9Iz6YYVf8OYMQJ9lzmLHTfEqDaVdD9GZm47iGQcKIPFIBW4l QpZchCLzGw3z5VUUXkZFHtdft0ERRgLjECCbKsfFnKJ16/TpdxL42Vqr1VW7RSgk7ggv T6tcoE4nSLr/2CiCQTyW0GqKcn2/2DTQXqq0LCFFoUsk6/AAokrWbJQlmtDJOgmtETR8 OA6A== 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=abhryp1MJV0DshEz140LPVlJItKpk8kE7C1e6LVlgyk=; b=WUVELXkaPVEDhLxdcvfeY2URe6Hln3OguZIY/whMLnYlWM+VroA6lyZrn/dXdQdHar QB9Jkeio9PdAfAp19uv+mzXFWe4dlIep/KuOtzuk59NkbOvKZKxU0ARKEg6EtxXRjJbF XDdXpq4Q2bpwF6lsnJqjIvwp5rcAbzh+BCRN+s4FJuLADV1tzxYQRkrt8d+o9GeExQoE wEvAQsFOycPq+ySOfcoNA6HzAXYFAuf1pAvYIyLYfHXA5meY3nqpFSI1EXgxqTfEsBLa 5n0Mgds1bK29G6p56QfG+VzNHSdftSo/NOs0l9Un4vLL2e8wHTkqiT/ddhzMuC+rNsdp oafQ== X-Gm-Message-State: AFqh2kpnFwgCwI8eS3s3gdd+akDr6leai6QWaG3pUQvFiOzwV68fwe0K iG0nWrSPbNlGc5GAi//CL9DWug== X-Received: by 2002:a05:600c:3c93:b0:3d9:ed30:79d with SMTP id bg19-20020a05600c3c9300b003d9ed30079dmr7357874wmb.18.1673372374470; Tue, 10 Jan 2023 09:39:34 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id y15-20020adffa4f000000b002bbec19c8acsm6490444wrr.64.2023.01.10.09.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:32 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7D2D01FFC4; Tue, 10 Jan 2023 17:39:24 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson Subject: [PATCH 12/26] lcitool: drop texinfo from QEMU project/dependencies Date: Tue, 10 Jan 2023 17:39:08 +0000 Message-Id: <20230110173922.265055-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: 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 --- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- .gitlab-ci.d/cirrus/macos-12.vars | 2 +- tests/docker/dockerfiles/alpine.docker | 1 - tests/docker/dockerfiles/centos8.docker | 1 - tests/docker/dockerfiles/debian-amd64-cross.docker | 3 +-- tests/docker/dockerfiles/debian-amd64.docker | 1 - tests/docker/dockerfiles/debian-arm64-cross.docker | 3 +-- tests/docker/dockerfiles/debian-armel-cross.docker | 3 +-- tests/docker/dockerfiles/debian-armhf-cross.docker | 3 +-- tests/docker/dockerfiles/debian-mips64el-cross.docker | 3 +-- tests/docker/dockerfiles/debian-mipsel-cross.docker | 3 +-- tests/docker/dockerfiles/debian-ppc64el-cross.docker | 3 +-- tests/docker/dockerfiles/debian-s390x-cross.docker | 3 +-- tests/docker/dockerfiles/debian-toolchain.docker | 1 - tests/docker/dockerfiles/fedora-win32-cross.docker | 1 - tests/docker/dockerfiles/fedora-win64-cross.docker | 1 - tests/docker/dockerfiles/fedora.docker | 1 - tests/docker/dockerfiles/opensuse-leap.docker | 1 - tests/docker/dockerfiles/ubuntu2004.docker | 1 - tests/lcitool/projects/qemu.yml | 1 - 21 files changed, 11 insertions(+), 29 deletions(-) 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 Tue Jan 10 17:39:09 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: 640884 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2874152pvb; Tue, 10 Jan 2023 11:09:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXssTFo7JNi0OnEIt9yS1HOiBds9SUsaOqh+eo4OJWQjh4JygdW8uxKchP5iya6pKl2lS7E4 X-Received: by 2002:a05:622a:5a09:b0:3ae:a9a8:549b with SMTP id fy9-20020a05622a5a0900b003aea9a8549bmr6190791qtb.50.1673377788658; Tue, 10 Jan 2023 11:09:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673377788; cv=none; d=google.com; s=arc-20160816; b=C3nlxrUbMyDZ2Y/h7ip/KzyREA7rtIZjAXy5fdJpvZkrCGf/f8DqBYCYLtgUPPN6Y2 eavfdeUz1dVrcwXMYte1OBRtRWeUTNUotC1XKqEsOZzMeo0J7LJ+ydcw77vjyRMnU3C+ Ug2NMNCcjfiOGrMCREM+apFo1+l4Y7nHSgxhTcBNhA7J/wkLu+L9CI6PS1A2KRKECyzW scyorvC9JEGls7ZifHDoJCALGrMKQ5lwO+XjnKAmUNyHQnzK82XmNiP+XWplsejrZoc9 bzq0VAhGnoB+nXQMuvUQrT/HPJeEn60nvR3Z0+uhl3iAvuTnjytZoLdl6nLmvnJDixT1 StUQ== 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=/kMBc7kYwawlV6mjDVr7qPyvgsdPKM2HCAFr0iHJ9Nw=; b=aEAyDh2pMGKLcWtWr1e53I4GtqN9GNC6lUVOQAlqPWDvl/UQw5YLmF+CPWDGKRFulx v/Cdlv4pR2ddxxUkJfCpio8dXRi2gD7vrGK3NG9uSyV8NWC1zPV7qt4i8+OQvKeS3LyQ +q+kSwJ+5mYbxUSzhVWbewCi6Y19fOl2fWlW6NT1Rl6LqvPeAF6HRlMuuCNq77WsXqcc 6Zw5ctsDBqxtD/JGouk46NtmON0rOBDaDkLUHyZDtC89fqnvOJMfdhU/fg0gvjBwIsQj 9d6I0ij3aQxQSZUXXkjBFFYwjaeZo/Ftcc1UHV9iJWXIE7mIYorMng9wPoXpQE00yia7 oi1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UHhc0T0r; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c11-20020ac853cb000000b003a7f3c46cffsi6688581qtq.716.2023.01.10.11.09.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 11:09:48 -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=UHhc0T0r; 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 1pFIb6-0003Wm-T2; Tue, 10 Jan 2023 12:39:40 -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 1pFIb4-0003TR-D1 for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:38 -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 1pFIb0-0001GY-Kq for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:38 -0500 Received: by mail-wm1-x32f.google.com with SMTP id l26so9370180wme.5 for ; Tue, 10 Jan 2023 09:39:34 -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=/kMBc7kYwawlV6mjDVr7qPyvgsdPKM2HCAFr0iHJ9Nw=; b=UHhc0T0rb4uynWDAFJZnoOJ2P7Smw/qCsCapN9ijSucUCWMGpTbboSlB3VmjlGw2ZM B5c5hEgBRr96sdujQksdakonZDoDHxCnhPVKQ9ElQj1LsUE5dHsWunAnxObAYJXUdcSd Z5OBfCdSDY0GoXDjJbk2cF/bP1PQ6la6cHbrTCE/ny6VIHUmBw4GmhP9EatyfgEazIM0 3q/BL88aRuHbzsYXPSwtOfdOk6DpGnaxo5uLCplmL20hoP6XbDdOjaRqTMcq1p3FXc6k GAp+IlYb334t/AjNuUlrca/YwwlFW92ecZ8gPMBMM5WAgV6sMk2B1HCQO5KwOT0rZ6bW RxBA== 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=/kMBc7kYwawlV6mjDVr7qPyvgsdPKM2HCAFr0iHJ9Nw=; b=IouljP4H5CrW0F2BToYjhWNXJimzCQjZIVMBsh8pas3QrCrWvaV0G5GUundEjdXkhw lYbJToE346NuXZbZizU1PYzeyOV9cYendlsShUVCAsoxWrBEHq9V60aLWFv3VLFwc6H9 bFZMDZLsUgkn7Vy4r8Rw/glzW5YUFFcsrpMOZ/W9S9sJvhN6Lu/peLM3kUoYHUPIMbYc LqRwhB6bHbHyQAnZ14aYyqP5BSCcrGcoNJEVtRx5bFDVFoO/fvFNtVFHTw0R2Dv6EbMD WUCGMbJ+0T/1sjFIB++CN2zQZhhaSi5hLS/u2gKtnWE8o00HvhPRGnYkaFYGVHRquTpw dOAA== X-Gm-Message-State: AFqh2kru5v6cOdtl1nsefBd0J888urx9ujeiP4G/AbHe48HX4+/8/g7b emYDM8I4YItsZXpx5J32uvqZBw== X-Received: by 2002:a05:600c:601e:b0:3c6:e61e:ae71 with SMTP id az30-20020a05600c601e00b003c6e61eae71mr60134889wmb.1.1673372373262; Tue, 10 Jan 2023 09:39:33 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id w6-20020adfd4c6000000b0027cb20605e3sm11612410wrk.105.2023.01.10.09.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:32 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 962D81FFC5; Tue, 10 Jan 2023 17:39:24 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson , Keith Packard Subject: [PATCH 13/26] semihosting: Write back semihosting data before completion callback Date: Tue, 10 Jan 2023 17:39:09 +0000 Message-Id: <20230110173922.265055-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: 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 --- semihosting/syscalls.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 Tue Jan 10 17:39:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 640889 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2878493pvb; Tue, 10 Jan 2023 11:20:00 -0800 (PST) X-Google-Smtp-Source: AMrXdXs3RJunUeQIRhBdoSsTdDTvQLi4pz5eCHk2AnhITBjR3wU5jxXgrC4Y1qmtwNNODvJN1SkY X-Received: by 2002:a0c:8dc7:0:b0:532:3b2d:3995 with SMTP id u7-20020a0c8dc7000000b005323b2d3995mr5856198qvb.39.1673378400762; Tue, 10 Jan 2023 11:20:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673378400; cv=none; d=google.com; s=arc-20160816; b=pHVMQqXjuzgAdzfmE/XQGp+tN5OzvCXNe6yQucBpHUI7UiYC0u5wYe0CJ2jjye5EBF jeYnnUhgo2Q3XNBP1w9atAy3M4SFBadhftKKX5xx4DBGdEqL5TEJNk2wWvTgYHPM3aR6 iGSVpWBmEGwevsRhYnJOfHnD7cCHphbrrtJq45LyxLS4YpzEznNN4c+1VXIPPb9j7vW0 wMmxYZ2gYc2aHfHktUPKaXsgxdCH+nfmRYEhvGYQ5MTXJn/u26CPZFN4DV6IGDJGTaAv D4mFdvpTCcjq1eZKA6S6ofAdP51+pqP9SkR795zziEpPglQyLWqFETa7QQIxUsrbV+0p 0AsQ== 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=ETifGALS4KmBJlNwYTjtra3baBU/IlLzVll0TgmEm7I=; b=ON3xEZKcaXdPwFGsvsTwHZbrCTi+bR6vRJ8HmVMkacOwok6MbaiaaJVRbjf8ja7v/l /7ltiSm/n3z60bO60y0+YGTHQfP0W28/qfQ6eqn3qH8yZTe5bDR0dVftTjMiqFqVpHD8 3CtHmDZveyYWE2/pKTpqnut7YIIbcu7FUwr5EFSD/VvoOztPzO/TKI+vCukIz9sVTeF1 YkT2bR4UaG8M4amBMLdZ1JDIPXcMsRrnRBXzAqHsH8tysgy9K3Jkokb1WsiqKSDQ/2MD 9t3FVvrCKGwn4H9rrWV9/ZW9XSYxvQgaqReWrIwZ8vGLHF9u5J5C5cGQrxdHqkUzJ3/B l5yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="B1yQ1/Vb"; 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 fq2-20020a056214258200b004c6ff7ee04csi6631168qvb.487.2023.01.10.11.20.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 11:20: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="B1yQ1/Vb"; 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 1pFIb8-0003Xv-Pd; Tue, 10 Jan 2023 12:39:42 -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 1pFIb6-0003WF-C4 for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:40 -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 1pFIb2-0001D1-7m for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:40 -0500 Received: by mail-wm1-x331.google.com with SMTP id p3-20020a05600c1d8300b003d9ee5f125bso6022297wms.4 for ; Tue, 10 Jan 2023 09:39:35 -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=ETifGALS4KmBJlNwYTjtra3baBU/IlLzVll0TgmEm7I=; b=B1yQ1/Vb+V9nZz4lyn28CsVZ2MTvvEpdfNjN4RJjJRUkcPlvcMT7OvZxUPZy8FpCBs t0WDlz6K+Q5OBroVFTarm4KodBhr641oYu1BDfFoNEzZQwN2oSuzaxC5qWOmOh6jbhuE NI5WC5DppwOoo9iRmNLQaH5c6YdOFlT1rDDrln53mmYOYSJUmrpHr0yuFMrV6PTgxb3V LO9rNbl942g7sFxffX3TPccR3GKvCKkdeFZl+IulNbr4YYtlQHNji6b+bghPF588BZdQ INxDniwgAycmd546D88n7bY/VSj4L8s03bbq/8WKGYIl84EOJrsicXhG3oXeyYm89IaF 7T2w== 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=ETifGALS4KmBJlNwYTjtra3baBU/IlLzVll0TgmEm7I=; b=4E4a9jG0kKJcyzUjtz6yAiZeWWS26Ok+2xqyfo71JcWSgykScCaDvZb3cST1qXzq9t cBdAIBKrnM5HM/CKUs9kNXoYYy9Xm0AY9MHnx4BjJPid3by2rtzDzFdK0EiESxGe46uQ QbQjLa4q/06c3MTvRgIj0NLq4Ox0uLAF8IcnlmnBxvkr5H6ian/K6F3xxxxD8/zlXYwp CZkOx9oNo8Fff6E1d3ZtlvMW9HIo1+INPfDvIZG5BvESRsR2QnTb2uTs4krlPWM8w5Vb is6n/m7MMiUiMKgVDWA5uB8PQoh0Z4z5XlK35wyoM7+9uTZr5juYexaDQqOmz71IQx11 bb2g== X-Gm-Message-State: AFqh2kqMUL289XKl5jmrqklZFIl51ZBjGPucHZ5BBFTPP3X32ZZ5mWZC 7yeydSLxQC2uKXnkmdA6/eg/yA== X-Received: by 2002:a05:600c:229a:b0:3d9:ec70:befc with SMTP id 26-20020a05600c229a00b003d9ec70befcmr7543365wmf.13.1673372375520; Tue, 10 Jan 2023 09:39:35 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bo30-20020a056000069e00b0027a57c1a6fbsm11891959wrb.22.2023.01.10.09.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:32 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B123C1FFBA; Tue, 10 Jan 2023 17:39:24 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson , Evgeny Iakovlev , Bin Meng Subject: [PATCH 14/26] semihosting: add O_BINARY flag in host_open for NT compatibility Date: Tue, 10 Jan 2023 17:39:10 +0000 Message-Id: <20230110173922.265055-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-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 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 --- semihosting/syscalls.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 Tue Jan 10 17:39:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 640879 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2868026pvb; Tue, 10 Jan 2023 10:58:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXstAsYhRc5oTGcuITcLiC/m9u6TRwlRG0kT0l6BEE9P18+3Z9mzRHUgPEWXhYRdn2LCQPtH X-Received: by 2002:ac8:1281:0:b0:3a7:ee3d:21b3 with SMTP id y1-20020ac81281000000b003a7ee3d21b3mr6067209qti.0.1673377115982; Tue, 10 Jan 2023 10:58:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673377115; cv=none; d=google.com; s=arc-20160816; b=u72Zspf0dRh0gnyMf1R9eTqu9tWb9Yh89Or8xOpqLJi5ddv4lb5OjqwRWCpb0XztNr RNcoyOAVSiq4KdoJx4H5S4fSUjhl9qBe1jbKz1xN9Hq0WjvXRsTi+Y8McsFxeoVSx3Jk HZqx0HqprljHhf+i0tA4I3geRkS13q4FY0Fk9H/ETL5hocMPUoGp40pYB68tmNGxV3ca sSgTycX5mQgb6PGaEl4canXt3AYCBpZikjK0F/OizbOjwMQrzKIkR3SJlwnmpwYjskGb bz3XTLlkLJyiuosda/Wn0bQ/0UUvPh64/9gonw2gg2kjwPe+wPo/7s1KNFQtAnoq/HTL F0Eg== 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=/NQCSD0se/+XsHWo+NQiiskBTyU+oAop94QEqlvLkl8=; b=qVuyBeQtfdD8yYN9zqNbPs4tQFq3LB6G2jeWWQlceKAYrvmj72tNsw5bBZPMIwVqlw QFBFTE+DF3SVvcBkeCTZY0mQr+mtTDMHnSK2a26Id+x/5U2VXZTkh3Ridc6HAVNMkPG2 P0SExm4c/7Gq40Ywz1cIOifeZWsPBFqaR6eQqu3b6cq4EtubnI26MSAYB937GNzFMBwq WXzQsDZeVAlp8Hx1vF4fPpuXmHH+AxqvO2b6oNAJtLBTcRnXnm5xMn7+j84eg6NaBLbd dTizgcSPl3i9Rr3s0AhtvRm/OW+nBOuFsIGnklUtsGl5gpbkc8qRpwcvXc9m/88P7kU2 MMvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=miwMnCls; 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 i26-20020ac8489a000000b003ab62774a6csi6759235qtq.138.2023.01.10.10.58.35 for ; Tue, 10 Jan 2023 10:58:35 -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=miwMnCls; 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 1pFIb5-0003VH-R8; Tue, 10 Jan 2023 12:39:39 -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 1pFIb1-0003PX-EK for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:35 -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 1pFIaw-0001Cf-Um for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:35 -0500 Received: by mail-wm1-x332.google.com with SMTP id g19-20020a05600c4ed300b003d9eb1dbc0aso7734252wmq.3 for ; Tue, 10 Jan 2023 09:39:30 -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=/NQCSD0se/+XsHWo+NQiiskBTyU+oAop94QEqlvLkl8=; b=miwMnClssYKj+GZPDpJMxYgoECJD3rnguW89qXMIiuaDD/K8LWwIB8rVfSJg6DDlhE qrA91ymg89CIY2AnHGLlSTgjrs2+nzoYrHvFXeTCjMXi1KsoiKmK+eqBkCERZKFhBhup AxIFbY6/xJ7VY9ltcxAbFu/s/SnQZZ1gRK5W/cxRBXModpUvbr3SBsaz48ds87aMkiPs 8vuYWA2fnmDrLIM02I71Q5QEVc1jpu/QboOXvBhV7vqgH/Nv2BBooct53nedkzqJwiWd 9YsoHGkG4Eg+rb3TZIVuFY4lio4PhgxICxu6nfLeOPckvpJTzmvWmvBo4xZ+e/70EONA BBoQ== 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=/NQCSD0se/+XsHWo+NQiiskBTyU+oAop94QEqlvLkl8=; b=YsDSwyYuGVkf8DuG7SMGCi/BD+7Uv+4dFdsKXEdzaudY0aEMjvbeuFK6QJFHIALza7 f/FD31AK1Pzf20wppXcK2w/Qx1/1CHjHzz2fVpn2KozegelO8oA6hVB4r4UOu9HDeedp 1qTO61lUbVKD22ugfv/u6/9c9HPcGNgDk/SfDN6mGSc1IaJBK/lJqBu4AOgdxSzban9D KyZaDVht8cMMAxhSZv9iybWFwtcpVNqJPXOhinALDQZlIeFesDXZQDSK2K57GIgH0hHR 8XTNTuQPC4tbAp3X/F0uRyqbqRj5gbFdO0gn7lc4f3Um2snBTWK95n1ATzTu4UekQHU5 N7BQ== X-Gm-Message-State: AFqh2kqgYBBI7XoCgTsvZWPjFsIlklV/40biAdjb31dgIgisvlkhRQYI RmSkEoLR1KPZ/br30sIIIG4EUg== X-Received: by 2002:a7b:ce87:0:b0:3d9:f37e:2acb with SMTP id q7-20020a7bce87000000b003d9f37e2acbmr5176738wmj.20.1673372370194; Tue, 10 Jan 2023 09:39:30 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h10-20020a05600c2caa00b003cfd58409desm21050998wmc.13.2023.01.10.09.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DEF0D1FFC6; Tue, 10 Jan 2023 17:39:24 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson Subject: [PATCH 15/26] docs: add a proper feature overview in "About QEMU" Date: Tue, 10 Jan 2023 17:39:11 +0000 Message-Id: <20230110173922.265055-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-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 I decide to do this because I was looking for the best place to add a reference to a document on semihosting and there didn't seem to be an obvious place to do this. To do this I took the original pre-amble to the about index and moved it to its own section, expanding the description and giving a quick high level overview of some of the key feature of QEMU. Signed-off-by: Alex Bennée --- docs/about/features.rst | 236 ++++++++++++++++++++++++++++++++++ docs/about/index.rst | 16 +-- docs/devel/tcg-plugins.rst | 2 + docs/system/arm/emulation.rst | 2 + docs/system/index.rst | 2 + docs/system/multi-process.rst | 2 + docs/tools/index.rst | 2 + docs/user/index.rst | 2 + 8 files changed, 249 insertions(+), 15 deletions(-) create mode 100644 docs/about/features.rst diff --git a/docs/about/features.rst b/docs/about/features.rst new file mode 100644 index 0000000000..0808c35a4a --- /dev/null +++ b/docs/about/features.rst @@ -0,0 +1,236 @@ +Features +======== + +Virtualisation +-------------- + +The most common use case for QEMU is to provide 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 +dynamic 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, TCI [#tci]_ + +.. [#tci] The Tiny Code Interpreter (TCI) can be used where there is no + explicit support for a processor backend. It will be even + slower than normal TCG guests. + +Related features +~~~~~~~~~~~~~~~~ + +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 featured block layer allows for construction of +complex storage typologies 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 +Human Monitor Protocol (HMP) that allows you to dynamically add and +remove devices as well as introspect the system state. The 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 +`_. Using some sort of management layer to +configure complex QEMU setups is recommended. + +For the common accelerators QEMU supported debugging with its +:ref:`gdbstub` which allows users to connect GDB and debug +system software images. + +See the :ref:`System Emulation` section of the manual for full details +of how to run QEMU as a VMM. + +Emulation +--------- + +As alluded to above QEMU's Tiny Code Generator (TCG) also has the +ability to emulate a number of CPU architectures on any supported +platform. This can either be using full system emulation or using its +"user mode emulation" support to run user space processes compiled for +one CPU on another CPU. + +See `User Mode Emulation` for more details on running in this mode. + +.. list-table:: Supported Guest Architectures for Emulation + :widths: 30 10 10 50 + :header-rows: 1 + + * - Architecture (qemu name) + - System + - User-mode + - Notes + * - Alpha + - Yes + - Yes + - Legacy 64 bit RISC ISA developed by DEC + * - Arm (arm, aarch64) + - Yes + - Yes + - Wide range of features, see :ref:`Arm Emulation` for details + * - AVR + - 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 HPs old minicomputers + * - x86 (i386, x86_64) + - 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 + - Yes + - Yes + - Motorola 68000 variants and ColdFire + * - Microblaze + - Yes + - Yes + - RISC based soft-core by Xilinx + * - MIPS (mips, mipsel, mips64, mips64el) + - Yes + - Yes + - Venerable RISC architecture originally out of Stanford University + * - Nios2 + - Yes + - Yes + - 32 bit embedded soft-core by Altera + * - OpenRISC + - Yes + - Yes + - Open source RISC architecture developed by the OpenRISC community + * - Power (ppc, ppc64) + - Yes + - Yes + - A general purpose RISC architecture now managed by IBM + * - RISC-V + - Yes + - Yes + - An open standard RISC ISA maintained by RISC-V International + * - RX + - Yes + - No + - A 32 bit micro controller developed by Renesas + * - s390x + - 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) + - Yes + - Yes + - A RISC ISA originally developed by Sun Microsystems + * - Tricore + - Yes + - No + - A 32 bit RISC/uController/DSP developed by Infineon + * - Xtensa + - Yes + - Yes + - A configurable 32 bit soft core now owned by Cadence + +Semihosting +~~~~~~~~~~~~ + +A number of guest architecture support semihosting which provides a +way for guest programs to access the host system though a POSIX-like +system call layer. This has applications for early software bring-up +making it easy for a guest to dump data or read configuration files +before a full operating system is implemented. + +Some of those guest architectures also support semihosting in +user-mode making the testing of "bare-metal" micro-controller code +easy in a user-mode environment that doesn't have a full libc port. + +Deterministic Execution with Record/Replay +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +For system emulation QEMU offers a execution mode called ``icount`` +which allows for guest time to be purely a function of the number of +instructions executed. Combined with snapshots and a logging of HW +events a deterministic execution can be recorded and played back at +will. + +gdbstub +~~~~~~~ + +Under emulation the :ref:`gdbstub` is fully supported and +takes advantage of the implementation to support unlimited breakpoints +in the guest code. For system emulation we also support an unlimited +number of memory based watchpoints as well as integration with +record/replay to support reverse debugging. + + +TCG Plugins +~~~~~~~~~~~ + +In any emulation execution mode you can write :ref:`TCG Plugins` which +can instrument the guest code as it executes to a per-instruction +granularity. This is useful for writing tools to analyse the real +world execution behaviour of your programs. + +Tools +----- + +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. While most are expected to be used in +conjunction with QEMU itself some can also be used with other VMMs +that support the same interfaces. + +See :ref:`Tools` for more details. diff --git a/docs/about/index.rst b/docs/about/index.rst index 5bea653c07..6949e6dc93 100644 --- a/docs/about/index.rst +++ b/docs/about/index.rst @@ -4,24 +4,10 @@ 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 -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. - -The second supported way to use QEMU is "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. - .. toctree:: :maxdepth: 2 + features build-platforms deprecated removed-features 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 ================================== 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/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/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 Tue Jan 10 17:39:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 640855 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2837093pvb; Tue, 10 Jan 2023 09:51:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXuVZUilnnUghOpdBpcim1aijNO/Bg6RGQXL8qrGs4aKHQ39IgVjTOTt+ykeUYjC6XARDm9K X-Received: by 2002:a05:6214:4244:b0:534:1c9d:c401 with SMTP id ne4-20020a056214424400b005341c9dc401mr3520160qvb.45.1673373096713; Tue, 10 Jan 2023 09:51:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673373096; cv=none; d=google.com; s=arc-20160816; b=sIX5MkdXOSzh0Hq+CXA7U2exC30ggBkOU0qqHRK2LafcXei7MFACBClw0U1TTyoDvb Aq/RY/dwbyoF1llHDLAgXmp7Vucj6IrxXvMtYZ/Aj/BohvrbKgdCiSH1I+9Qf0/V1mQR fZ75MwHCYIHYZJ9kMtNlGIyZZkpTJkPxumCDJr5nT6/7YuVKOkWxoL4dILaZkCY47m32 fuWDX5jozjlZQMBWrYCYzszIvni8qpn/Y+R1drrlDBg1roYbNQmMwrrkKyO9kujBmnoz aw0yb7UACY47AG12E9YKqA4W37K5+1ozaqLyPl+XLWIQMRHUmwfYkGa9h7Y6pfmnEcbi jAJQ== 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=43KlQoQXBLFJXtyBavKC5pzx9nNWRWlEnd/bI3W2oJk=; b=fqwJVRhFh3Ur8tOMqpE9m9PLx1jlffU4szjLY7dkUzhhAfISJ7nXt/Ta6h4DxnxAUf 2J566F3U5n99j+2v15FXgjzKn7TRf0s1ZeWneHXhH7RawGALNTtzxPaxtMbIwngYtvTn FTWkixSlwknf2XjWZu+CzyCFKahdEmAIjYRJOh4ABawqQOejIT/uMbH9jxPKXJgRrpnq SJ1CujOSlf+R2xIrYWOJdI43oEcRslP4PK6DqiweRHSjM4A/RpNQmC1Y1r2fL198P/6U F/vs/D8mkenyidfFgxlID7/idRQgD0Bdy51hZuIKtkmUpArg/zEEhgi1I5XnpMsbc72i dQwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mDL97hPk; 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 h22-20020a05620a245600b006fcaf2c9963si7162053qkn.490.2023.01.10.09.51.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 09:51:36 -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=mDL97hPk; 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 1pFIbL-0003m0-T0; Tue, 10 Jan 2023 12:39:55 -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 1pFIb8-0003Xk-D3 for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:42 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFIb3-0001Es-1M for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:41 -0500 Received: by mail-wm1-x335.google.com with SMTP id p3-20020a05600c1d8300b003d9ee5f125bso6022335wms.4 for ; Tue, 10 Jan 2023 09:39:36 -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=43KlQoQXBLFJXtyBavKC5pzx9nNWRWlEnd/bI3W2oJk=; b=mDL97hPkJnvRCtC2YM581jTmbMb0n1wukw6qEdG75WiZwYvGbff+H3/iofSPuRW8nk LncMXlhvgGON4CMgwGK3qTqEJzE+uDBO0dxZynvVNDc6CnLc9rBRRST125AkkFaEkhur J7NgunUo0b1WZE/S1JyjcJHFu1GZqtNbwTImGGuJMTUwwZ54fARmvPGf+HoAmN+ESRPt d0NjmvbMisepPTZI0mMDWzRcVqBxL2Sz1N8CYqdYlPFeU4cM6PIMTgBOkrOYUmJ9UjOz 4Eej2SUuUMXWBZ0HM0VwtaQuHdOn1eZnFicD0KeYpBEK8zc+WoZUvY23+9XtVvkhG2UN cXSg== 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=43KlQoQXBLFJXtyBavKC5pzx9nNWRWlEnd/bI3W2oJk=; b=C6JitlNuqTFEDNrIqQMsf5puslOjy4xWCG+uLyeWUDfJgPcj1Aa2SGeLwbpDBo9d1i uaNFzN7F5EU7s6jSbjWl1YkJg3FLueGE8cb0FYCePcEPuX1qMQ3ScsJ7Tzlh0pF3DQi7 X0S7RUSKM25FL2W+ljKLjV73m8Lz88mAnOyTFR+ldlE06DbhnP0LiIEdkA0eAhykcreB BRycU7FrRdgvF12TljpZFs9EC3AhKUJnwQYios47U8oFVHJdg/IRvNRJrSj1h2yUqs4o 2L+i+bAnDuC+aUwQh1L7S5iuFiIc+a+3vA6GtA2fX2s4JceNVIoi7yUd2N7LT9s4Ux7k wCwg== X-Gm-Message-State: AFqh2kpp8T1lVFKkRogRYEjlm+o6DWKBo+6wCD7E0U8RVjfPfvyLaYOa w1qAXQbDEm4F70HA9iTpMA9hTg== X-Received: by 2002:a05:600c:1ca5:b0:3d1:d746:7bca with SMTP id k37-20020a05600c1ca500b003d1d7467bcamr50160900wms.4.1673372376204; Tue, 10 Jan 2023 09:39:36 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n1-20020a5d67c1000000b002bc7f64efa3sm4617103wrw.29.2023.01.10.09.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:33 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0AC211FFC7; Tue, 10 Jan 2023 17:39:25 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson Subject: [PATCH 16/26] semihosting: add semihosting section to the docs Date: Tue, 10 Jan 2023 17:39:12 +0000 Message-Id: <20230110173922.265055-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.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. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- docs/about/features.rst | 10 ++--- docs/specs/index.rst | 1 + docs/specs/semihosting.rst | 79 ++++++++++++++++++++++++++++++++++++++ qemu-options.hx | 27 +++++-------- 4 files changed, 95 insertions(+), 22 deletions(-) create mode 100644 docs/specs/semihosting.rst diff --git a/docs/about/features.rst b/docs/about/features.rst index 0808c35a4a..aed0f9b9a2 100644 --- a/docs/about/features.rst +++ b/docs/about/features.rst @@ -187,11 +187,11 @@ See `User Mode Emulation` for more details on running in this mode. Semihosting ~~~~~~~~~~~~ -A number of guest architecture support semihosting which provides a -way for guest programs to access the host system though a POSIX-like -system call layer. This has applications for early software bring-up -making it easy for a guest to dump data or read configuration files -before a full operating system is implemented. +A number of guest architecture support :ref:`Semihosting` which +provides a way for guest programs to access the host system though a +POSIX-like system call layer. This has applications for early software +bring-up making it easy for a guest to dump data or read configuration +files before a full operating system is implemented. Some of those guest architectures also support semihosting in user-mode making the testing of "bare-metal" micro-controller code diff --git a/docs/specs/index.rst b/docs/specs/index.rst index a58d9311cb..b46a16b2c8 100644 --- a/docs/specs/index.rst +++ b/docs/specs/index.rst @@ -21,3 +21,4 @@ guest hardware that is specific to QEMU. acpi_erst sev-guest-firmware fw_cfg + semihosting diff --git a/docs/specs/semihosting.rst b/docs/specs/semihosting.rst new file mode 100644 index 0000000000..343eb4bbb3 --- /dev/null +++ b/docs/specs/semihosting.rst @@ -0,0 +1,79 @@ +.. _Semihosting: + +Semihosting +----------- + +Semihosting is a feature provided by a number of guests that allow the +program running on the target to interact with the host system. On +real hardware this is usually provided by a debugger hooked directly +to the system. + +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 a 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. + +.. note:: + QEMU makes an implementation decision to implement all file access + in ``O_BINARY`` mode regardless of the host operating system. 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 3aa3a2f5a3..de3a368f58 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 Tue Jan 10 17:39:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 640876 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2862836pvb; Tue, 10 Jan 2023 10:46:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXtrXwZ4h3oWfqpcjh5IsynGfofPqCZw/Vg4gDg50Que8RcqVKnv5bmfm6qZ+nQmsr8x4K02 X-Received: by 2002:a05:6102:5599:b0:3d0:c0e3:b064 with SMTP id dc25-20020a056102559900b003d0c0e3b064mr4545429vsb.35.1673376374841; Tue, 10 Jan 2023 10:46:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673376374; cv=none; d=google.com; s=arc-20160816; b=gO1ZXPaEg/F59MoD6k/IODJj5DVK6EzXZgPFwUNyoKrxUGZ2dPGFna+z64axNPZh5f +s0TmBNDapQ2ZGTJ7jqDjEcdH32ewRIUb2c9qNZSHuYDqocNZ8IPzIG0uJiO0fdMfJIj jtATx8xuEPI2Bzbke1SCTGMd9e9RiOM+0EpUsHwhczEEa6rAGK9r0TG/pA0panD8an3Z S0EVmKv5QcWEkgsCJXwWZyHC12Rhew3oV5BmUY7x/vzN6djw5VAdB6Itq5VDm7w+ts5T mSDozBod0AWjtqX8vUa+FhDTIywkjogJiM6QSuhYawQBGW0Iw7tlgZiiuerNHeOLrPQi JNwg== 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=yIsF52FPjClqcE3nmE0+0K6eEbvB5425yRMI+7mjkm4=; b=kPQXTBiAVA7ktYBsdy9aQZ68p6WmjaZ02HhBgIjK45B7p3x31Cvtzoz/C5ooVudL8y pXMBBFdvPblnx021eb8dv3T1+3ZgfTu+hNe3jkusU7of5TjYgOm4lIzoKXrxw+KdFDSC iD3cY0u63TQUPAHuTFKFbzSkVS2qs1esgEAqkpURmJ+HwCmDpFadxWtIR2B9TMofjx9G SIei8YTcf4Fk6iy4Sl71oDWfpJSrUedkC5GV8nPW6HGRuIhF9pNo1vMZsjOYEK8FtZvl UxdkWjtsPlxu4Ug0cnCyOqc8A++PewS/BGLH8iZl6pyE864KlViir9VUGPro0Mdf1dbP qY3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RIvNTdt1; 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 t9-20020a05620a450900b006fb33011915si7431814qkp.537.2023.01.10.10.46.14 for ; Tue, 10 Jan 2023 10:46: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=RIvNTdt1; 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 1pFIb4-0003TT-Gp; Tue, 10 Jan 2023 12:39:38 -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 1pFIb3-0003Rw-1P for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:37 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFIaz-0001Fh-G3 for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:36 -0500 Received: by mail-wm1-x32d.google.com with SMTP id l26so9370154wme.5 for ; Tue, 10 Jan 2023 09:39:33 -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=yIsF52FPjClqcE3nmE0+0K6eEbvB5425yRMI+7mjkm4=; b=RIvNTdt1Hy5egpEtuFKGrdFRyZdINZPrDzCqmkXARm6QF34+Yxo3d5VrQq8D1MkN2w tf09flEQOkr9yhLzlyVuoe7oPeQmTHk6YLLyMc1rydbou02StugPfkghWx2YknJMDFkv ovE4XbZ6k9jeKXqyMxqy/kEda42JWAhJaFNscsQJzx0p8BuF42vG2wHHrQCbb1eOmdKO YFcTu3jczqk8Bdjry8zvUatUo0CzmxGM3BIe0rrfgqDY4xwGP/hDlJ6bXlwGhTcwcamc PzY06JOVfwg/rdzdUntH9KS5ifDYnluGqg+M72C1ih9zJmvjVZ0SrKJAJmW03Lt9O/K+ xisw== 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=yIsF52FPjClqcE3nmE0+0K6eEbvB5425yRMI+7mjkm4=; b=Esb18Ct2Y55Ku5YRcwHbcekXMrTm0hw/lCrU8NjGbWRiz9IqvKJ6d31QclYI+8gNMN fZsvWwlcj1W1xDXCX5vvN/j/QTjPBbKOtI3guaok75sCSZUeWDAin+ltJvd0sWh3A5ja ONvOyHWQtx4Q9/xgfzPg9UI9MKyabG/ZcLTqHXmwHrXvl+PRvCxM9beAVlJ3GIZOkRXw FtOuz0w73lZ5p+Ug1gmL30kjaovPli1uW0m9ve8HitGSJejVwhin9RIUbdSodboSHkV8 WHDAAxmsIxR9YHCpJSOcrTQhnmFhBcQbOeMvHZ2QxO2N3hg6v+aJMnW2DnfKXiBSz+Rj +1MA== X-Gm-Message-State: AFqh2ko2FRAdIznFBN87/dqRMKhTXn69awtAzatjCmA0iKEv0vaPD6hx COwbaf9OrSG+VNBIXxsbi6njk7kbUyW6a5jT X-Received: by 2002:a7b:c003:0:b0:3d2:bca5:10a2 with SMTP id c3-20020a7bc003000000b003d2bca510a2mr49675467wmb.22.1673372372105; Tue, 10 Jan 2023 09:39:32 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id u21-20020a7bc055000000b003d9aa76dc6asm23830508wmc.0.2023.01.10.09.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 272A11FFC8; Tue, 10 Jan 2023 17:39:25 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson , Robert Henry , Aaron Lindsay Subject: [PATCH 17/26] tests/tcg: add memory-sve test for aarch64 Date: Tue, 10 Jan 2023 17:39:13 +0000 Message-Id: <20230110173922.265055-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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. Signed-off-by: Alex Bennée Cc: Robert Henry Cc: Aaron Lindsay Reviewed-by: Richard Henderson --- tests/tcg/aarch64/Makefile.softmmu-target | 7 +++++++ tests/tcg/aarch64/system/boot.S | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) 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 Tue Jan 10 17:39:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 640861 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2848355pvb; Tue, 10 Jan 2023 10:13:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXs2YlckNonDY9UdNCoUkOwYhC4ncdO2EtaZUaL6FLNKYsgBtfVa8ubzQqqu9bTU8fWQ1E/R X-Received: by 2002:a81:780b:0:b0:4c5:2d62:96d6 with SMTP id t11-20020a81780b000000b004c52d6296d6mr13405152ywc.44.1673374389538; Tue, 10 Jan 2023 10:13:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673374389; cv=none; d=google.com; s=arc-20160816; b=JhceMJUO0rsS1VfWUJqg5RQBh2AOC092cvAGshtIbxALQ5fQMW9/E4fY/L2a9KROHl P2+p9zioNAirH94AB6n/e2/y+pMRLWbdIC84z7SFIAsj1/lvfj3fl+f49DYkyHsk+2jJ zFVyu9SGqnq8og/AdqwazEXTaKWgX9WoDhTEPNc+oGFrq68IZ1J7YYNjheigCFNDCTRY DcwPOhcTiCHIrZmwS/EIs3hlnF1Nn6kPdCPIXW0Of5IKaKf1tYZVOoA6aLPe2LhOCYg9 S2Zw5PMgkaILQfuUa0K7qt8z5S4S18JPUEEayKiO7nlaCl7BhMh97ZEszkbHa7l4H4vf CnEw== 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=CPdVE2hCd/x5Gl1DBAkwRbdDFsCMANSJgVBRMiSNU68=; b=rToaktrGTrYfPVfMWiFMD9f1iLvS3FyvRUcevXwpNr2Y2OjFMOhb3JKu5IEvnLYTdT 4V29fJMu8XSP4jrJVyY4i+3ioE8SywgDXxbMVJ4TOjDyt01NLLQGN7LCfA26yCvOylrB OWHtdy9TyzafTC2mJufw0t6Weld1hWmD4t8h43WVqN48O8lkdppzI56sh3vhw+Ck6G5B I1TxYqI4UylICME08rU7Bf2fPsqTr6ini+cjbatdaF/vRUjfOiMVNQ9tjRV/hY3M47Xo Tbxtpuo2cmwbx7SPc3YGJrdK/vAAj64aJkTdyxl+evDhn6FuAL6wDWJorXI1ouRprMld 6oLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Bsex59+y; 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 dv8-20020a05620a1b8800b00705b49de404si3978522qkb.675.2023.01.10.10.13.09 for ; Tue, 10 Jan 2023 10:13:09 -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=Bsex59+y; 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 1pFIb7-0003XU-L2; Tue, 10 Jan 2023 12:39:41 -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 1pFIb5-0003Uh-2U for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:39 -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 1pFIb0-0001Dp-Uf for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:38 -0500 Received: by mail-wr1-x431.google.com with SMTP id bn26so12618214wrb.0 for ; Tue, 10 Jan 2023 09:39:34 -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=CPdVE2hCd/x5Gl1DBAkwRbdDFsCMANSJgVBRMiSNU68=; b=Bsex59+yEYVB/GABeTSnBAQEghj28lXiJ0latzWwi6j4CigPrKz3uIF7jmGPFv/Gpm oWYDqR4M/UZqXEMRcFlsf/u4UHH0RHyj1dgsambVht3UnsavC9IIsvrLLrgg9OYJabtj /ZxIhIdr/NBBk8QrVrsnz39qSQweYFcnvqXyFf/4NVXNpbcHo+1V25TN3ukUDivCnNSe 3eesdanScDDznpyMs7uDzHetsPXiIutyQ4rlWHqsYF7VsjfouWjjNghQA2bH9yPNgcyw sPuBN7FGFfMc0xp/Mzz1GRUzUyLAvYXoRe6pz5id3aQIQ5ulT+ATjh907KadRU8lX++p ae/g== 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=CPdVE2hCd/x5Gl1DBAkwRbdDFsCMANSJgVBRMiSNU68=; b=4qDFHV/ifnzmRkLbDYv02fROamgBApvYHT2VMYdeSJlIw4DaR+RnJ1XFwChycndsDJ l1K//w5fb4P/zo8Gapis5AayYuVbu/4S8Hiq0yHl3MOMf8knrJoMuFuWkhIC9qBENEmc PmSSbKXwJNNBv+mSPd9V/zfxCMidfeRI5R8tDI/FSRX+LUJUhwD5lNlcNnnlyvVm/OVg bUuDvnUeeGqUaXaqDjTt3m/r7S3oyMGEb8rJDqCtD6Zy/0tI65yCdhO2VI+BI284/3+B xggjCa0jqxojtSP57YkAWJB3BTp4CTUNLg/4d/nx+4Nwh9RBzUbGHcS8R9qhKrNIBY6l V8og== X-Gm-Message-State: AFqh2krWYJ39zuNFP9mOGv9/dnHTDjTDqzksYFsU8MS2d8htV6kCEvqV GvND4i61iuaYDrKflc9+KnFPgw== X-Received: by 2002:a5d:5707:0:b0:2b9:d6ba:21f1 with SMTP id a7-20020a5d5707000000b002b9d6ba21f1mr12188374wrv.21.1673372374149; Tue, 10 Jan 2023 09:39:34 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j15-20020a5d452f000000b0028f9132e9ddsm11737129wra.39.2023.01.10.09.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:32 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 45F431FFC9; Tue, 10 Jan 2023 17:39:25 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson , Emilio Cota Subject: [PATCH 18/26] cpu: free cpu->tb_jmp_cache with RCU Date: Tue, 10 Jan 2023 17:39:14 +0000 Message-Id: <20230110173922.265055-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-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 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 Message-Id: <20230109224954.161672-2-cota@braap.org> Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- accel/tcg/tb-jmp-cache.h | 1 + accel/tcg/cpu-exec.c | 3 +-- cpu.c | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) 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 356fe348de..6bd29227f3 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 Tue Jan 10 17:39:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 640877 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2863404pvb; Tue, 10 Jan 2023 10:47:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXt/Hlp6tj9FJXZF5He6IUtGtjjijPxT4NMA8yB6FXUYqUI3Td0PVAWV1GEcPRyVemXJEF1c X-Received: by 2002:a05:622a:22a3:b0:3a9:6b48:a13c with SMTP id ay35-20020a05622a22a300b003a96b48a13cmr94066061qtb.51.1673376453543; Tue, 10 Jan 2023 10:47:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673376453; cv=none; d=google.com; s=arc-20160816; b=FPVFPHBZsiqwyTaKVXmEUmfFvhndgnhHIEsewC40lGEpywFfcH2NtgyMk0ofM9fdRJ WUh7Y9Q2yaCk27fGFJsbRNmYw/RHXOpZLYbHx3N2iIpuI6zAT4hpfr/dePLen1s1A507 qnODy2K/u3OyuYG/g4SEML+FeeyHwVw1uZEvukd6cbYwn9JvZgv2dt3lt35zAAryQimo SGowkMYPagAC6923++oBYWdUsom+1DWOKN2Q6+SVEjS+HnPgFEeUgJ3lXADJ3t+omjTn RWa0hjY10f5flH1t2XowQXRcRiUB8UMFI6lSsmH+MUxRpQSff/EicxteOG7MjxrlGFE9 LuYQ== 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=MXFxyJRI2iR/xunMULJui4KM0BQsyU2Vc+mAIPXoOSM=; b=f6z1DEYCFNp1qot+/qJWxiijBbTKC5OV0rvcnIUYnXXqu4+MZ3Yn9c0s4Gbt7lB3pF v0jQuR9mIrXavb9jMLL7hrnGZITP/1Sf2G7bNqW4XFM9DYzYowKotbHsF/6stalfKS67 N2Dl1BkiAk7T6jmeYPg+DGrfISz+hPGh/etDISGFcFV00emz+kpL1XCBHj5R3JSDkL0S ZqYsMY4pWiHfPT7W0wTVq+Zvg2JVLCTeS7CMpbfol09vuqrNxEDv9yiaDcYLdxag3+I9 fFss1ltVM8QZRjUZQSG7PTIDqoOn2yK/zHsSbdzGLjwO1dKpYFiNgnehnweTRr4zFU9R SA+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q9FXpp+L; 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 w10-20020ac8718a000000b003a691a3eebesi6567130qto.257.2023.01.10.10.47.33 for ; Tue, 10 Jan 2023 10:47: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=Q9FXpp+L; 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 1pFIb7-0003Wt-3L; Tue, 10 Jan 2023 12:39:41 -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 1pFIb4-0003UX-V7 for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:38 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFIb1-0001Gh-5H for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:38 -0500 Received: by mail-wr1-x430.google.com with SMTP id v2so1584590wrw.10 for ; Tue, 10 Jan 2023 09:39:34 -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=MXFxyJRI2iR/xunMULJui4KM0BQsyU2Vc+mAIPXoOSM=; b=Q9FXpp+LMQLJXSxBjuap6LoOG11HDSKTDs6+gotY7/qiJySt0pxepIoHKpTXpHATP3 GIhv1cqEb5DmeWuCJY8rMbHJLGYDwiR2f1QSRSYmvRVqDd9vuy0jpBQarZs9y08S6Yq5 IkUOnHntASQRzK7T6vy6Y/WdZodftWcE1BoBguvw2r+qHCMxj61U5gYbZpA5MNMwfjGe Ib1obRxtofIpx+AxcsOO9ClJk9TyZfehlgsBX2uaNWM+sPewF406WU7z/L18vSBupsGm 8460NuVzrAG3yYegyMpNxDbusLAs+E++okQIwz1/8+bbezPGlVHq/mjCwsf3Vx5VyAX2 R7tg== 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=MXFxyJRI2iR/xunMULJui4KM0BQsyU2Vc+mAIPXoOSM=; b=dhbfIqKdLWEOrSQGMWnegzVwrQgXYg6IjLkJDwXxd1zzqevas0JWRUtCF4G7u2iRF1 fs7kfNpqIgrbhkJpE0CtxW4CTu8+rOJvF9gKH66ZF6bNmr9mrmV48wscwrGD3nfrr4Ev 22RBibncg09dC3hCTZbOIGCbvIOuhlaJsFZAGIqVRQIzwV1iBF8bDQELbBakfLYOaE0p zQDSPVbxzPT54PZZu6I8y4GiEhf/nBSvDgZKm7R8pgOFKVSjBZCI+wmwhQS44YH/o+AS E1Mn9Gg/b8oY8EIS2NNKx8pCAb+PbZEgR5+QaiwehdyHoGEN4KQ2xqllygwB6fE7bxaC aDkA== X-Gm-Message-State: AFqh2kqjk+YTsxmUQT9OTsXi4ctefxz7ybmIsBKYqQS+mHgAUjKMvGpH xdlJqcXZZEhCjlIvInbaR1lGlQ== X-Received: by 2002:a05:6000:705:b0:273:7d1b:7337 with SMTP id bs5-20020a056000070500b002737d1b7337mr40397725wrb.7.1673372373543; Tue, 10 Jan 2023 09:39:33 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id r10-20020adfda4a000000b0029a06f11022sm11796931wrl.112.2023.01.10.09.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:32 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5EBC61FFBB; Tue, 10 Jan 2023 17:39:25 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson , Emilio Cota Subject: [PATCH 19/26] util/qht: add missing atomic_set(hashes[i]) Date: Tue, 10 Jan 2023 17:39:15 +0000 Message-Id: <20230110173922.265055-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: 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é Signed-off-by: Emilio Cota Reviewed-by: Alex Bennée Message-Id: <20230109224954.161672-3-cota@braap.org> Signed-off-by: Alex Bennée --- util/qht.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Tue Jan 10 17:39: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: 640887 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2876781pvb; Tue, 10 Jan 2023 11:15:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXunSziiRO7EhKHPE9oaCXDeTVZ33GQYuRsLQtqMqj8x5u3a7IOfSKfjNWJbd9120Rh6Vs21 X-Received: by 2002:a05:622a:5c8a:b0:3a9:6ff5:e6b1 with SMTP id ge10-20020a05622a5c8a00b003a96ff5e6b1mr93418678qtb.28.1673378146429; Tue, 10 Jan 2023 11:15:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673378146; cv=none; d=google.com; s=arc-20160816; b=jRVZ5GTgPkyLNI9dQm1t/4wNJwfD2eovtPStmSJAj6HGNlDYOQYKeHVCohg66B7/If F+dTpomq3pS+k1GOtAC+vQ2AO9v/+jiJznA5QME6+8v8g+P2l9PRvGTMwk7dU54exf6g 1NkQiAC063NYXA4OW6oNMWCZ3qE/BbpYA7SEz6Da14Oxgm8jeqtZArT6egptGNHcZ6ye Gq/f9VS1WNtqRNtFt6tajqSrKfhTNhm/R7E5xpepU/Ek3DfYejafJdobMjIZvibPsbH7 0YiXUL7R41FaC6ZdwGeIhE3hGCeUSXAlq6Ixh87VyXcOGFTH0Vg60xLDYomoYJor24Sd FUpQ== 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=ycgI82N5PiT9dD2l3RH+0isxFtJNAT6vrCry8xsNvlY=; b=oXGBa4KigF88P/mnCutz4bOhvHhSMXhKaozgIdBFhPcdACmtS70gvL9YwTnl78V47G g4aHDcv0vx8iQ3hVfTGgJTqenc0mNuLredHAXgEsQvgaqHFp9TdgG4xvi8E2NA/tmYa2 IqVotpb1InqT2EhOIT0ukvD3i6bEIlJJxs+UpVarW2OaAUEYNagQZA1hAt7mrVrGrTIJ EjBkM4AVwCM4QiiFieoa/4U6DxumW4siCHHh3vmrA2JTKwfWFSerLWypTN3RVyP5nRdS kUyWsrd0Qp2isO/PfNksBGdl36sizP1ZRqAuCWWMoZoRPYdh7sPL6p89Dk3XAuOujgrJ 2Gag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Me7VTXhU; 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 h20-20020ac85054000000b003a9926a4105si6482528qtm.268.2023.01.10.11.15.46 for ; Tue, 10 Jan 2023 11:15:46 -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=Me7VTXhU; 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 1pFIbH-0003go-6k; Tue, 10 Jan 2023 12:39:51 -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 1pFIb9-0003Zj-KJ for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:43 -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 1pFIb4-0001Cn-B1 for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:43 -0500 Received: by mail-wm1-x334.google.com with SMTP id o15so9366428wmr.4 for ; Tue, 10 Jan 2023 09:39:37 -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=ycgI82N5PiT9dD2l3RH+0isxFtJNAT6vrCry8xsNvlY=; b=Me7VTXhUqyjA3vz7jjuLGZQGRlNGlVASOmSYtRh3NVlIzXgXWIe572f2gsg/Ey6I/5 1rOOPiTOC+cwDdraS8cqVmfNU6m+kLHaS7uovsTZ0gfzK/ScGulzlMk3s5cbYcRLFA3C LrpUKUSfsBNczhH9OrvTxAYykWxpcX8WgHA4k724A9nv9Ur/CfeXfILWSYUO9v1VmXur YptsnJjuozPEXXPuMcRZJg+6kKd5paLb4V7xfBL3eugya7lSH+Nbww6mQwVXbsBEfIjz jpF00pWhjLK6W4cn6YWWHe+Rtj8aQn7yrKV1eCBJdW6xK2Ue63jZDO1hO0udsnEaCc+D lGkA== 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=ycgI82N5PiT9dD2l3RH+0isxFtJNAT6vrCry8xsNvlY=; b=RjT8w8BhEEO/1dkkUGinfYxSC1fRZm8ADvcUDl0IBsias2WiiNZh6rFa3zK7neaDHf PIde7ESbI2oQwM67R/qCEet6UuS+Po26I9+acz3q2umDBlFGYMFL5AJ3WRe3Wiquogj/ wTcTqi/uvPwRkdDt2yrzPQLN5TCiRpGs4zPeFU8QwvggdM70o8aWh5S2Am6BWSn48SF2 JvAxS9M+5yVfVqDMtOPBDXpdw+WJg9ZjzLofpKEt4Axib4h8v3EGa7Gozjq251xPOwdF yLgrFc9lFjaex9XudjOIDUXImcsIY60irVteFc+X/GdW4QNeOvnFShPo/v0/Qd8mW7ik RwJA== X-Gm-Message-State: AFqh2kq9XENvmRKJsd3kGEsNrf5Go3nhj2ikLqkzw2wbN1HMMg+NHfMu 8cS1CXyVb/5+/syRZNhq7DVEbA== X-Received: by 2002:a05:600c:4f8a:b0:3d9:f559:1f7e with SMTP id n10-20020a05600c4f8a00b003d9f5591f7emr4810385wmq.20.1673372377613; Tue, 10 Jan 2023 09:39:37 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id r126-20020a1c2b84000000b003d35c845cbbsm19782463wmr.21.2023.01.10.09.39.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:36 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7728F1FFCA; Tue, 10 Jan 2023 17:39:25 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson , Emilio Cota Subject: [PATCH 20/26] thread: de-const qemu_spin_destroy Date: Tue, 10 Jan 2023 17:39:16 +0000 Message-Id: <20230110173922.265055-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-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 From: Emilio Cota Signed-off-by: Emilio Cota Reviewed-by: Alex Bennée Message-Id: <20230109224954.161672-4-cota@braap.org> Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- include/qemu/thread.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 Tue Jan 10 17:39: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: 640860 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2841006pvb; Tue, 10 Jan 2023 10:01:01 -0800 (PST) X-Google-Smtp-Source: AMrXdXsMDxqkFZHb+dKso2VviTnuceNjtLSgLf0AK1VD0YLoYycxp9ia4aFsu2FhJqbgvQ048fKL X-Received: by 2002:a05:6214:5c87:b0:530:49c2:a82d with SMTP id lj7-20020a0562145c8700b0053049c2a82dmr84402988qvb.47.1673373661254; Tue, 10 Jan 2023 10:01:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673373661; cv=none; d=google.com; s=arc-20160816; b=svhs4CBr8aK8eGVU2+yA/P+0lJzijV39nU0pECeY4QdLAUQ49+cC4tkU3QLbR9eB9b GNV5wabAAFUglW5aAPTylj1SJ+7YmXRV/YPwH+PWi5RmdzpaQ7Z5y04AivoxamF1aY4N lxVv2EBFSE1YneSNdWVfyRw2N8kqOrX+oA6L8fkcmazS//o9MjmdFezwsPxh5MLWaWbD mq5zOXLK/J1Sh6nZChAU8xyJl8LlGFW5dNlBZMW0rjr31+wE9ML7ve4xncOFHJcWZMKH XGxfMLnbTBZAD/FDPGSTcki9cU3UJQX0TDCDqAv+NXNbr8CImAg9d4WwSCZCA0eA8HZc hngg== 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=tCSYuUQFnD9WbSEOgb7JLPY0DO9hu2HuwmH47Lo0kVI=; b=kZ6vN7+CpWfsNqUoe9y4Zso3Gdd80ynXgpzmm1342bZIsd5+ghJ/rw/87gvCgqIufZ 35YTqs2Sv72eZHAOc91J0iuhXfH6plDrc5D4aZk5qL/2RG/c30VQ93OL7dN5xFbcXLK4 PPrtFvoSIhWiPKhXhheZ95BRU+A29XhqH4r5iDsnB4ss7drOOoSiRKaSRdH8/LQq6A0w P+0aCHoTLvUaFKs+xoGb3kdYIfp4OCMzZI/ojfDorOegr/roOezY1c0kogGxOhMCE4If 24vC3h22ufT9DwfQICJmVSMOd9m9TJtPztmo7m0t/IvUd6vMMOL28ceU/XK5X02IsIYN P2MA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=X9PPuyPP; 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 hr8-20020a05621423c800b005321000748csi7021711qvb.209.2023.01.10.10.01.01 for ; Tue, 10 Jan 2023 10:01:01 -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=X9PPuyPP; 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 1pFIbK-0003kl-O4; Tue, 10 Jan 2023 12:39:54 -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 1pFIbB-0003cB-DW for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:45 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFIb5-0001Jz-TK for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:45 -0500 Received: by mail-wr1-x42e.google.com with SMTP id e3so3373244wru.13 for ; Tue, 10 Jan 2023 09:39:39 -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=tCSYuUQFnD9WbSEOgb7JLPY0DO9hu2HuwmH47Lo0kVI=; b=X9PPuyPPu5k1k2qVm1AUPkBg4zkG+u3olqrnr73Erub5Lcwl0hMjwOYDwsY3rWhO9f +BlD8KVUigcHuo2N3eiHcbxwKdDo9DLCaS3TGP41JGgm0+sxk4KWDg/VOlh3QbkjMi9j mKJCx0tlzUB1/0vsLJRLJu96rtBS4bXypkr8MW43P0aS0tElkFMeqrp3oMmoCTFrD86D 32OPmSEVlfAWC9yAeudAs209/9S+9C35OiES7ToTscXedHIN5PJwjfImtpc0/OAAOHXC xwBH9bBrx+IWigwG7cVR8XTZTi7JH4ajBcJfyzUhhsY6dSsfHyJ59gvDdFz1NCeR/Bh9 8NRA== 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=tCSYuUQFnD9WbSEOgb7JLPY0DO9hu2HuwmH47Lo0kVI=; b=w2mKAQihy+F1SCTeC/fg0rG+TvfquAKQg3LLlS+NPM4s6lsw8fY8Rdnkuh/nxzKBWT Vaq49IVVzsgSsgZUL0iO0Bl8aL5M2ymKXQPa0J9Nng2NZS/FDgLuL4TcEbwXCT4O8Ti6 BwsZ3rKsItGTE5KejvYG3SiYWAddCphFhc2o3IBQBfROOplRYH+TMmsrswMnwaOeVCSM TKKByUAWKVwZbhh4b7N23ndeQVoaN7B03/HP740M7CRnDFKeJ0JkXJlAt0KWMwrNP8yq 1/MWKehEmBeGxLDBJ8Y7V/R3a4chNJRgNJUA6/PHnsqwG3u2/FUVc5noI0VpvO6UCRDc 0jsg== X-Gm-Message-State: AFqh2kpnxn4Nzqy7E3vqxxGeqewbmoZunZNX+rOodyFXqf6NdAhnRW/I SEd4J5i6vXjH5RXoTH+msN+HyA== X-Received: by 2002:a5d:6250:0:b0:268:885:bd87 with SMTP id m16-20020a5d6250000000b002680885bd87mr42586449wrv.37.1673372378353; Tue, 10 Jan 2023 09:39:38 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id ay13-20020a05600c1e0d00b003d34faca949sm15829756wmb.39.2023.01.10.09.39.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:36 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 90E411FFCB; Tue, 10 Jan 2023 17:39:25 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson , Emilio Cota Subject: [PATCH 21/26] util/qht: use striped locks under TSAN Date: Tue, 10 Jan 2023 17:39:17 +0000 Message-Id: <20230110173922.265055-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: 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 Message-Id: <20230109224954.161672-5-cota@braap.org> Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- util/qht.c | 101 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 87 insertions(+), 14 deletions(-) diff --git a/util/qht.c b/util/qht.c index 15866299e6..70cc733d5d 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,62 @@ 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(const 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]); + } +#else + func(&b->lock); +#endif +} + +static inline void qht_bucket_lock_destroy(const struct qht_map *map, + struct qht_bucket *b) +{ + qht_do_if_first_in_stripe(map, b, qemu_spin_destroy); +} + +static inline void qht_bucket_lock_do(const 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]); +#else + func(&b->lock); +#endif +} + +static inline void qht_bucket_lock(const struct qht_map *map, + struct qht_bucket *b) +{ + qht_bucket_lock_do(map, b, qemu_spin_lock); +} + +static inline void qht_bucket_unlock(const 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 +322,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 +333,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 +380,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 +394,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 +417,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(const 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 +437,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 +463,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 +711,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 +822,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 Tue Jan 10 17:39: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: 640864 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2849389pvb; Tue, 10 Jan 2023 10:15:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXvmkc5C9BkMhrvglD94qTYGBJxK42epxx/86X0bF+vWfRaiZcio5vx4pV6IWahHWhjbO4x3 X-Received: by 2002:a1f:2110:0:b0:3da:e00d:44 with SMTP id h16-20020a1f2110000000b003dae00d0044mr1796028vkh.4.1673374515455; Tue, 10 Jan 2023 10:15:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673374515; cv=none; d=google.com; s=arc-20160816; b=iwxmU7cLldCiSBQs/M2zp2RHXXMUkyFmb6qBoxKH4kr9ssJbeabEoZDtCIqD6yGLH/ VA7cxZkst1qdpXG1U0/V0FB1hm11y0YtRjc9EuYo27bO05ODVn57wa3zhvt56yrCRN2m eAfWvIb6Lp8M7LT+ip3afBQa01DntiQHJCMYuI81Ff1+8mF27x5eHhjW0IOfjHL8p5Ky TanIwVjdsJRVhuZl7puMSgiiZ8AqQDDV6dHqbDJGk8/poKT7Zl/q10zGRPzEex/U2Kk3 SKn0VDh/sc9qr6pJnkO/yB6P88fnhMDfL+Q9KZLWzeU8Qn3HziUov3UeuUgtSBIH5z46 l5+A== 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=nybovEkM2L6vVZDAOSUOuJJ5Ue1JCC8gNJeG8SzKrzg=; b=veXZMCiY5bioA+vMJsno0D0tPqG5EcZYimBJjdMiXTmGYV4UBYz0qglFuksz1Gz8F/ InS8p+wxeJ57Q0DSzI9gvfcQEkqyDIriFaQfg82ovBKsO7+oIcRa7DxLRwUGaS30kRZ1 DsY3jj33K+q5RydT/d2u6kv97OVTjRv3yCiU4VFoOzyb+ZxuNBLHe+bTLKFLyux9MMRx UTmrCdab7AxlCtLgrI7RMAFS/4JgrdmmF+r/QROvvv2NjvasPbQ9dserAs7YyD1b6AvV RL5NMOdKXQopFEta97eLNmaFyKccSIrm4uamGWNimmnrIsJ26lGzHFZYCUl70QVWAK6K 3FXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KK0BPeJP; 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 d194-20020ae9efcb000000b006ffa0ea866esi2558186qkg.652.2023.01.10.10.15.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 10:15: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=KK0BPeJP; 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 1pFIiF-00072o-5x; Tue, 10 Jan 2023 12:47: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 1pFIiE-00072M-BP for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:47:02 -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 1pFIiC-0003aU-JU for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:47:01 -0500 Received: by mail-wm1-x334.google.com with SMTP id ay40so9398088wmb.2 for ; Tue, 10 Jan 2023 09:47: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=nybovEkM2L6vVZDAOSUOuJJ5Ue1JCC8gNJeG8SzKrzg=; b=KK0BPeJPvh1EOZwTaGsf0twlZy82yJehMBXjXI5cNFQ8Ven9nlLneTLYrMoszY1oVi J9iNoMdZYN5Rg0pTRlLye+FYtZLVQYXvpmT5q8q9ZJGqM9hN8i7bnpFiBKtel/EhaCeE uE1lfynW2GfXxOSBLI6uE0kTQWDDMWby6fS8keC1wn8xeqR77w93ZNCnHcPEAoaSiBJj WEXZCR6InO0CzcPnbgGm3y/vlaQhadcg8Q1ZME9qh4IYjPuUp2mof2SZltVFd7VeknZ/ fto0NhTsu4FY0Wky578yz2Q7W1WkYSo2w99MfElL7vpT/thLjXMW/cPRvOqagdxB2NCP Kx4Q== 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=nybovEkM2L6vVZDAOSUOuJJ5Ue1JCC8gNJeG8SzKrzg=; b=bYoDfUiz5FmECDDTR9Sh7FqzYLh3zAzkMs2NyPqcmlaYGoAdg9prQwvEPHxUAsTQUZ tGYlOiw/t+6BlFyIC8BK03Q2I4aP27SiWKL64inobFQfEgfMF6lcZo9gOScxPePxWP+s ljflWXfR41yCErKu/UdCkblju6NLMKYqp8KltPlLzdYOsX7s+a+hqJD/WVaqQkrgxQrp ZwfJibTwBNClnQgEd0jSAWz7F+iy4uziuPjD9oogtZU36OpDCWjv8BidTBcjn+u1rXB1 9CbRernyLkL14Bzdwingtw6HSV6KmAahX5BYp6iChV8jkderCVjbBGX/J5PLcYGORvjD NDCw== X-Gm-Message-State: AFqh2koQhzHdNlBx39ykHMctQ1oxZvNLoQB3SEcV3hUyDe+es7gQHpX7 HDJ219i/5nE7EOtSX5ZL+Js4Fg== X-Received: by 2002:a05:600c:2247:b0:3d3:4b1a:6ff9 with SMTP id a7-20020a05600c224700b003d34b1a6ff9mr50504276wmm.26.1673372819079; Tue, 10 Jan 2023 09:46:59 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id s23-20020a1cf217000000b003d1e3b1624dsm20185141wmc.2.2023.01.10.09.46.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:46:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A9AAC1FFCC; Tue, 10 Jan 2023 17:39:25 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson , Emilio Cota Subject: [PATCH 22/26] plugins: make qemu_plugin_user_exit's locking order consistent with fork_start's Date: Tue, 10 Jan 2023 17:39:18 +0000 Message-Id: <20230110173922.265055-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-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 From: Emilio Cota To fix potential deadlocks as reported by tsan. Reviewed-by: Richard Henderson Signed-off-by: Emilio Cota Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230109224954.161672-6-cota@braap.org> Signed-off-by: Alex Bennée --- plugins/core.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) 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 Tue Jan 10 17:39: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: 640866 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2849968pvb; Tue, 10 Jan 2023 10:16:20 -0800 (PST) X-Google-Smtp-Source: AMrXdXv1ZwYx6G26tZbMZwT1jSAQ6krIHB8VMJ7CSrTJNdcmmwLuwO7p37WztIY5HnIAz5IhKw09 X-Received: by 2002:a0c:f204:0:b0:532:1fff:d170 with SMTP id h4-20020a0cf204000000b005321fffd170mr24725437qvk.11.1673374580202; Tue, 10 Jan 2023 10:16:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673374580; cv=none; d=google.com; s=arc-20160816; b=F+p3I1FAKxK/m4zvp+5pRGmbppKlLGaWI+AiJPd0sYvrbkIj97DUeBIbwWn41YV4ME 7ILzPKTTKK2LQgEk0uqUwO+Zv4wteFhlMqo+1GsRwLLq7J1kV37HCtjZTz523PgfwY+l 2fzhvfexjiY9+A8iJCKulYCyzKi4za+nKSsdw16yZQzWMVpdq0gfmxZec7CeHsBIP6NA v/jBCS/kZeCFqTkb7f0/ONChxfGTAdxAn7n5JOaTVYBSl/8VfAT8CobrjTkwotRSq03e /Wz/klSKyQB/IVeCcD70QJFt551hrXiXgjeALZNiHwNrqYGE7LRVJM++ntZ7bFnm5JvW Tsow== 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=Kicu2o7DliK9NIrjxHX2SYsQRxeUGLNQgh1V/I/tfuk=; b=DbsNfzKc5GiLTdIjPTKBcAApewM5tkfx21aL+dc6lqYZnk5M2aOqWxfWQz3X+HP0uH 4ZoqlhDS9AMfvAWfzUW/1wnAX1aRBGggLH8ruLgEe0c72lsLwGGYdYK/6wDYtmTmfts9 ngmrsPneow6UqAOGdl5J2D+BjFKagRBVnwkMqd38+6SpW1zTNxgjBuQx/2XA3g67o/mY g4fwAUktCXoWLPrX8TtO8o6P7pKLtiRXNTGcIXJMQ93wYK0JHM1oGVp6rVcQHKclmcAJ 02UHMx6cqC1iAbWyihfvO8WVjw0wCtPVcmB0qme5nYR84DI1niGK4TcjqPkzz3U7C4Em 5wxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=v9pZScaX; 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 jv6-20020a05621429e600b004c696df49d2si6534349qvb.66.2023.01.10.10.16.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 10:16:20 -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=v9pZScaX; 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 1pFIbB-0003by-ER; Tue, 10 Jan 2023 12:39:45 -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 1pFIb8-0003Xt-Hx for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:42 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFIb3-0001FA-DK for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:42 -0500 Received: by mail-wm1-x32c.google.com with SMTP id i17-20020a05600c355100b003d99434b1cfso10710559wmq.1 for ; Tue, 10 Jan 2023 09:39:36 -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=Kicu2o7DliK9NIrjxHX2SYsQRxeUGLNQgh1V/I/tfuk=; b=v9pZScaXYw5pWWMxBkvH94FPLOVUQwV2i2FdnAlbEv/tdMTUn8XNz9dxUuzoZ6dShc Q1SAdOQoS2V1ai6HtomZFMqyizFAUqzusgS5/I27a/e2mCUFAmuIg7pp5gGkCXOKdJFI krzR1ISCPTZK5R/JdeQhmwYPjtR9OWOf5TmhjV48Veu5NNF+NP9uKUL9F/8o3fousDOI EcD2F5KgMu9u999Ws5FZfDmgtjWXXKQdOc6qhPv3c73tlJXWdQP5QRw7H55o/AiA4eAF +dy6ACBmD0m8256MgnwX9Z8N7EdVLH77BwIYWLW5k5vA0XnqRNgkTUqv59mIg9T5VdxH 9KhQ== 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=Kicu2o7DliK9NIrjxHX2SYsQRxeUGLNQgh1V/I/tfuk=; b=YYO9JwIpjC9FPjZVmH8jL6ptN0iEFg7lO1cbRpsjDcwQGrK7y7gghe/Gp9hcuQo/Vb nonmTJK4l0vmruKuPhvE6Prx46Gg0pVLRq3dcnvOaS7XsnNxLLm45LxhlWuwTMDF6Jiq tkShsQbaUXFvaN705L3almLPnUn7ZvxE6h3b2+cNajARULVH7LiTxWtZ9LevQeTUCQuT pWR9K6LZeaWm9aMu9gXzjg/lhMr8qGYiRsZqelNwYZ85vvOiVUbY3cqDhmTel+xeuXgp LAdl1a7VY2m1xPu2gAMFycen0yQeU92EZH/OJTfa5NPbiUY+1MKLjTkOmrl5gaT368CQ yKmA== X-Gm-Message-State: AFqh2krVEWBm8j51CUlC7JTkRrL/MPFMsajF8hXBekB0RT3x5OzJupE3 5bzGM4FR0Pf371YMI3exTY3UdUi3CkptzQXu X-Received: by 2002:a05:600c:18a1:b0:3d2:3ec4:7eed with SMTP id x33-20020a05600c18a100b003d23ec47eedmr53404540wmp.10.1673372376666; Tue, 10 Jan 2023 09:39:36 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id i8-20020a1c5408000000b003da065105c9sm13487wmb.40.2023.01.10.09.39.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:36 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C82001FFB8; Tue, 10 Jan 2023 17:39:25 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson , Emilio Cota Subject: [PATCH 23/26] plugins: fix optimization in plugin_gen_disable_mem_helpers Date: Tue, 10 Jan 2023 17:39:19 +0000 Message-Id: <20230110173922.265055-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: 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 --- include/qemu/plugin.h | 7 +++++++ accel/tcg/plugin-gen.c | 26 ++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) 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 Tue Jan 10 17:39: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: 640881 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2871715pvb; Tue, 10 Jan 2023 11:04:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXtY1eSuheLjSuebIX+xKwonjJimQ3yWBwWVaKgWal4odjWXSOR/V+TD74efTZXN42xQZS9J X-Received: by 2002:a81:a43:0:b0:4c2:1fc5:1e96 with SMTP id 64-20020a810a43000000b004c21fc51e96mr16170161ywk.8.1673377496089; Tue, 10 Jan 2023 11:04:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673377496; cv=none; d=google.com; s=arc-20160816; b=0Bm9TAvxxRYaHZWjTg/DnercOs02NhaTdVmDGlZNzrpd/OEBYMhZOF+HdVv7RFu48d 8UP1ev1oDxe67ISFzgvd05xU5WekBFvJJ0uihSbo5XHOVeuT8WuA8LwOSKnEy8+axW1P jT44lJfD+I463UnoeJpFxLcV31uR1hgHROfpzvBY74JYp47hheIaRW+abz7PuTAPa3Ah S2GJQ+Hi7TpjNyY97egU2xJZmvcmjiymtS6el0YS2OrdPV8JpLmOGYoEDWIsSlI1GI7q GqBnzovEx2DY/wXKoGIhJuANMXQxLAwEGrrEB70DqihYoNhKogNF1erMOgMpoad17kye vxVw== 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=hF/3DoG9owY2pD8TEHjkZ0ZRm2+7IOUIANxR5871mgM=; b=zikBDru5AKvj2a8ReHvzkkn4dSCdycYhuCkhpoODRJHv1j/UQAj8lhKkZlWGPvc/Nr Ly4QcjXpA3/p4Oo+gT6wEsVUzdrrOv8WADHiRzjpivv2xRkjNKuIKjNZ5sFxvA44DHRI vh/DXxEQ/9W4ZpoA4UaTPjIfsiwidd15ff1+qAYaE5rpfCy+2/BtDu0AOBpUPw+9acJO Hy8/41U/Fn5M/ubsUVP+UFKxN96VivWA+6cO4PqYyRw3fzrC1YS0kEwHecXJF6FD5K2t +QbDVDLGI0EeCkIKaDgwZZsBmTxHk4ZwcjaoSfcYnwRZSn3kxv3z+D/5KZr3ESKWQ7CC KLeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GldqPs40; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k5-20020a05620a414500b006ed88c5e84asi7525583qko.228.2023.01.10.11.04.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 11:04:56 -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=GldqPs40; 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 1pFIbN-0003nD-Du; Tue, 10 Jan 2023 12:39:57 -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 1pFIb9-0003Zb-Fr for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:43 -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 1pFIb4-0001FK-02 for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:43 -0500 Received: by mail-wm1-x336.google.com with SMTP id k26-20020a05600c1c9a00b003d972646a7dso12506074wms.5 for ; Tue, 10 Jan 2023 09:39:37 -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=hF/3DoG9owY2pD8TEHjkZ0ZRm2+7IOUIANxR5871mgM=; b=GldqPs404+eL0NDoRaW6NC1GQgQQDsnqVKpLVsodyTn9cw0oLXa3XX12eZtNIu0rmx 0RM44NfM+JwUhWs3Ivkwq72EIaWrz2CZZB5eh4QiSe4xoiKBAOzmw8tnWbOJKLAu0yEL 6anRTGXbhJbb4YqCPau8UiQRRgHIt/lih3ojGnid048kLj5P/5kUaGHlygoPHCpowUsc nNybVQLGxqWDD08meEaJgGbjKDR/ahsa7hWEuFK3q7s/60qZrM8dtM4RZII7N/0gJfPC VYkCxSOBMwEjghDisRqqxBwAPZJRd/JFCJkCKe/pkz0X6WahBPaDHT+4rXe5hLn3bssE 3Tgg== 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=hF/3DoG9owY2pD8TEHjkZ0ZRm2+7IOUIANxR5871mgM=; b=tdn+ryAORBGqB187GLt2mDebj7h6nsYu4zQlf4WVd88XwTIAk/FU4gI5gCQ/zaVklv 5nbGoI9hscu6vzUnFNsG3mVqQp8ebYpdcJNebLcAFzUu6tV5ujqnDlY/wQr9zF9TQnKM 3n35UbFzpTQSkaM9KvWfu1OiLw6OKklM06GXRevVReZKsETulNQNGNDFzWYBCOYo6KTE wxtLL1UTp4aF6PhG0t1JKe3I0SQnYW95eBQs39xEu2ZL8L4hDBoeC/lxmayQaUFSvB/L B9eoR/+8wHweNPR+YXMYKaOtKMlUOujUtV4MHVfa5nfkB+3W6veLasTiUMRoNuN+BMu8 JLRQ== X-Gm-Message-State: AFqh2kpH46/EYhzLqImzMgms6uNZCwRK539C9YSR2xMP0bT29OxrBIxL MaNlL6eNr/nh7RNQ7gvMKZgHLA== X-Received: by 2002:a05:600c:5399:b0:3d9:c6f5:c643 with SMTP id hg25-20020a05600c539900b003d9c6f5c643mr18786079wmb.29.1673372377327; Tue, 10 Jan 2023 09:39:37 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id z12-20020a05600c0a0c00b003cfa81e2eb4sm15551258wmp.38.2023.01.10.09.39.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:36 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E34FC1FFCD; Tue, 10 Jan 2023 17:39:25 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson , Emilio Cota Subject: [PATCH 24/26] translator: always pair plugin_gen_insn_{start, end} calls Date: Tue, 10 Jan 2023 17:39:20 +0000 Message-Id: <20230110173922.265055-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-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 Related: #1381 Signed-off-by: Emilio Cota Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230108164731.61469-3-cota@braap.org> Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- accel/tcg/translator.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) 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 Tue Jan 10 17:39: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: 640886 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2876631pvb; Tue, 10 Jan 2023 11:15:27 -0800 (PST) X-Google-Smtp-Source: AMrXdXtvDfYa4fbqULVkqpqcJI3oiLmgJNjft+1CMfTbLjgjEP5Y94DU629SQNhznhdfPXGX3Nt1 X-Received: by 2002:ac8:4a8d:0:b0:3a6:a71e:c763 with SMTP id l13-20020ac84a8d000000b003a6a71ec763mr94500943qtq.35.1673378126895; Tue, 10 Jan 2023 11:15:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673378126; cv=none; d=google.com; s=arc-20160816; b=JrthNH3ZSvP1jdgKm2nJITlBnCwZKx1M6WbV8BH5LmJXxdZqHzYVTeDM0xf6XIEdP1 h6/GeIS6JlSQtm9EwpV7ionMCk4U4glcz01zjQjaAHWTfi/c6Z4EOAQqGElJ61yri8wV kwAo5LblbaibuvUQTJR+6kwTpcLZ8669I2m1HW5fuD+Zi4vAvWInL3yuPUjodGJL7+Wp LeBiaQVl4eYLppvlcKVuaIi8d6NfVvm/8UxaFfJnX7AWTeXqugwfjNz62JDhgMBqpt6O Dc553YJLKOF4tP+86yZqfIEIBiPgYQPrzRuIBoaPfb1OhMjCoQZvMcJlBQfG1mejhWhl /z7g== 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=3efp7i/kAcT0mSvJTtxOgGsEOMU+SonxpGs9nYXT4Ro=; b=mTIqz5RVqZV2SzHf3iqJH/MW33dnpQMhCGEdXNWkeqO+8GWcGUL1TOUB69Nm5Vcy2Q 4xs7ZsvrSVfdCVvUoIpFv0LqWMe4zKwexSqYvsV/FiveZPTN7wvFKqhDiCx0aA3MsdgB fmWTVeMbZAH0O7/vFAeHu58/bkDcz1B9hBLldv1zcH4NEJEOeNhr9AhZsvN7goIZqgFm z6C0WAfxq5VV3opp5M1FpeksdZsHAMeGaAMoXHepsOYUSetkrxPFmCsgFDHbLuUJNAlM U60qVoimS1ItsINF5bGssyKHIAGXJlBeRx6o+O21wh5geWnSveT9UpfVHCTLfTeyh7rl 5p0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ycbGXSmg; 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 e26-20020ac84b5a000000b003ab5d6cd6c1si6712371qts.591.2023.01.10.11.15.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 11:15: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=ycbGXSmg; 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 1pFIbN-0003ns-Rl; Tue, 10 Jan 2023 12:39:57 -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 1pFIb9-0003Zv-QI for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:43 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFIb5-0001Ce-Al for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:43 -0500 Received: by mail-wm1-x335.google.com with SMTP id k22-20020a05600c1c9600b003d1ee3a6289so10701119wms.2 for ; Tue, 10 Jan 2023 09:39:38 -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=3efp7i/kAcT0mSvJTtxOgGsEOMU+SonxpGs9nYXT4Ro=; b=ycbGXSmgkgH0kzY6HX8SB4y/Mw8TOfLmp3dcjSjBBSvxXu1y/N0yB9yORzNTLfPQa6 nPe6MMOtGc16l9tehHE8UyYm9Fff4NaXIk3D3ot4oXzSQxBUaOlylGL8ZE/jbiBn9l9j pAUiqv5SXD66qgRd9Fhqafc1YJ6k0dod07Bkqtv9JZ5BdQmevJidJV0kij3N1TY2nSyG 5x25mlBhKrJ0DtnFLK4Vg+8cvLDgOfEe9GInEXgNnC5x97bWds9nAGu62SDxLO86H6GK kKqR+OpBnOlFmacF+MQfW4JUpmthPN9ZY/ivMYXhyYTOsyd/qai2AKQniUhh0InFIp4h jH9w== 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=3efp7i/kAcT0mSvJTtxOgGsEOMU+SonxpGs9nYXT4Ro=; b=rDBp/wRH36iGPK3uDNg2XBF//Brg2IVcmjKyN9JyPy6VS3ZkirAmUcCk78W4aygN36 dIla8LilNxWfzBmx0eBys9HS2sOb4hksJfUoDJD9hCB4FbVR4C9tmTypRv+FoFaKqa4v qoEWZi8U8EL4ptMs3d4BpJlTv87nG17V0SRfMdLc+q/4leNllsSfy73txRufBD2EglX7 MPgLX20FmjT3a9Qtiue3sxVMG4Qvo1nFlvahR0m0vqx2RlFG+D869aNJbI+++S968TJk qR+mwzs2VXwKt3yUOhj5OBs75m+AgpBJxIFOSWHwBLjDKrxQvGkyvMTAEWfaQ2/s7WsX h3pg== X-Gm-Message-State: AFqh2kpoDCHg/V17w9cQjxC2CBexCRyuM4Qqfzf8srR7K41Agl8Q94kl EVVuuGMzb3hvJSHxgp/8ijgSng== X-Received: by 2002:a05:600c:33a5:b0:3d3:5a42:bd5d with SMTP id o37-20020a05600c33a500b003d35a42bd5dmr50138053wmp.32.1673372378624; Tue, 10 Jan 2023 09:39:38 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o19-20020a05600c511300b003d9862ec435sm3763112wms.20.2023.01.10.09.39.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:36 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 081B21FFCE; Tue, 10 Jan 2023 17:39:26 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson , Emilio Cota Subject: [PATCH 25/26] tcg: exclude lookup_tb_ptr from helper instrumentation Date: Tue, 10 Jan 2023 17:39:21 +0000 Message-Id: <20230110173922.265055-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.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 It is internal to TCG and therefore we know it does not access guest memory. Related: #1381 Signed-off-by: Emilio Cota Message-Id: <20230108164731.61469-4-cota@braap.org> Signed-off-by: Alex Bennée --- tcg/tcg.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index da91779890..ee67eefc0c 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1652,8 +1652,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 are not internal to TCG */ + if (tcg_ctx->plugin_insn && + strncmp(info->name, "plugin_", 7) && + strcmp(info->name, "lookup_tb_ptr")) { tcg_ctx->plugin_insn->calls_helpers = true; } #endif From patchwork Tue Jan 10 17:39: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: 640883 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2872850pvb; Tue, 10 Jan 2023 11:07:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXtlYpIsvq02q7O/FJw4Z/0VzcPq9AjdPHhhZTth/JDXv6A2vxWhg97o3wMdj6zKf8hdV3XM X-Received: by 2002:a05:7508:4388:b0:49:20de:9a98 with SMTP id y8-20020a057508438800b0004920de9a98mr1539157gby.12.1673377628273; Tue, 10 Jan 2023 11:07:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673377628; cv=none; d=google.com; s=arc-20160816; b=VHoIs3LgvICUVNtx2fQ8ZHeSTgEAm2KASjqE809/xiR2KhnhIiqLsBKrS0q+HCtWkH v2N5nPBmn3VChL22Bw7EraVMbGtN4qh4STeruWzo9OK22ZsNL4D83rqR1HbvblQkMWxI QQdadVSWWt8je+nt0TRBNXG2tW07JhiRYZaX/9DC+BBkAm63fxy4ExtS71EyBOp3m+8v GI53Xx2oBTbVqx0SUTLlBE2Hm3qqeYXEokloCM6btT21O6dxbsHsG86ml+EYKDZpFX/U g2dv6CrbXZxZkKvaXu9T3jIqTSMjJoJBg4k05yz0eNrRNdKJvWsSbDPUvtPqIV1YaqRh MW0A== 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=SFp5fLykrTmSrzOYijtFAOoQNLwJRutVy2bxJGeiOow=; b=poV8hMbYNhOD8QHargYayx5QcBm2ZJ+QAlTZSnu8OMuJQaheaprNvtMAuw0VJgMST1 vj0y+e4YpNtcmSvRdcnOjRru0/7vzCyENTcF3aPzdGWMDzDhCiRo4J4qaSSNNWFtYCsq fxwX3JS8S4Pfe9XXyDjhjGhHBOtENkXf7eE7lXSFbp1PMPTeLF1DCe4i1bnmTotFkFgl +SpA0kCF1rZ7el4lesxv5cWdsnBvV1ZSGPIlhz2LibgXSFcSkkX5FouXTGHAL3MXQ6QF J4mISU44zWzOZFY/1qWh94r4H1r3Rl4SizkA/ccT1nki6Z1idDJwGGrqqT0J1Aaj25Na xjXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qgXIUn96; 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 e15-20020ab0314f000000b0047652743be2si2785221uam.94.2023.01.10.11.07.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 11:07: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=qgXIUn96; 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 1pFIiH-000760-3t; Tue, 10 Jan 2023 12:47: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 1pFIiE-00072N-8v for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:47:02 -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 1pFIiC-0003aS-JM for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:47:01 -0500 Received: by mail-wr1-x42a.google.com with SMTP id bs20so12610928wrb.3 for ; Tue, 10 Jan 2023 09:47: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=SFp5fLykrTmSrzOYijtFAOoQNLwJRutVy2bxJGeiOow=; b=qgXIUn96/XpkFKbF8mC+27Idw4WpE34vO5zxCuMhIeV18k0x8CLEXePY1w1j2j+GqN hmC63EGoL18CFoOdXuvBSzQ10uGedVmMbY/Wrg+shxs8T6IFtAekZgFhh5v27UxkEJNB S8pdE+5lQj3NkPlLNo/VehZGJEIMW8IoczmbKGXDWBaue6PPuUWjlhajkNL47eXqgxF4 no1dRRFGyf+sf5Fu+scLzGq7KOnLh7GTG7wvsH2ABxbRzf0GCoBxa2TUBTdY8LUirGwM 3vAIBv4w8tzbM1LUd+CTJuYa5oFITtkcoZJ/wc68Meq9iOgjGCmuxylyGzZND8yJXyxh Q1+A== 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=SFp5fLykrTmSrzOYijtFAOoQNLwJRutVy2bxJGeiOow=; b=QF5hMmfTr0Vly3WpI4swrd4cQ/7TZcJPQbzOnpydEAkVh/GM3DA8ATEAmVPeKbO0m2 dshHFkbMjxtyPhYVY4yl10rPO7q3UzPXKC3K79OI/7naIXkuwV5z1BXEDgdh2Dhm2RLo 6iWgt0SCqSkIrgzY3T+W72rnVd62+NIOV5/H7QQNMejCq0Q2YncZJl9IMsAuuLEtXEag kRhBsaZgiVMW5ZUNaUHlbm8Dg7nVtU0//2VlVhm1LvFHe1mNgExB6zEajRRNr5E0aOwt D4EZyfY1AYaQb2Z3E+s9IWiHnBc0suUDyDEDvyJU0sxi4KOlM9fboX98ulrQGn4CgJcq +8Eg== X-Gm-Message-State: AFqh2kpOxHNfI8fyzbZjg0Xx+EImYMIqP62Je/qRfxsda2i/0CEfq9sS Cm4mqPAiB4McmDMEfKqp9iYudg== X-Received: by 2002:a5d:6145:0:b0:2bb:6b92:d4cc with SMTP id y5-20020a5d6145000000b002bb6b92d4ccmr8176826wrt.53.1673372818709; Tue, 10 Jan 2023 09:46:58 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id z2-20020a5d6402000000b00297dcfdc90fsm11713916wru.24.2023.01.10.09.46.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:46:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 249D91FFCF; Tue, 10 Jan 2023 17:39:26 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson , Emilio Cota Subject: [PATCH 26/26] cpu-exec: assert that plugin_mem_cbs is NULL after execution Date: Tue, 10 Jan 2023 17:39:22 +0000 Message-Id: <20230110173922.265055-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-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: 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 --- include/qemu/plugin.h | 4 ++++ accel/tcg/cpu-exec.c | 2 ++ 2 files changed, 6 insertions(+) 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 6bd29227f3..f272504611 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) @@ -1031,6 +1032,7 @@ int cpu_exec(CPUState *cpu) 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);