From patchwork Tue Mar 4 22:24:08 2025 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: 870129 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp492822wrg; Tue, 4 Mar 2025 14:26:53 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXUSRLzi0G/kNS8oJmGHQXAERDreZFeYwIcajEMSL5xcCNPCFwTqiaPkkDZcniYrPZGBcp4mA==@linaro.org X-Google-Smtp-Source: AGHT+IGEsluBXwKaMHkyPwkDlYckah6YSqwtzpBK5YcKYyFgKUtZ/9rUvrmTxPbrU4wLIWTthP6N X-Received: by 2002:a05:620a:6a04:b0:7c3:d316:1d8e with SMTP id af79cd13be357-7c3d8ed8f4dmr168848085a.53.1741127213151; Tue, 04 Mar 2025 14:26:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127213; cv=none; d=google.com; s=arc-20240605; b=QehohWIC3DzH0p/NzrEKTm/R1LxRYymk456atyGTWJfpN7UpqMRhUqty9GgYo5ZRPS CDyyPEB8YY5c7u+8Ql9HSMwqW/wKRvlk0qQcP35GCOfP79Z9Eu15BNSfc1IJY9CQ87eK ZIer3qT1ONMO5BU1QP/8mKjKusurvRsSiXo3+V9OW5teBkqFOF110eh82/zb7SkbEmo1 Lo1Og2dVFCIMdJ2OBSqp+jeqbLYP7Q80ChiuNCtlz8eMT+rgsQjnL0DSg1vYPxwWzcRC MIU0JkYiDVwSgwI4L5gFTYcRsQrkRkFZA0G8fAXUL9TtXpWfUaebRaJq9VWzmqgg4V5O D1zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=axgWtiOkGGmP9jd5CQ2re9gHdvRfWCbPTPi2wsUSA58=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=NaNnjCXi5iEzMQLCYQ/b3cvyZpRCjnMZsjtv6DkcTJ9APDvcqI6e2DYUDVH3LTuV8d E3om3YOltAk3wH6uYJA3F2rM0sHFJUPZtVXbgUsj8TffKogIcL8kJJyLIXUv9V+H6vDz fugn05BCl26vl6/rVAyamPXTjmjkrlxTgeBNqItMRDrwt7hvAtg+/hexS7NbWkG7vduI I6c4SLuopXZelOv5jttTJXKleJSNHrmFmWFYZZcbT87kCL17viP9uuVs5cj8jm7S/lut g9a+44h7wQQSPOcilaS1/qZhZcGF5pu4tE2iRQbSfBySJtj+UvASIYRwE8svgi1jyH+L DFzQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dhnGWLLQ; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3bae179fasi509849785a.559.2025.03.04.14.26.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:26:53 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dhnGWLLQ; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpaiN-0006Wc-9B; Tue, 04 Mar 2025 17:26:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpagz-0005NB-Hu for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:49 -0500 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpagx-0006UR-0E for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:49 -0500 Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-5e4f88ea298so7976110a12.2 for ; Tue, 04 Mar 2025 14:24:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127085; x=1741731885; darn=nongnu.org; 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=axgWtiOkGGmP9jd5CQ2re9gHdvRfWCbPTPi2wsUSA58=; b=dhnGWLLQbGIzOxQrOw83CLA2CcSX5avf3XWN9UQJbDgGiE7A9w2RMCoAySV0j7VfuD gZaO5MrHCscIWneOVPRE2U5CD6GkxmFRZ0153AAiylmogYv3MOKI4D006txsXgIWEPgr W+qlgOp/5XRqZq8eicrv1zXdIX/Dd5Uz+uYVxjoekBtXwdMqcR2QrmlAj9IJ40esgM+Z X1qVk6KBujWmCkxDVeO4temALdlxuISaRu7KVBERxVX4LNmmH2pBGk40WvpLZoX2q4qm BlFXYk7PSuPZw1RkkdQNHynWcJfOESkWHY0lolJjkdf01zflRhFVJdVadhqWLvrr96w1 fNwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127085; x=1741731885; 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=axgWtiOkGGmP9jd5CQ2re9gHdvRfWCbPTPi2wsUSA58=; b=ejDKwtFKstL7GG3BS7KOiLwlaLNJ1pEQCrYVpxgDljo89TXWyRKE4csJupy8QZV/Pt h9RX5nkh70Qk4vmncJ1wzjTXoZ/0M/3X8Fp68oPeB+esy7mQtPkQNS3MeLMvhTSGeIQg tdKw87WP6w8IJQiOaBxFq9Z18bqu1ogfYOn34Df9WktF6tjXfVzVjdgQEu7wTQIL9mUU BWPN5Ss2CPHXsnscRiQARRslDVPZ028N04Aq8EWbPueIwy57z+2SBaZ+c8ku9JOCC1rh xw9a0XtcMdrk1xHG8ICJWl123djhpTMHpfOg6wC6VCb4hQqux2dLeg2d58syNsoydDiE /inA== X-Gm-Message-State: AOJu0YwbQZPE4CUfzgr7x7JQHbVaTcnfL6lHXvEgb8oOZZl85mi+Ugu8 JVeh3iGpFG3ImLT8tnVxff71H/pwdHUTS/FGQnOXhMPTt6mUnCyTSrficlqi3nE= X-Gm-Gg: ASbGncvRSVqWoNDnDYHvfhPBhBnwLYrEl2nt/rPh2Eff7iIekYL2+epFVVqWBxp9dWz bEd+A/4l7pmU4JwslKGZfxGNxFnYldIv1C6y++avUOwnYEV9eEt6M8KzMGvwFHppTSHxlSJAldU KuYR42P/Iwixn8u4I0l3lSb5/o4xv21olvhtCqROP5p59Fz2mcw6+Awx/uRfqFg3esYUsjEVgPL YJx8wa9oKx49caXucCvyYTr9YfNwFIjFR76qoDySVlFRSle6xjR/Ym8TicTMBgNpS4PeEkaJbbp LFoLB9WPGFE+cG1F1VunxOoQewLSdxCfSV9WAd0P6SS0pEE= X-Received: by 2002:a05:6402:1e8c:b0:5d9:fc81:e197 with SMTP id 4fb4d7f45d1cf-5e59f3c2304mr608100a12.8.1741127085220; Tue, 04 Mar 2025 14:24:45 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e4c3b6cfdcsm8831363a12.29.2025.03.04.14.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:41 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 7D9585FBC3; Tue, 4 Mar 2025 22:24:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 01/32] tests/functional: move aarch64 GPU test into own file Date: Tue, 4 Mar 2025 22:24:08 +0000 Message-Id: <20250304222439.2035603-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x533.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 want to expand the number of tests to cover a wide range of configurations. That starts with splitting off from the normal virt test from which it doesn't really share much code. We can also reduce the timeout of the original virt test now it is now longer burdened with testing the GPU. Signed-off-by: Alex Bennée Message-Id: <20250219150009.1662688-2-alex.bennee@linaro.org> Reviewed-by: Thomas Huth --- v2 - drop unused logging import - inheriting LinuxKernelTest for wait_for_console_pattern - lower the virt timeout to 360, use 480 for gpu test --- tests/functional/meson.build | 4 +- tests/functional/test_aarch64_virt.py | 71 ----------------- tests/functional/test_aarch64_virt_gpu.py | 94 +++++++++++++++++++++++ 3 files changed, 97 insertions(+), 72 deletions(-) create mode 100755 tests/functional/test_aarch64_virt_gpu.py diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 3fd2652c07..4b492135e0 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -18,7 +18,8 @@ test_timeouts = { 'aarch64_sbsaref_alpine' : 1200, 'aarch64_sbsaref_freebsd' : 720, 'aarch64_tuxrun' : 240, - 'aarch64_virt' : 720, + 'aarch64_virt' : 360, + 'aarch64_virt_gpu' : 480, 'acpi_bits' : 420, 'arm_aspeed_palmetto' : 120, 'arm_aspeed_romulus' : 120, @@ -81,6 +82,7 @@ tests_aarch64_system_thorough = [ 'aarch64_tcg_plugins', 'aarch64_tuxrun', 'aarch64_virt', + 'aarch64_virt_gpu', 'aarch64_xen', 'aarch64_xlnx_versal', 'multiprocess', diff --git a/tests/functional/test_aarch64_virt.py b/tests/functional/test_aarch64_virt.py index 95f5ce8b4c..884aad7af6 100755 --- a/tests/functional/test_aarch64_virt.py +++ b/tests/functional/test_aarch64_virt.py @@ -134,77 +134,6 @@ def test_aarch64_virt_gicv2(self): self.common_aarch64_virt("virt,gic-version=2") - ASSET_VIRT_GPU_KERNEL = Asset( - 'https://fileserver.linaro.org/s/ce5jXBFinPxtEdx/' - 'download?path=%2F&files=' - 'Image', - '89e5099d26166204cc5ca4bb6d1a11b92c217e1f82ec67e3ba363d09157462f6') - - ASSET_VIRT_GPU_ROOTFS = Asset( - 'https://fileserver.linaro.org/s/ce5jXBFinPxtEdx/' - 'download?path=%2F&files=' - 'rootfs.ext4.zstd', - '792da7573f5dc2913ddb7c638151d4a6b2d028a4cb2afb38add513c1924bdad4') - - @skipIfMissingCommands('zstd') - def test_aarch64_virt_with_gpu(self): - # This tests boots with a buildroot test image that contains - # vkmark and other GPU exercising tools. We run a headless - # weston that nevertheless still exercises the virtio-gpu - # backend. - - self.set_machine('virt') - self.require_accelerator("tcg") - - kernel_path = self.ASSET_VIRT_GPU_KERNEL.fetch() - image_path = self.uncompress(self.ASSET_VIRT_GPU_ROOTFS, format="zstd") - - self.vm.set_console() - kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + - 'console=ttyAMA0 root=/dev/vda') - - self.vm.add_args("-accel", "tcg") - self.vm.add_args("-cpu", "neoverse-v1,pauth-impdef=on") - self.vm.add_args("-machine", "virt,gic-version=max", - '-kernel', kernel_path, - '-append', kernel_command_line) - self.vm.add_args("-smp", "2", "-m", "2048") - self.vm.add_args("-device", - "virtio-gpu-gl-pci,hostmem=4G,blob=on,venus=on") - self.vm.add_args("-display", "egl-headless") - self.vm.add_args("-display", "dbus,gl=on") - self.vm.add_args("-device", "virtio-blk-device,drive=hd0") - self.vm.add_args("-blockdev", - "driver=raw,file.driver=file," - "node-name=hd0,read-only=on," - f"file.filename={image_path}") - self.vm.add_args("-snapshot") - - try: - self.vm.launch() - except VMLaunchFailure as excp: - if "old virglrenderer, blob resources unsupported" in excp.output: - self.skipTest("No blob support for virtio-gpu") - elif "old virglrenderer, venus unsupported" in excp.output: - self.skipTest("No venus support for virtio-gpu") - elif "egl: no drm render node available" in excp.output: - self.skipTest("Can't access host DRM render node") - elif "'type' does not accept value 'egl-headless'" in excp.output: - self.skipTest("egl-headless support is not available") - else: - self.log.info(f"unhandled launch failure: {excp.output}") - raise excp - - self.wait_for_console_pattern('buildroot login:') - exec_command(self, 'root') - exec_command(self, 'export XDG_RUNTIME_DIR=/tmp') - exec_command_and_wait_for_pattern(self, - "weston -B headless " - "--renderer gl " - "--shell kiosk " - "-- vkmark -b:duration=1.0", - "vkmark Score") - if __name__ == '__main__': QemuSystemTest.main() diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py new file mode 100755 index 0000000000..616e6ed656 --- /dev/null +++ b/tests/functional/test_aarch64_virt_gpu.py @@ -0,0 +1,94 @@ +#!/usr/bin/env python3 +# +# Functional tests for the various graphics modes we can support. +# +# Copyright (c) 2024, 2025 Linaro Ltd. +# +# Author: +# Alex Bennée +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from qemu.machine.machine import VMLaunchFailure + +from qemu_test import QemuSystemTest, Asset +from qemu_test import exec_command, exec_command_and_wait_for_pattern +from qemu_test import skipIfMissingCommands + +from qemu_test.linuxkernel import LinuxKernelTest + +class Aarch64VirtGPUMachine(LinuxKernelTest): + + ASSET_VIRT_GPU_KERNEL = Asset( + 'https://fileserver.linaro.org/s/ce5jXBFinPxtEdx/' + 'download?path=%2F&files=' + 'Image', + '89e5099d26166204cc5ca4bb6d1a11b92c217e1f82ec67e3ba363d09157462f6') + + ASSET_VIRT_GPU_ROOTFS = Asset( + 'https://fileserver.linaro.org/s/ce5jXBFinPxtEdx/' + 'download?path=%2F&files=' + 'rootfs.ext4.zstd', + '792da7573f5dc2913ddb7c638151d4a6b2d028a4cb2afb38add513c1924bdad4') + + @skipIfMissingCommands('zstd') + def test_aarch64_virt_with_vulkan_gpu(self): + # This tests boots with a buildroot test image that contains + # vkmark and other GPU exercising tools. We run a headless + # weston that nevertheless still exercises the virtio-gpu + # backend. + + self.set_machine('virt') + self.require_accelerator("tcg") + + kernel_path = self.ASSET_VIRT_GPU_KERNEL.fetch() + image_path = self.uncompress(self.ASSET_VIRT_GPU_ROOTFS, format="zstd") + + self.vm.set_console() + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + + 'console=ttyAMA0 root=/dev/vda') + + self.vm.add_args("-accel", "tcg") + self.vm.add_args("-cpu", "neoverse-v1,pauth-impdef=on") + self.vm.add_args("-machine", "virt,gic-version=max", + '-kernel', kernel_path, + '-append', kernel_command_line) + self.vm.add_args("-smp", "2", "-m", "2048") + self.vm.add_args("-device", + "virtio-gpu-gl-pci,hostmem=4G,blob=on,venus=on") + self.vm.add_args("-display", "egl-headless") + self.vm.add_args("-display", "dbus,gl=on") + self.vm.add_args("-device", "virtio-blk-device,drive=hd0") + self.vm.add_args("-blockdev", + "driver=raw,file.driver=file," + "node-name=hd0,read-only=on," + f"file.filename={image_path}") + self.vm.add_args("-snapshot") + + try: + self.vm.launch() + except VMLaunchFailure as excp: + if "old virglrenderer, blob resources unsupported" in excp.output: + self.skipTest("No blob support for virtio-gpu") + elif "old virglrenderer, venus unsupported" in excp.output: + self.skipTest("No venus support for virtio-gpu") + elif "egl: no drm render node available" in excp.output: + self.skipTest("Can't access host DRM render node") + elif "'type' does not accept value 'egl-headless'" in excp.output: + self.skipTest("egl-headless support is not available") + else: + self.log.info(f"unhandled launch failure: {excp.output}") + raise excp + + self.wait_for_console_pattern('buildroot login:') + exec_command(self, 'root') + exec_command(self, 'export XDG_RUNTIME_DIR=/tmp') + exec_command_and_wait_for_pattern(self, + "weston -B headless " + "--renderer gl " + "--shell kiosk " + "-- vkmark -b:duration=1.0", + "vkmark Score") + +if __name__ == '__main__': + QemuSystemTest.main() From patchwork Tue Mar 4 22:24:09 2025 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: 870124 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp492341wrg; Tue, 4 Mar 2025 14:25:29 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXpa3bya2IP89y1GX7BVtudXLfOsBeJqbXgnljDNUfe0U6grZuDJy+2/4ScDbOZZfOgylgnAA==@linaro.org X-Google-Smtp-Source: AGHT+IHXYyYvSODPH0LLFaEwIQm4iOBHWzRxDb6XW+MO1xc3qW+CoBRdoLWMLDtr0HFyhXzhZXrh X-Received: by 2002:ac8:5f14:0:b0:474:fbb4:8f7c with SMTP id d75a77b69052e-4750af6f3d6mr16590831cf.11.1741127129729; Tue, 04 Mar 2025 14:25:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127129; cv=none; d=google.com; s=arc-20240605; b=LL/OOcOvQv04Dvjqxiv5re06BvDCnUwJ3UPf0knZBNhn3XXc9YGgiHgasoxnmAmpoO zuuZoVIjIGg5vKLBeNlYsGltAwbvICt7QwJTZ1PSrXu1gTsbHlAcDYk7YwtoL0ED0E91 vWN4CHmcG7TXS4hS1bJqfu4Q17Bap+HApFL6mmVcs3GYHUeC7kGEfz2hh9oPMERLkHtR 5enJ87d3vrTb5Y/GgUEBh6EdOlvS1+k/xHwn1ZNVYu/H/wxqBGqARAVyFJvRDyVXNVfB GaUbw/QgFKEOkIG4ao1paVO3FKVNWWsBV+ma7CIk1FzxFpU7M2aX4RAUcoxKtLF5Dk4n DPbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=2jU9KyNmccT/smoB+ETVGsRZ3o/UDWF2xDiNaobfo+g=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=NyXnWjKIiSiA4Tpb8sFyxcyBeOeNSMiYmgIkEou0YkiYzeoqk36sAvO/JcehhK7GUX xkHS7C2EXB7ikbzg8D1X66S6cTojF7OIKFfOxdqwBO4sK8C6gPWB3GxU6QE2HGLJbL2/ +1YlBgcosc2cO9hLMHdBYcS/+XkMk74giB2+FGE8fAXNqQx2dyIz2o9BBVOYYdVhwYCO R3hPGkjwq5LCPahtU6iiS2ze4cKzp/us0JRy5k3tTvM+pgtp008UbO3OPO7bg8vKePRY 3sR79O72nYfHzZyAUuxTVbX4Ar7t+H8RzkeGSoCKU+qWgq5Qr8yKcuguMVkpQYbIVrLK fVhA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Va5OHodH; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-474e94e0b18si50693291cf.315.2025.03.04.14.25.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:25:29 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Va5OHodH; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpahP-0005bN-MR; Tue, 04 Mar 2025 17:25:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpagy-0005MX-RN for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:49 -0500 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpagw-0006UB-Bn for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:48 -0500 Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-5e535e6739bso5031276a12.1 for ; Tue, 04 Mar 2025 14:24:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127085; x=1741731885; darn=nongnu.org; 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=2jU9KyNmccT/smoB+ETVGsRZ3o/UDWF2xDiNaobfo+g=; b=Va5OHodHbo5xv5zn1yCwgSvUBmOL40ZfFawkMCUek7c928l5xjPdPLyI5sMMT0GkeE i3Jev10UeujaCYW+Gao04eZ1xvgEnQmCmYuvuiVEE5oNf/u8Qur/pfWEbtmyRxhVpSth n7OWl7ebOobUm8925yJQPskUjkFWVWkhvKctaTlTbPeQJtC4qqSD3nPn+9UonhtwK/4u 1YT2DBNJRMkxKacy2Yw4571lQCQub8nE7tLToC/dV8MDnAQBz8IKMA6VLXKAZAxppbkr pHWA6j+re/DTfL5R7BP3nRx+zfk7jZ65zmy6ffrRIpAUydPpiQ8RWCJwqM91KAXF1zpX cqAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127085; x=1741731885; 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=2jU9KyNmccT/smoB+ETVGsRZ3o/UDWF2xDiNaobfo+g=; b=X6h7TVXjwq1sFryLd0ca2UzKhaZKsKQ2GEI2Gel699vJCU88DwrccIyNNCwwCYJExu c02BlpwnTT3JgTm6qOp19oWcWP/UInJl/RnWmquMGqlroDQ5RHRup5ymrhIXuLcDcgZ6 pnG/3n4aEq/aH4nzY1MXDz19zN4NtgI8FltyQUxzEwKN1z4c7Vhr4B4DoIPiZ6G05SYt eDQUi5lHRthxLtzudjiZmK24wUWGiG9rLasybqaANOyqZBB+OwRlX8pbdkXouZ+bOdki Uj7B3QVGpCEdOQQtvTfrc+gD69pdpjp9/spszAtLXA7yDlEtBUOaStpECDOBHdje/6lJ JjAQ== X-Gm-Message-State: AOJu0YzDMvf5TUTgN2g1GvpWyHxDAmZbxBMQUGpAClHUAusSuCELwkoy 3GM4tE/fOW9rb+kpyacpJNiTDQxxhXOR2BwKVMfmbfQrYPNMc0IhbX1mpDPBah8= X-Gm-Gg: ASbGncuCBvX83pVE1bgAiwaIai+EuMeDVGdoOxL+ud8EAI38JTqjqbu5CoRwtDLzQAz 4/Ybjf0Hkfg+k0+JYCKx8cvJP6a52eo+rxI/eKwWwENEXcpXgBEy1MmBEOzaZ8pdSTsOxht6bqQ q1FZuFXuJNftrKOC8vYSN4QA4BAQLOPUDKqLv5bLW2iAdraAh/OAV0uAaBhQNeXeMu57KG5gR37 YuS8mAhcbUvaCi8QQRf2YFAHYMu/5/MyIMxwYuk6V7lFXVCJZ4alU3dMpLmrvpfCgjyyOB5kkuC Q81tSp6Gu0Yp1+h0LZGivPKHu0c4nmfi/+YRVO/c31Toqf0= X-Received: by 2002:a05:6402:2546:b0:5d0:bcdd:ffa1 with SMTP id 4fb4d7f45d1cf-5e59f3632cbmr811042a12.2.1741127084592; Tue, 04 Mar 2025 14:24:44 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e4c3b4aa13sm8651808a12.7.2025.03.04.14.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:41 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 937005FC1A; Tue, 4 Mar 2025 22:24:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 02/32] tests/functional: factor out common code in gpu test Date: Tue, 4 Mar 2025 22:24:09 +0000 Message-Id: <20250304222439.2035603-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52f.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 In preparation for handling more tests split out the common machine setup details from the test specific stuff and add a helper for launching the weston test. Instead of searching for "vkmark score" we set a custom PS1 and wait for a successful completion. This ensures we capture the score in the console log which otherwise wouldn't log anything. Signed-off-by: Alex Bennée Message-Id: <20250226140343.3907080-3-alex.bennee@linaro.org> Reviewed-by: Thomas Huth --- v2 - don't be cute with the -display options - dropped r-b as I factored more - split into _launch_virt_gpu and _run_weston_test - detect PS1 success --- tests/functional/test_aarch64_virt_gpu.py | 38 +++++++++++++---------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index 616e6ed656..bd325577c0 100755 --- a/tests/functional/test_aarch64_virt_gpu.py +++ b/tests/functional/test_aarch64_virt_gpu.py @@ -12,7 +12,7 @@ from qemu.machine.machine import VMLaunchFailure from qemu_test import QemuSystemTest, Asset -from qemu_test import exec_command, exec_command_and_wait_for_pattern +from qemu_test import exec_command_and_wait_for_pattern as ec_and_wait from qemu_test import skipIfMissingCommands from qemu_test.linuxkernel import LinuxKernelTest @@ -31,12 +31,7 @@ class Aarch64VirtGPUMachine(LinuxKernelTest): 'rootfs.ext4.zstd', '792da7573f5dc2913ddb7c638151d4a6b2d028a4cb2afb38add513c1924bdad4') - @skipIfMissingCommands('zstd') - def test_aarch64_virt_with_vulkan_gpu(self): - # This tests boots with a buildroot test image that contains - # vkmark and other GPU exercising tools. We run a headless - # weston that nevertheless still exercises the virtio-gpu - # backend. + def _launch_virt_gpu(self, gpu_device): self.set_machine('virt') self.require_accelerator("tcg") @@ -54,10 +49,10 @@ def test_aarch64_virt_with_vulkan_gpu(self): '-kernel', kernel_path, '-append', kernel_command_line) self.vm.add_args("-smp", "2", "-m", "2048") - self.vm.add_args("-device", - "virtio-gpu-gl-pci,hostmem=4G,blob=on,venus=on") + self.vm.add_args("-device", gpu_device) self.vm.add_args("-display", "egl-headless") self.vm.add_args("-display", "dbus,gl=on") + self.vm.add_args("-device", "virtio-blk-device,drive=hd0") self.vm.add_args("-blockdev", "driver=raw,file.driver=file," @@ -81,14 +76,23 @@ def test_aarch64_virt_with_vulkan_gpu(self): raise excp self.wait_for_console_pattern('buildroot login:') - exec_command(self, 'root') - exec_command(self, 'export XDG_RUNTIME_DIR=/tmp') - exec_command_and_wait_for_pattern(self, - "weston -B headless " - "--renderer gl " - "--shell kiosk " - "-- vkmark -b:duration=1.0", - "vkmark Score") + ec_and_wait(self, 'root', '#') + + def _run_virt_weston_test(self, cmd): + + # make it easier to detect successful return to shell + PS1 = 'RES=[$?] # ' + OK_CMD = 'RES=[0] # ' + + ec_and_wait(self, 'export XDG_RUNTIME_DIR=/tmp', '#') + ec_and_wait(self, f"export PS1='{PS1}'", OK_CMD) + full_cmd = f"weston -B headless --renderer gl --shell kiosk -- {cmd}" + ec_and_wait(self, full_cmd, OK_CMD) + + @skipIfMissingCommands('zstd') + def test_aarch64_virt_with_vulkan_gpu(self): + self._launch_virt_gpu("virtio-gpu-gl-pci,hostmem=4G,blob=on,venus=on") + self._run_virt_weston_test("vkmark -b:duration=1.0") if __name__ == '__main__': QemuSystemTest.main() From patchwork Tue Mar 4 22:24:10 2025 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: 870122 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp492137wrg; Tue, 4 Mar 2025 14:24:57 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXz7BheWwCERlPpJjZP3ppEGQ3tqYJmALjhd39YMoW1XAZF3BQLF/qzbs12GIh6laehxlK+Fg==@linaro.org X-Google-Smtp-Source: AGHT+IHirlCZF0LM6PiGXpfn7hULv1hih4CJFlkCSw5f2hAPC5M+5+rtuBAM6JqED47nVpV1hjTy X-Received: by 2002:a05:620a:880c:b0:7c3:ba67:aabc with SMTP id af79cd13be357-7c3d8ef37acmr143383885a.51.1741127097621; Tue, 04 Mar 2025 14:24:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127097; cv=none; d=google.com; s=arc-20240605; b=LO5+145ajeT8PKRSRpGmFIYF6FeXrFlYcMYmlj3LswM565Knuo/YAcQLv7TgjJ2klA oHH0YUK27Ybpngi6ThK22vQQNQmou7gz4PWJVdVa/rInwgc7ktW7NOlVXqEDLWriVLOl LJ2deiabDIUaBTToeodQh8kSbI0ErOA0tT7f2nU9jHgjsks42g9C2tm/2TFizj1h8ntR Z854V6dThW7oQpROpFtKlOK5kcoNBmWaU2bAXtj0i2YrUbWdfsclokMcoZIT1R8wBxsj H5GNt5Mfdivp3axKTz65EoZIYb6A1OIBix5dw2grj5sp/gwn3F1nUkdsxDtqhj4tQv+F RERg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=tFMmkDHtawhhARFWMO1eCV3OspPEPY+ObvqNfaMPI4k=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=Q+9iHsG542frvcTa+JJs7y5vSjUsX6vl8HhidWN4udJyk/gwAtHBOJ6ntHtgFO0Sa2 MGfNG9rhUR8lwn7r1zxbz37AYgzUsVU26SOPQ5+QIWMr24EoMgWowjXsLIpeHg9EkXf5 +tdpYdPbSNt3nnlkdRfVstYiu2OG+8uXAL02R/X50Bcl78extIVeafsimOme8bXlMVka BH9KL1Ewc7lfLtRsLM+Jr0Zs8SPT2JXRjfqU7KZ9IYnl7zex0SuUCdFDSTr7szVmd5/a RAjlEh+UZCuUdYlc4OsYIBooCJN1o7Zz/4ikPVWZqhf/BbfC4Pn2ofAjt1bSN1dZmVIr p6iQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OfGHA9n1; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3d6560c77si106477885a.284.2025.03.04.14.24.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:24:57 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OfGHA9n1; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpah1-0005OA-67; Tue, 04 Mar 2025 17:24: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 1tpagw-0005KK-1Z for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:46 -0500 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpags-0006TF-WB for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:45 -0500 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-aaecf50578eso1174747666b.2 for ; Tue, 04 Mar 2025 14:24:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127081; x=1741731881; darn=nongnu.org; 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=tFMmkDHtawhhARFWMO1eCV3OspPEPY+ObvqNfaMPI4k=; b=OfGHA9n1OrEIH4V9Kiacxoi4zMw/ezQHnjohVjjciBX1fNUFCo/PPNKUipEXEzNrRi pblQZbtWae//VYVrP9KhBJReLtumY6uz/EYgBAmXfHVtiq+XxrxmRKasvxeTY2BmxdoG sF0zDlakzBm2j5M6p8r991JlSPaYPTRJ26/WLZesofSnqkNH45+sF/RfNleWNoHdYO5I 6Jd4ShWevJowex04NhpTEV4v2zcWmUuwAuqCn1DERvpkjDbCVxL4xLS2esj/IE6T8DMu ypdyeE1x+p5igQSbXwzjwPzvfLGAKtuOefIqIyTpnCz+hg1GCnmBbz2ab3EmjOTl7pLu OZiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127081; x=1741731881; 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=tFMmkDHtawhhARFWMO1eCV3OspPEPY+ObvqNfaMPI4k=; b=sOj3afzXl8ByB7x3TPmQY5bHDoozKrfAzoSbyE41i5vIm1PvJ8fkv+DZeUVmn8CzZs 9+Huh8m+T+fdE3QjTooAFKkvOVxypOPyaiweDlZS0Pwiegz1psFVSs68ymHqvkzdUThi ECMVttGWF9/izjiPIDoQJcAoh//wczt48U2ft0p+s6AOEWeseRXcZIBgoQxpbn1/zjD/ HQl2hjxNqz/YxcnijxK2WOZBxmh/hvZfq3e7g1EOCDwcFX1xFEbukJcvVNOqz22EuiGP B0YqtaGerMgyCs/PhJZgmoT9j6wlT+SYfZhd3+avIiM+sOg0QyrWQrfIioivO5usW3vp E2jg== X-Gm-Message-State: AOJu0Yw54022NRFvPZYP1QbTImfQNQ5EZ40Y2SRKDO3x9E0PAzV6FkE6 53sJ1Xq2z6i9TELSDiVhyFdE4GRVmmPmHTGF1UNvpTAJuHRChRMJni+EQTptNRs= X-Gm-Gg: ASbGncuO6sFkOau3f02a+c/msvLKzJS+ZuONjWxMbXwMXEeX+KxY5q4EvdJSY4qf2Z3 RtFWC+fgfBLP3ajosDk5gQnoU+AUaK9zWFFaukpU/p1/9SvT0jetzXW4ML1T55/oSdSBiuO1ei0 8EaXKYPEYzYrBqxTXlsX6lPBHpO3UUz48fa8FfgIWCohTA+lQU9JPO1/BZ2McZUyIFQCBfy022x iSvsdr33/tmZl9oLVrP1ckDpujhD6dHdU0sIYgDHBVxgkgFnH8jyql8jm1YUoSFF+mknszvBMTN bpT0O/XZ1YIG9ztbsXF25a85xa695GMzU4opfSwVUd9ZvyE= X-Received: by 2002:a17:907:8688:b0:ab7:9df1:e562 with SMTP id a640c23a62f3a-ac20e42961bmr86717266b.48.1741127081286; Tue, 04 Mar 2025 14:24:41 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abf0c6ee491sm1030467166b.103.2025.03.04.14.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:40 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A81135FC87; Tue, 4 Mar 2025 22:24:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 03/32] tests/functional: ensure we have a GPU device for tests Date: Tue, 4 Mar 2025 22:24:10 +0000 Message-Id: <20250304222439.2035603-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62c.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 It's possible to build QEMU without support for the GL enabled GPU devices and we can catch that earlier with an explicit check. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20250226140343.3907080-4-alex.bennee@linaro.org> --- tests/functional/test_aarch64_virt_gpu.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index bd325577c0..4420a6175f 100755 --- a/tests/functional/test_aarch64_virt_gpu.py +++ b/tests/functional/test_aarch64_virt_gpu.py @@ -91,6 +91,9 @@ def _run_virt_weston_test(self, cmd): @skipIfMissingCommands('zstd') def test_aarch64_virt_with_vulkan_gpu(self): + + self.require_device('virtio-gpu-gl-pci') + self._launch_virt_gpu("virtio-gpu-gl-pci,hostmem=4G,blob=on,venus=on") self._run_virt_weston_test("vkmark -b:duration=1.0") From patchwork Tue Mar 4 22:24:11 2025 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: 870123 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp492265wrg; Tue, 4 Mar 2025 14:25:16 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWp4VWmQXM+soLmfEUgzx91/pGhjhlkWUiUFcKXrFBwAyoKE8oWiH5wW6gUAX1ZOv2GO+ExnA==@linaro.org X-Google-Smtp-Source: AGHT+IEEdTwQocBkNZCrZ2hKa/dRI4cY8I6DeX7TeMxKv9oa249KPxXyH5qP0VknD/8855QxgB0x X-Received: by 2002:a05:620a:63c1:b0:7c0:6419:8bd3 with SMTP id af79cd13be357-7c3d8e4cd63mr215806485a.22.1741127116434; Tue, 04 Mar 2025 14:25:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127116; cv=none; d=google.com; s=arc-20240605; b=PWnOnIpL5S3vvnrJT5oQeHqmMbi3uAyVKJ9oinjlWwccjBP69HKl8C21NGcSlFRr3I HJWFE4Ntt/chuKVcrPaLPs4tYU1fF/nXO7Iu2FWdzyn+QXU74BVdZ9unDunu/+1jhhOZ Al6xHEA48HFk4w/x/jwXi7a01V/EiDJJyCl8PyTAtvNMvuKCSGCI/PEzFhLkCiTOS7yC s2J/eO3JH1QwHnrawSMU0b+l0G/OSCVLyExo9t7qkYBJguy6P6a7lg7lH72tstZqdvpN NCMLtc7hZ7mN9j+50C3zOnEhC5IOqH4kEdC8XdD+jcTtfBOXQPx8I1UvBPVjz4/OTfgK gixg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=/V8FHPuhrbSfKCzVBzyT2YXGRtU+MVGBZXlL9rDafTM=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=PPUlZVxB1VEMC/3Cr6LbOU+gTrhs8tbvdJVoDdUIwPcf48d1Ocxb581CmHrOqaU6bA l4sGLaqPxe3j8I90mT4MQHTL23vn4P8ty3i9IluGFPNB5Czn+Vuj/Py+awefel6lrQXb JrSmduDWbjZc5P3wgrIjp6LMhWPiN/0TrEgBCSGCPokr28CWFqlkiA7tH1xjcfi11U/L n/odqfb2Nqgarx9zf54dv97D5xMppNakkWCMtpXeoyjLSz45PRG8Ou/WdmxwbL1r2yqM Omi1gvEWEB9Ct9ki11AmxLzp4gn1k8BoZP3QoR0lKKjqedd7532HXkGPIINughlkBy5R lWtA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Hcajr0O9; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3b540b508si558423685a.92.2025.03.04.14.25.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:25:16 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Hcajr0O9; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpagw-0005Kx-Rd; Tue, 04 Mar 2025 17:24:47 -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 1tpagu-0005Ja-KF for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:44 -0500 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpags-0006T7-OQ for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:44 -0500 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-aaeec07b705so947508766b.2 for ; Tue, 04 Mar 2025 14:24:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127081; x=1741731881; darn=nongnu.org; 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=/V8FHPuhrbSfKCzVBzyT2YXGRtU+MVGBZXlL9rDafTM=; b=Hcajr0O9mCscbNwq+1EvprKepCi3H+mPci4RUVJfe9YigU3+CsP0lXaE11IH7XTJBJ x+jrNMzkUwLIpPFFMOEs8orZL+DhvJf8n5j4vxC1e8J2yKfzjtkEQzqN0MS77Dtw5wWV rJey7oThFOWWQzHC8QP8HrBnHjw97pqRWRqPecVedFdQ0lkpE5yosWC+XzjDQqv6HrAm H+pyeHbzqcZ8wsR+92QZPgbeNdlZFB2n/LAJaki5n8ulJTK90aeUikhBaJakeUKTsSzY 6G6/7YPlHt/3ZVisvH62sgZrlU55yXuoQC1cK/3GPkzsYmAx9WSv1/fWRoHTaOvWNZK+ PSOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127081; x=1741731881; 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=/V8FHPuhrbSfKCzVBzyT2YXGRtU+MVGBZXlL9rDafTM=; b=btZa5oexL45szLYzRN0L8pPQghWc4G/9QENA9u4tsZ5BBozv67/8ri5MyO967/1m4D 2MFy6Om7YrTpZY/2hJU9fzFE1usHfSH9KOJGPUaxkXugvlBE97+uuswRf2nNzZEvM/oH f4Lt3ojpi9g3gwZlkst0QjvfKVn+K9sYinqUp0TW7YHShUkiL/IlP0zMX/L088bd4jTP AKJaKksDnjDHEAd0zcXSJpdfBLasTaU2eT0C0c7GusvUjC6i3ZnXv3HOOTNba3M2dTgm 7b9l+pJU9DRK1wJkEqN0/o3gIcnQZxXWG0xS4CvN+VTUMVWz1rIdrHa7PzPzprcp13Kj sA5Q== X-Gm-Message-State: AOJu0YwFlzdP6YM9fRESPwWwecc6Jk049C/mjEWASzA6bie9y/WZEtlo /ME+8P6a1rEYvghcGsVRyX84VLDdDUL8eVRgmmtARxPxFE5QOMr9Jtcg2Yue6fI= X-Gm-Gg: ASbGncuWWm+B3R4d9aylwVzEW2o2q7jlyabd6jecToGaDRZl5VN7RIt4aC2KOG2BW/Z oaVB3lbvZZlZkT0PgnNOS07itrW2EmN1ZsJZKKOm2trjeC0OVVaL9u3G2TatV0W9KiEqDiG0xH6 poNr6g0iWCnhSVmNCIzStX4HdsvYLu8IIXjSNPsJC1m5+EX7WsKAq48fwE3RHo6x8Tbla3Nt242 r/Yvd/auDF6onPM0VERy3EIEyayFB6GzDqEzlKd+9MZH3dYLO337VEAPQmwafwyeTTIsTqZ6uew aCXZhDrCfo+4IM23dfA66MVH6ofzzsEZM/VBtOcsqncxgag= X-Received: by 2002:a17:907:2d1e:b0:abf:6d24:10c8 with SMTP id a640c23a62f3a-ac20daff0d0mr73564066b.53.1741127080975; Tue, 04 Mar 2025 14:24:40 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abf75c6d4f3sm441451566b.184.2025.03.04.14.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:40 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id BDE4F5FCAA; Tue, 4 Mar 2025 22:24:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 04/32] tests/functional: bail early if vkmark hangs Date: Tue, 4 Mar 2025 22:24:11 +0000 Message-Id: <20250304222439.2035603-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62b.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 message: MESA-VIRTIO: debug: stuck in fence wait with iter at %d Seems to occur more often on debug builds. Rather than waiting for our long timeout to hit we might as well bail as soon as we see the message. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- tests/functional/test_aarch64_virt_gpu.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index 4420a6175f..7d7749e243 100755 --- a/tests/functional/test_aarch64_virt_gpu.py +++ b/tests/functional/test_aarch64_virt_gpu.py @@ -78,7 +78,7 @@ def _launch_virt_gpu(self, gpu_device): self.wait_for_console_pattern('buildroot login:') ec_and_wait(self, 'root', '#') - def _run_virt_weston_test(self, cmd): + def _run_virt_weston_test(self, cmd, fail = None): # make it easier to detect successful return to shell PS1 = 'RES=[$?] # ' @@ -87,7 +87,7 @@ def _run_virt_weston_test(self, cmd): ec_and_wait(self, 'export XDG_RUNTIME_DIR=/tmp', '#') ec_and_wait(self, f"export PS1='{PS1}'", OK_CMD) full_cmd = f"weston -B headless --renderer gl --shell kiosk -- {cmd}" - ec_and_wait(self, full_cmd, OK_CMD) + ec_and_wait(self, full_cmd, OK_CMD, fail) @skipIfMissingCommands('zstd') def test_aarch64_virt_with_vulkan_gpu(self): @@ -95,7 +95,9 @@ def test_aarch64_virt_with_vulkan_gpu(self): self.require_device('virtio-gpu-gl-pci') self._launch_virt_gpu("virtio-gpu-gl-pci,hostmem=4G,blob=on,venus=on") - self._run_virt_weston_test("vkmark -b:duration=1.0") + self._run_virt_weston_test("vkmark -b:duration=1.0", + "debug: stuck in fence wait with iter at") + if __name__ == '__main__': QemuSystemTest.main() From patchwork Tue Mar 4 22:24:12 2025 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: 870127 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp492676wrg; Tue, 4 Mar 2025 14:26:26 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXH0P0cpHrpYRAIOccXAAiy4KQJGUZDO7Oiral+5NRcs58vDQyg1sleNI5ASBBF2OG1U9tG2A==@linaro.org X-Google-Smtp-Source: AGHT+IEKC2elm74uP+gCBVhXLAXkiMwVxAFpZYpHIYAno9/6EPY9msKFGBXmJYX83KaDNBDv/l7s X-Received: by 2002:a05:6214:252f:b0:6e8:ddf6:d137 with SMTP id 6a1803df08f44-6e8e6cd170cmr18539546d6.18.1741127186083; Tue, 04 Mar 2025 14:26:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127186; cv=none; d=google.com; s=arc-20240605; b=H40s9efc814uzh650B7bkqPRUZX150oB2kmMZs5f3brEos8amlWt6fNsFxIcYVF6UK zF3yY6ARNoWb0TUpLWvd9OTyk5IS0vd+V6hRkQWYYEdQS7CzlSC86qiihsC3ShwQ6HYC 0rGU7sz3gvC0/mOfrumOcqY3jb5opv31za8tYB0lUTTBFhuAxMZIvubeK9iS1VJmhwMp zdSl+VBPOX7g+PZUdFpiDV2ZZ2NnWU1Fi4CSn/b5KNaf/4/iR3/bdezAQ1NXTWptHz32 TN1n6ZddLYcOTeq0pvjKQydDi1VM40nqWl1cGrflXVE0uov64mkVF+LNwCP6K0dkabac l/PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=5/Y4yehusRukFayx+a1eFqwCyDGI+iEwXMcbyZW6EPw=; fh=rLUBpCo6PpDSH7ZvJSmZ+vr0U890Gx8GNfaQKztZN0s=; b=YkdR5YbeRIDLS9UtO1OvVZktkdUTeZGDKueHhtL/23417jzaXozNH8KE/7YmDlL3O7 io3H4C3VrGdg+Ia67JBJDR3ZYt18tQ5twzTxXd53UlKSqMa7o1OLV5LDTMshvI5BuBC9 9f2ttC7lmTiUSyRvQ8+PPLKr99/1RBr+EUctkfgpzQ1q46ZvkNFHE68EIRwsnNbudaNx Xn5clyoZsZPiijPtLrRXk5rpDlSO5nZXo5zfJZTFLwAkqX0ds2D/d8iMeZKkcblWv8WJ UYwSlUN/Xq54uA90+VRoQJy8OEgTHK+Pyy229PaY/ogl7HPz6J/dxXjgEfxm2IqnkzU8 dUgw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FdorH+aX; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e8975e7475si112611916d6.68.2025.03.04.14.26.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:26: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=FdorH+aX; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpaiP-0006nj-QM; Tue, 04 Mar 2025 17:26:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpah3-0005Q7-Tq for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:25:07 -0500 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpah1-0006X5-Ij for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:53 -0500 Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-abf518748cbso663495466b.2 for ; Tue, 04 Mar 2025 14:24:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127090; x=1741731890; darn=nongnu.org; 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=5/Y4yehusRukFayx+a1eFqwCyDGI+iEwXMcbyZW6EPw=; b=FdorH+aX7GYFGAvnrpiJFFdMmUljgRlmL25MdzCgQghUy6/oxOCCCrCkzuA1S67uU6 7e8uaWa31QLIkGGY5+VGuHT5A87kdn2+UwvvZN3xxEKcQIjTMPunFWclMcc0V0S5Bn71 DpNec8gjTLFrZR1ptDMbjfescdZXYkhvRdUr/EPES6saNVVaYhC1JgP3LIS5B/MZvBx/ 6nk5lsXvcVJ79o/UtHFrW7/8JSo+19NMeSwN73DBf5mocqPhqO5vAYgGO7PsGG8+EfdL 47UYDLMOC7XfFWjKnMt8TbJFgOkkaENF+Rw2pEYJKF5x6SEQ1vRNHgHbwUR381mbr1Mg Qkrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127090; x=1741731890; 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=5/Y4yehusRukFayx+a1eFqwCyDGI+iEwXMcbyZW6EPw=; b=Pz8gjemIpmBFsKKVfELWI+DM8oF6FwveB46p3eo0zm74TSSW43eOjtKPskfKc9w9LS ylEjUHl+dsnEcKXTdlVO0yhZoFS64UmqSYf44XTjch0ibQUVrj/vaWwZOuVrVj9JZBAX oMPNrHgf46fd8z4Q2UnLQdQa1KJCvaHVuB2YhTFQu161IPyyZahI8FFTbCUv2rxXeCKh F7pn4KdNpzcD1CMAiI27zM1hwrc1sOSAx1zQliNRpPt1XxI7SVWrNpk/L6Qqa9a8l1nZ AB5/MhQ8kds2abbyQWQ8c4KoaBUicuxim51v58P9nKO2i2XD/dqCpoZMqmL79mGfqh11 mk1A== X-Gm-Message-State: AOJu0Yy1j5jyj84K2QipQHqm6HdKEV3EUtXZMP2iDoxX34tHfIMFcpbf AUCpMtSXaliKi7XumnheOa3VnQTn53UO+cDkQfPWmgKrYZT4NMrYXDn/zARPvOI= X-Gm-Gg: ASbGncttSvzXBAQw25NRmM+Xx742Gbs8tNNyYOV1/7XPd3/8WLvKyIfiWRM+a/zqfCR vxaiLTFpFFEc2wweO3MmpUZKYQTKdY5nyeicC5Bdnos8goHs6O9wZtzI9UoQhsjt/kEFzSDGEPl k1+HHrbALAz9chDNexZIYHJxICOFuL0HgGu54N0bt+AOSd8SWU08UUg0GuQveg2F+pQBbiukO6l ZUddlzU5ozANGS6iY62SvlQWXBRUK6M95mcpy7lV74ilZGeveWJ68P73Wtaov4U+ZBY2Oer/tWh 7J5lLZS10n/JEL5k0u9VaDuJlsiESrKuJgW/BWLLH6WpNNw= X-Received: by 2002:a17:907:940d:b0:ac1:e7a2:f5e8 with SMTP id a640c23a62f3a-ac20da87bb6mr97751266b.35.1741127090017; Tue, 04 Mar 2025 14:24:50 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac1e46949aasm275752566b.145.2025.03.04.14.24.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:45 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D40AF5FCD8; Tue, 4 Mar 2025 22:24:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Dmitry Osipenko Subject: [PATCH v2 05/32] tests/functional: skip vulkan tests with nVidia Date: Tue, 4 Mar 2025 22:24:12 +0000 Message-Id: <20250304222439.2035603-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62a.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 While running the new GPU tests it was noted that the proprietary nVidia driver barfed when run under the sanitiser: 2025-02-20 11:13:08,226: [11:13:07.782] Output 'headless' attempts EOTF mode SDR and colorimetry mode default. 2025-02-20 11:13:08,227: [11:13:07.784] Output 'headless' using color profile: stock sRGB color profile and that's the last thing it outputs. The sanitizer reports that when the framework sends the SIGTERM because of the timeout we get a write to a NULL pointer (but interesting not this time in an atexit callback): UndefinedBehaviorSanitizer:DEADLYSIGNAL ==471863==ERROR: UndefinedBehaviorSanitizer: SEGV on unknown address 0x000000000000 (pc 0x7a18ceaafe80 bp 0x000000000000 sp 0x7ffe8e3ff6d0 T471863) ==471863==The signal is caused by a WRITE memory access. ==471863==Hint: address points to the zero page. #0 0x7a18ceaafe80 (/lib/x86_64-linux-gnu/libnvidia-eglcore.so.535.183.01+0x16afe80) (BuildId: 24b0d0b90369112e3de888a93eb8d7e00304a6db) #1 0x7a18ce9e72c0 (/lib/x86_64-linux-gnu/libnvidia-eglcore.so.535.183.01+0x15e72c0) (BuildId: 24b0d0b90369112e3de888a93eb8d7e00304a6db) #2 0x7a18ce9f11bb (/lib/x86_64-linux-gnu/libnvidia-eglcore.so.535.183.01+0x15f11bb) (BuildId: 24b0d0b90369112e3de888a93eb8d7e00304a6db) #3 0x7a18ce6dc9d1 (/lib/x86_64-linux-gnu/libnvidia-eglcore.so.535.183.01+0x12dc9d1) (BuildId: 24b0d0b90369112e3de888a93eb8d7e00304a6db) #4 0x7a18e7d15326 in vrend_renderer_create_fence /usr/src/virglrenderer-1.0.0-1ubuntu2/obj-x86_64-linux-gnu/../src/vrend_renderer.c:10883:26 #5 0x55bfb6621871 in virtio_gpu_virgl_process_cmd The #dri-devel channel confirmed: stsquad: nv driver is known to not work with venus, don't use it for testing So lets skip running the test to avoid known failures. Message-Id: <20250226140343.3907080-9-alex.bennee@linaro.org> Reviewed-by: Thomas Huth Reported-by: Peter Maydell Signed-off-by: Alex Bennée Cc: Dmitry Osipenko --- v2 - implement block at the test level --- tests/functional/test_aarch64_virt_gpu.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index 7d7749e243..55957dae0a 100755 --- a/tests/functional/test_aarch64_virt_gpu.py +++ b/tests/functional/test_aarch64_virt_gpu.py @@ -17,6 +17,9 @@ from qemu_test.linuxkernel import LinuxKernelTest +from re import search +from subprocess import check_output + class Aarch64VirtGPUMachine(LinuxKernelTest): ASSET_VIRT_GPU_KERNEL = Asset( @@ -94,6 +97,11 @@ def test_aarch64_virt_with_vulkan_gpu(self): self.require_device('virtio-gpu-gl-pci') + vk_info = check_output(["vulkaninfo", "--summary"], encoding="utf-8") + + if search(r"driverID\s+=\s+DRIVER_ID_NVIDIA_PROPRIETARY", vk_info): + self.skipTest("Test skipped on NVIDIA proprietary driver") + self._launch_virt_gpu("virtio-gpu-gl-pci,hostmem=4G,blob=on,venus=on") self._run_virt_weston_test("vkmark -b:duration=1.0", "debug: stuck in fence wait with iter at") From patchwork Tue Mar 4 22:24:13 2025 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: 870135 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp493229wrg; Tue, 4 Mar 2025 14:28:14 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXKRrBjyFmSj/SZOVtrXIVm1PcEyfAALwK31ycXsjwRy5cUP58bSlrBG3gVoHW3CF52ON5GcA==@linaro.org X-Google-Smtp-Source: AGHT+IH8Tyj9DoSF7rtovWqwKBoj32XIBvGpGkSEt4B1bHzrd4pzMBADkEH643w8gSMZqlj0OA5q X-Received: by 2002:ac8:5981:0:b0:471:bd14:a783 with SMTP id d75a77b69052e-4750b02ff63mr15129971cf.25.1741127294309; Tue, 04 Mar 2025 14:28:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127294; cv=none; d=google.com; s=arc-20240605; b=NuYYTy60fahN4IEd0ZrJHTGuEoiNPwi2XFTYOxV6ZtxRdiCWnzkzyduKZTS34F1JNp INcfjGIw1sQ+Pp1CsbNyw49kwOCqVpvlxHq8qkpSQ3Hs6EsTELEFbVowRPnHDVD9iqwL sQYROGNV0G9LQpz7hrb8IEo4jKbeB+DUr5D504MSQqHB0jYIGYrkMpKxwidCzr+BeC5Y dGA3eC5aDL9tV4jpNx7HLkfLngmE5cRk0mymkAQSPmK60qbhUQ3VHpK2FfkduW5drY6I nUVZY06G47EFJB6v2Z4A0DNm46EjUeTDz0QYDF6A4LtF+ehWGq+GrUjpKONl+K2uXUzL KMxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=TAUG1VLjHRc42q2vET8iAizrXLG97QnhMiOAEe3585Y=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=PdQfsu5VVkPB+m3+ZFN0sGehqYfMmfuYS2iwWLU4dGe60hV2GzGT2SbtK4TB489ULh KX3aBplOBQBBiX0/0/kyklXYV6mrBtv51BQG1Y6sDrGZ/npFM5V5NR3Jc3JJpRBFkEb6 /srn81pL6mISCirJN2o3iivdZfxWkkXXK7RE9vbBYuS1YIhTYFEMpNpp1TNLwisDg8Ec XemM2lgVAulucejID3dGmbdKwfNl43qv+F/8yVYHKpEmzqQ7zolETTtP+6aqIwrCDUxb CmaXACSch5AKdamIJDphlKr/4KdsuxWfEkfchL7/RgPHoJDyQJ9/wnI1EFGWYeB/dP8F KxMw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OjOI5fMe; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4750cb60e43si932361cf.271.2025.03.04.14.28.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:28: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=OjOI5fMe; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpahO-0005aP-N6; Tue, 04 Mar 2025 17:25:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpah0-0005O5-L8 for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:50 -0500 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpagy-0006Ui-1G for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:49 -0500 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-5e4bed34bccso8662200a12.3 for ; Tue, 04 Mar 2025 14:24:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127086; x=1741731886; darn=nongnu.org; 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=TAUG1VLjHRc42q2vET8iAizrXLG97QnhMiOAEe3585Y=; b=OjOI5fMerQKo76eKSRNyrI/xT3v7jvdtUJT3zI/DTMgp01ZHQX+HcMWLYLmLZWgtt9 Jy/X7VO8t90pnBPnAbHxw5MN9eYTrCxns4Lddn+Ft2QNoN+ufU6nYuBJy3rdff9HVmmJ pXE4Ik4BRNjEeguu6v/iabX3lA9SL+V6iqyPpw4xgXd86i00Q6puC16LiCgpqMtMtim3 4Ijp0OOcYxNxCUkEZyQngIafUDJBCayn3j1g+HIBNLAnUEu/1pxglzm2HaolXhbT/gLP zmGZQ2TikKVXzPM9zYFORA/a8LUMrH4hTvHuzZzNXUnCnnkwbnzhxGwcLTVPo4efKYqg 1jDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127086; x=1741731886; 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=TAUG1VLjHRc42q2vET8iAizrXLG97QnhMiOAEe3585Y=; b=G7xnTSeO29+6w2pfFz/yMA3RtGOP7P2dc7XrtcYCSrDiSHju8Z2+GuF2Doo2hliPNm TdehdHiYDejiPReC1lzkLQMCGa8Ff9jGOCpZw7V/VqYNO6PVJr95+w/5vXU48xsg09lk /pKis/TOb2s20SdSqeqJMHzgl4NUmwzbCQr/0XXUDLrydDlhkusZBJqvg+t6cPGAXAKT tnHerxslSUhMg75pkjado8cjKAGJ+xMhCFYnWUZYZiiB3zzjGjFSU6XKQhsLmz7g+7Pz x8ItOu4CsD8asnnhpynb5VXNElsBwxCSuxmI5ZFPQqyQZEmZd8CTeyB2iBEZcl+dPhh1 pr1Q== X-Gm-Message-State: AOJu0YxWfdAJ39JUN5srszG9zPclF56bCnQtcWeX4kVEG/rNWQ59vM5E G2nWumQYOwlOjPZRNWjPqaPYRwK1Qm6KuXs08J4c9LP9Hb2wWXTUMrf9h6JGhF4= X-Gm-Gg: ASbGncvz+V9SMNj536Ko4W/adCLrO1/50AEAVcbyPajjri8incNW5ixkCkx2RHJVi8F GJgqlCioc1t2CELJbRFPXqQZZHlp6A5fh6VtUscdrfA8oI10i24nIrWp+h1sTt0eyUtdrPg0jK/ 4FXzcnAaOI4Fd2EhRlqgaEWAD5I3i7MRNhwBhXsvUQL/ps0tgGwr4tC7jNm4ScJqATeiKV5532U mZWmeZU0dB+h76qAmRKZ3PnjalKhm+lnhZxi9UIKrTAnOkZJysb0De3O5dJ1+jJUcWa3LJ9njq/ 7KHNfSoUyr/ZDYuBDHgQqp34je0bvi6mJE/ysRpc0mhZDbk= X-Received: by 2002:a17:907:7d93:b0:abf:6cc9:7ef5 with SMTP id a640c23a62f3a-ac20db05bc9mr102150066b.47.1741127085711; Tue, 04 Mar 2025 14:24:45 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abf5453f468sm663503566b.51.2025.03.04.14.24.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:41 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id ECB705FCF6; Tue, 4 Mar 2025 22:24:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 06/32] tests/functional: expand tests to cover virgl Date: Tue, 4 Mar 2025 22:24:13 +0000 Message-Id: <20250304222439.2035603-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 Add two more test modes using glmark2-wayland to exercise the OpenGL pass-through modes with virgl. Virgl can run with or without the hostmem blob support. To avoid repeating ourselves too much we make the initial pass a simple --validate pass. We might want to eventually add more directed tests and individual features later on but the glmark/vkmark tests are a good general smoke test for accelerated 3D. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20250226140343.3907080-5-alex.bennee@linaro.org> --- v2 - re-base with re-factor and don't run whole suite of glmark on both virgl builds --- tests/functional/test_aarch64_virt_gpu.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index 55957dae0a..3fdb31f034 100755 --- a/tests/functional/test_aarch64_virt_gpu.py +++ b/tests/functional/test_aarch64_virt_gpu.py @@ -92,6 +92,28 @@ def _run_virt_weston_test(self, cmd, fail = None): full_cmd = f"weston -B headless --renderer gl --shell kiosk -- {cmd}" ec_and_wait(self, full_cmd, OK_CMD, fail) + @skipIfMissingCommands('zstd') + def test_aarch64_virt_with_virgl_gpu(self): + + self.require_device('virtio-gpu-gl-pci') + + self._launch_virt_gpu("virtio-gpu-gl-pci") + + # subset of the glmark tests + tests = " ".join([f"-b {test}" for test in + ["build", "texture", "shading", + "bump", "desktop", "buffer"]]) + + self._run_virt_weston_test("glmark2-wayland --validate " + tests) + + @skipIfMissingCommands('zstd') + def test_aarch64_virt_with_virgl_blobs_gpu(self): + + self.require_device('virtio-gpu-gl-pci') + + self._launch_virt_gpu("virtio-gpu-gl-pci,hostmem=4G,blob=on") + self._run_virt_weston_test("glmark2-wayland -b:duration=1.0") + @skipIfMissingCommands('zstd') def test_aarch64_virt_with_vulkan_gpu(self): From patchwork Tue Mar 4 22:24:14 2025 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: 870126 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp492667wrg; Tue, 4 Mar 2025 14:26:25 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUW2US80uRAGnzyj3cxUss3O6bZij62t2PfsiL2vER4IXWET/2WFi7K4ZtHJJzxARevYDF2FQ==@linaro.org X-Google-Smtp-Source: AGHT+IGxu07aUftaZ4b+UHgla2Cn3+gME7Dl1P3gcF3rW+Tnqk7ohKEYzIrn+wvJRpgGrIrU8k2r X-Received: by 2002:a05:6214:e47:b0:6e4:2c6e:7cdc with SMTP id 6a1803df08f44-6e8e6d69efbmr15235196d6.25.1741127185018; Tue, 04 Mar 2025 14:26:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127185; cv=none; d=google.com; s=arc-20240605; b=c4+gszLjFmDOOBqg0n1UlvXQqnwR3PbJi7mzJ4TO1vY48izGbG882GNCUQlQ8Z/xHQ 6xMruK/toDqcuRa1zCYSGepVWV81U7aDxvuJRzzUKHpCkQki4QJTZDNBxCGT/7lI4ad4 NufzZHo9ig/i9mcd3Csb4X9xsrW2/Nc11RzjzFqrkeXdjLYRvxgcKdTItinOd/3IURHW LQ3T9q76BRI0yBvmdiQR7YHnX4cmnFAeH/h2yvo2bu7DiX+15cR8m7YznOUIhRlI48gs mwedG69spZnaRZgxRHVkW/yV0DbsUpurWME5yunBY+KJKDxqRA7YvQEnB7j64sL142jx w8ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=KnSHjGtDRpaEDbyYC8kppAAfhPC7ZbGjHbQwEVFXiqQ=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=CPlgooAQ+2jTe5SMTrrzQubhaLQ1ZrooWSAETv4Y2uQQtnyMNrVqwmhKxkEJhZbkXO /keyGwVkIurg8NtJ/zb3xe9cpCGqh4JowKQOU07GtFpX9C2hRg/QcX+pG9eCGDcHD5jy snyvOqdl4UQ/UicOhR4lI70jRQeyCdwb7Oc995o3zFQC9bUeY3SxGdMC1Lehs2/+4xHP HYdHnmpUjt3UVjmUC0JzRgbOkCZYLA6W8Qt+ZgIRG4nk56v/BInqpwFZIgl5isPsgU5D 8LjUzmj/aEX0BKwV2Rf/r/xL9hlkT7G0YdZRsShoN2BEvwFhrnkE81bTMiBJ/GuE0xAb wk2w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FjzdPsQV; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e8975e78f6si114720896d6.95.2025.03.04.14.26.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:26:24 -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=FjzdPsQV; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpahN-0005Tz-S1; Tue, 04 Mar 2025 17:25:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpagx-0005LK-5c for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:48 -0500 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpagu-0006TV-He for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:46 -0500 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-ac202264f9cso144153866b.0 for ; Tue, 04 Mar 2025 14:24:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127083; x=1741731883; darn=nongnu.org; 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=KnSHjGtDRpaEDbyYC8kppAAfhPC7ZbGjHbQwEVFXiqQ=; b=FjzdPsQVs0FEx5CrD6hhu4BB5yiRKHblofXS3IK6gweEDFF6SG2XacuHtfKoEhqMgc iiTpk6sajjb+uWCa/B6DIXCW3CXaqUBk8FUnkhR54KjtstcZ1/9EReP4mPPZWTBIKoyG r7FtLY+ijKi43ZDEtAUQymkTJbZzocBoEBIrY3nsh7v5TjGFc6AP9HziVmaS5xFCttv8 B9OvKXJwkHkox/O7yepQfEOiM4ruzSXmiVDq35ITZJmxDbl8ox97Eo3AIuQLReArrG4x YSZTF3uh1qX4Cjylrw67/J69jSK5sLgsWnrpCxlsVn8l+uBUu0ah3Q9uUQzW+ueA9WaY vUrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127083; x=1741731883; 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=KnSHjGtDRpaEDbyYC8kppAAfhPC7ZbGjHbQwEVFXiqQ=; b=JQtyG7piXePn0WPgYogNDINqybNvjFOkPASmAAO+QvXYjXouo02vDrVWWq+kWbolnE ZO91CmvviINst8YlljPAgnankw6YurhCh/+/9zt1GrSRU31PURcu8/YMqprkrwD3Qyd6 lLNe6SovJz7ezrf/GxbQoTNFKYDy9ri+VfmB/NAlxG5S8WDH+fhl2zYKNPUZLLbx2LmJ sbMl7VYG/1XXFY7cknk38XnwPIYauIVwJFa3bvQnrRSyINnhv0EF88DK6865YZJCaqd7 VFbTFacos0ZbJUqfiNxy4hi11Ru6o05pVTJ7J8hyqWwIjYhDrV8Qx2gD0uoous86+ddO VTWg== X-Gm-Message-State: AOJu0YypN2PRJlptNwD7koSd47LHy3j1ieONpRstN8APmFD2Pis32yq4 mks+YuzC0QsQHYRzTYjS2RKHm61YhqFCqnYdRzDwfBHwDYPL1Gls/dGSNOf9udg= X-Gm-Gg: ASbGncuAcw9qBuV/8rZorPjERS/AQhqSG+6W8d1gxRtd7k/0k8pxwvEWQKwcw6Z62kQ KpgyOhB5QyQfikZPj/HP6pctfeUPE2x9xF4cpXs3bt8TPkrJ5FhVClEyDwEW5NvhDbGjPvD2XzX cvtO65wRiguLM1kVwtC7Id1vcwFbc6smlh+kisAdWJIF8N9XUdDI5CIVJGF9wN4J9cvoSl8e/dp 6t3EG8z1gL8NLY4Wd6OP6/jH+f0ogo5ya+A3b0u91CJ774TOKVe1pve3hXg5j1P5bKNeY6jPb8F 0IG6WUMZ/fI1HZTqUjFD5sxAhF7x8H8r7tVxBcMG874is84= X-Received: by 2002:a17:907:7247:b0:ac1:de14:6d6d with SMTP id a640c23a62f3a-ac20db37f95mr73021066b.28.1741127082771; Tue, 04 Mar 2025 14:24:42 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abf4f8a2035sm692348266b.107.2025.03.04.14.24.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:41 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 0DE725FD05; Tue, 4 Mar 2025 22:24:40 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 07/32] tests/functional: update the aarch64_virg_gpu images Date: Tue, 4 Mar 2025 22:24:14 +0000 Message-Id: <20250304222439.2035603-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x632.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 Update to the most recent aarch64_virt_gpu image. The principle differences are: - target a v8.0 baseline CPU - latest vkmark (2025.1) - actually uses the rootfs (previously was initrd) - rootfs includes more testing tools for interactive use See README.md in https://fileserver.linaro.org/s/ce5jXBFinPxtEdx for details about the image creation and the buildroot config. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- tests/functional/test_aarch64_virt_gpu.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index 3fdb31f034..e417ca9beb 100755 --- a/tests/functional/test_aarch64_virt_gpu.py +++ b/tests/functional/test_aarch64_virt_gpu.py @@ -25,14 +25,14 @@ class Aarch64VirtGPUMachine(LinuxKernelTest): ASSET_VIRT_GPU_KERNEL = Asset( 'https://fileserver.linaro.org/s/ce5jXBFinPxtEdx/' 'download?path=%2F&files=' - 'Image', - '89e5099d26166204cc5ca4bb6d1a11b92c217e1f82ec67e3ba363d09157462f6') + 'Image.6.12.16.aarch64', + '7888c51c55d37e86bbbdeb5acea9f08c34e6b0f03c1f5b2463285f6a6f6eec8b') ASSET_VIRT_GPU_ROOTFS = Asset( 'https://fileserver.linaro.org/s/ce5jXBFinPxtEdx/' 'download?path=%2F&files=' - 'rootfs.ext4.zstd', - '792da7573f5dc2913ddb7c638151d4a6b2d028a4cb2afb38add513c1924bdad4') + 'rootfs.aarch64.ext2.zstd', + 'd45118c899420b7e673f1539a37a35480134b3e36e3a59e2cb69b1781cbb14ef') def _launch_virt_gpu(self, gpu_device): @@ -47,7 +47,7 @@ def _launch_virt_gpu(self, gpu_device): 'console=ttyAMA0 root=/dev/vda') self.vm.add_args("-accel", "tcg") - self.vm.add_args("-cpu", "neoverse-v1,pauth-impdef=on") + self.vm.add_args("-cpu", "cortex-a72") self.vm.add_args("-machine", "virt,gic-version=max", '-kernel', kernel_path, '-append', kernel_command_line) From patchwork Tue Mar 4 22:24:15 2025 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: 870130 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp492853wrg; Tue, 4 Mar 2025 14:26:59 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX2nKH1+kn49d9Nt1zuSA7lfSmTmcNx+0bkYhzIemh7dK4UU9BZWjcOk4rljncQFsOuKFLMIw==@linaro.org X-Google-Smtp-Source: AGHT+IGnuxatk3tOqBGW62NFnCV4GAuGrJ1k9h2s6YsBiROdYidqGRVSnTolyc/onSQnvIUb4kZ+ X-Received: by 2002:ad4:5cec:0:b0:6d8:8109:a547 with SMTP id 6a1803df08f44-6e8e6d85620mr12497316d6.22.1741127219038; Tue, 04 Mar 2025 14:26:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127219; cv=none; d=google.com; s=arc-20240605; b=OyXProdMfvHiDpAMKjy8XvzPI4gp3d/VFcb3GhP5DFybeMp//0Q9JSm9AmofZwG5ik jUhEYGUsNL478A1IuJGzZ8EomC/u9VfeeCH/Eg1P8vb9XuRcnA6Vfxr6sS2sxajGnY4C mUJ2VA8Gix09New2oXaVuSX4WUoG8J4cVDeAsQHoT9dWr1+pUSZWadp8nJ5yGI8dIkNc EwbUze3WiOezXPQK53qJfIDtwn/LYeQ9Ipx8OKVqLYA0UDuWcz6bPc9xLr1475UkW4sH b6gsTtCi2JVQeocqdt6Yx60Qz3UVu08Fs8cgP3sRo+VaLW15mQGCLgu+sUinkubM9UGX r6Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=Onp89pSroQtMObXGq9VTrbTAFH+9BfAPDxoO68vbwOU=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=fkxNKTHQ3Z+mUAOjo/3GoA+zgRo+ZCvUf+/K2TqLmFHZioaPF276daGyabTfKG/AHz ROPAauWHlQ4hP8OFF1qa1+e7+vmEX2DqYln+PhxxrkAKRGWmHIGtxAW0mTZ4ZD3qXaht ARkweqqifX0ePKpxSLYs9Dn9LICIpYtLCMNHQGtXRD+nXW/4wL61JxCU4bls1AiXoT0e rjPnU5GjhMb72zJ0Wv5PV3QcBt+FkOy1mtK0ULhULPeLWHFBuRpYCDWMLQq1yLDXN5gK g9uAjncyFrZgY9eebMUSdqjT4CR6Fsrs/mg53gKwCn4wxddJX2bS8ADilHW0u8ilcnhV xrzg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="zsN/zYzm"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-474e3c4c1d4si52387381cf.303.2025.03.04.14.26.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:26: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="zsN/zYzm"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpah3-0005PS-BU; Tue, 04 Mar 2025 17:24:53 -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 1tpagx-0005LM-GD for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:48 -0500 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpagv-0006Tb-9D for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:47 -0500 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-abf615d5f31so622722966b.2 for ; Tue, 04 Mar 2025 14:24:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127083; x=1741731883; darn=nongnu.org; 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=Onp89pSroQtMObXGq9VTrbTAFH+9BfAPDxoO68vbwOU=; b=zsN/zYzm/xTyGUT5QEsRcbhx/5NCsXvuZXhvlrPBpn0pD7lWKdcuWi+BBgC5FYTJEG 3UabGvVaB5zFh6/PuPYDvqxDXxpqtX23Kqqp6yQ7yehszXUKxE7TkIm3+mcrsIzyR5tE E1id52tjeyvT8EaxnEYzrmlPnIzQoZ/49ZnLmLnL5VjQUZRsgCdaQs1Oei87FcqJi64T NccJhKCDyvbE/HN1ZE/UqHL+nHrLX2IwJJ4LKqEbX4ljZLnQnYudzdbSdTuZxxx/bKVs DR77eV+ihMGP1AMJeMt1vlpOwb4ZaOiQGti7CGzKiZzdhi3rDjs1kAIeq/5wp4T9trSU M2qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127083; x=1741731883; 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=Onp89pSroQtMObXGq9VTrbTAFH+9BfAPDxoO68vbwOU=; b=KrSY4GLjUCLBdy1eEDU2jGwtswqeO6UtsCNQ93cDJyOWJWpINr+/2ES+kSvz8YnmNE FB8EMi2HisFxXvfCqtI2D4XIpupidqjbRPjVyAnJb5w+UEG/CF/LzCATz3ZL4nOWZiSI RgA6XtXTnucGmPqaTb+Zmf7l7K93Dac2pO1BKDFEwkbag76NNeq2L85fac8bvWOhsgUP +WTAyeIUd0I/RFYhtApbjb3hNQoKAqkoH4sx3gOnjHxrvkTArrwoxePBBStjHnGipr97 ReKR9RzLQfkPTSYBUSy3xsvetj5Zh/WI2fG15L665u1aYUcf8hiplX0FSTPuxIIBPR9Q vERA== X-Gm-Message-State: AOJu0YxGNKGUEq1evja78uoA7OyThBTgXmKca+88R5fO9ST7CONW5ZEq x8GINV5z61maxvn+e89ZT3fXDAuZEAmJ7VR86PE8SfxAv4hqK4pvcHnSmogjicY= X-Gm-Gg: ASbGncv/lWoV9DrL3yFgSUs5aKonLw+pAqvz+Cl1kkGZjknZIFigml5mk9ulXTEqNS+ Fg7qyaTtnW6ZZ1N9vLZsHJN/wbSWULF3BRNr4uiTG7h/lBSuYVvQc3xHFUEm38K+3L4Smbx/N3I ViIgpadCGX9xzu60fu7XRWGmsNO+ffNKUIsZVoATRrKg4NVBIX6G5hsHWhYmBVzCwfhV+BKna1+ Hsp+sKcUufGxXRTpGvIzNqEq8k5Ms6snDcbMPlGSvX0PnsugY5oMsMsavUcXUuYkaVd5TyFGxnU LOZVaABnq8Pli9ZakY1B52V2IrtfWzSxy44MGoyQMD/5McA= X-Received: by 2002:a17:907:2d12:b0:abf:5aea:a584 with SMTP id a640c23a62f3a-ac20dade8dbmr83852866b.38.1741127083223; Tue, 04 Mar 2025 14:24:43 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac1e7fa6246sm252666366b.167.2025.03.04.14.24.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:41 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 29E675FD17; Tue, 4 Mar 2025 22:24:40 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 08/32] plugins: add explicit dependency in functional tests Date: Tue, 4 Mar 2025 22:24:15 +0000 Message-Id: <20250304222439.2035603-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62d.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Pierrick Bouvier ./tests/functional/test_aarch64_tcg_plugins.py needs to have plugin libinsn built. However, it's not listed as a dependency, so meson can't know it needs to be built. Thus, we keep track of all plugins, and add them as an explicit dependency. Fixes: 4c134d07b9e ("tests: add a new set of tests to exercise plugins") Signed-off-by: Pierrick Bouvier Tested-by: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20250220080215.49165-2-philmd@linaro.org> Signed-off-by: Alex Bennée --- meson.build | 1 + contrib/plugins/meson.build | 2 ++ tests/functional/meson.build | 2 +- tests/tcg/plugins/meson.build | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 0a2c61d2bf..8d0abe7f12 100644 --- a/meson.build +++ b/meson.build @@ -3662,6 +3662,7 @@ qtest_module_ss = ss.source_set() modules = {} target_modules = {} +plugin_modules = [] hw_arch = {} target_arch = {} target_system_arch = {} diff --git a/contrib/plugins/meson.build b/contrib/plugins/meson.build index 484b9a808c..fa8a426c8b 100644 --- a/contrib/plugins/meson.build +++ b/contrib/plugins/meson.build @@ -26,3 +26,5 @@ if t.length() > 0 else run_target('contrib-plugins', command: find_program('true')) endif + +plugin_modules += t diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 4b492135e0..008d72aed8 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -380,7 +380,7 @@ foreach speed : ['quick', 'thorough'] # 'run_target' logic below & in Makefile.include test('func-' + testname, python, - depends: [test_deps, test_emulator, emulator_modules], + depends: [test_deps, test_emulator, emulator_modules, plugin_modules], env: test_env, args: [testpath], protocol: 'tap', diff --git a/tests/tcg/plugins/meson.build b/tests/tcg/plugins/meson.build index 87a17d67bd..c8cb0626a6 100644 --- a/tests/tcg/plugins/meson.build +++ b/tests/tcg/plugins/meson.build @@ -19,3 +19,5 @@ if t.length() > 0 else run_target('test-plugins', command: find_program('true')) endif + +plugin_modules += t From patchwork Tue Mar 4 22:24:16 2025 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: 870131 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp492983wrg; Tue, 4 Mar 2025 14:27:24 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXYoDIxGttRs2wM9BbZF8hqqUUgn6RzGq+47tt8VvvrSGhet+c+vTBSXtA18ixh7Yk/ugKgaQ==@linaro.org X-Google-Smtp-Source: AGHT+IFiQI7Q8QK4VfuvmDnx7IhNBEdoMC9IlpvaRifxy5RI6iNZUi/i8y0r3ta5lPaEoYmIpOzk X-Received: by 2002:a05:620a:6844:b0:7c3:be4c:860e with SMTP id af79cd13be357-7c3d8e2f33fmr153198385a.15.1741127244221; Tue, 04 Mar 2025 14:27:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127244; cv=none; d=google.com; s=arc-20240605; b=DUBHP6zyBPC4en51M3bZDip0N35K4U/7pNqXiee/0Ieywf7MGyw9eWiJYNfNVf6n+L kYIko9qmjd3dcTzUtmst+KfYy+YVOKUHb7PKbcWE1nTdYOk9LxR0lvfGBsVZHhoCusRK LrvV4czhz2U34afXYeq8Jttx/wCUdP/m6h6G7iGfBONyvsFY8EAy1YagMbtHthohj4DU aJvUEOQa8swJi3WghEbiXWgTc2RD1/1DIk9PibP6icP7xKgNmQZjSMUmKrAKX7HEWceE FrrzBR2zLfPHN4SAnk0zBhxKzeSLzTBthJr0I8KqouZxbuzCV1t5ZBX7qYXZlYSd3SrY sR6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=g9yH45YV1KCpKu1ZOSaE/nQIrSLBn5v2U2clJ5yvvVg=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=QtFrmb64wAusotymDMcxr2pmi6LWYo+3lsCBDYCvMFJ+TxxEIaBNWCZysjJLBvgWpW iajQiF+FQUnVNXXsJklorXVUZkRN9UJTuC5SEzoHHiAoLmRxLZlq8MqmefPnFgbwo6Bb WyJ43GwfIQHwaYHfYVcHTjAsEQgHM2twhCrS3cp2BU80oIMPBuyImXOiid6HD1pUsUxZ dZqV7x2i2XCjESuzzoF9bCaODet4WRoxbjrtmeXBoJcQ+ua28JwTS8T9u420riAiDluW M1BR6gYKcqVwOjNPiyuraff0tPRmfBG+88MdSeXMM9G5NMQr4ifTAMNkmalT/Ayygqf3 UH4Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ULLKoIRz; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c36ff6130esi1141841585a.225.2025.03.04.14.27.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:27:24 -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=ULLKoIRz; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpaiP-0006nm-Pn; Tue, 04 Mar 2025 17:26:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpah2-0005PL-ES for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:52 -0500 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpah0-0006Vu-AP for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:52 -0500 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-5dee07e51aaso11482476a12.3 for ; Tue, 04 Mar 2025 14:24:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127088; x=1741731888; darn=nongnu.org; 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=g9yH45YV1KCpKu1ZOSaE/nQIrSLBn5v2U2clJ5yvvVg=; b=ULLKoIRzcNgiJp8IEqlVPn/vrTJSEfecY9pAKeP0eEDGh+c2ndkR7qUK5v7vp8K1eb +LPmfPSobez0G3SbkUlvM7B30sswjqlwuWn6QmOJP3BpEht6j0CpJS1I9F+/tqqdQn4O grrZ8MhoHVc3d3JmW8GuJrRKVOlwE4G7xq+yUtr6uLgkt+g46CRw3ZWhES05tiRwTid/ VrZvWRpsSiDTEhAoeeZCCgEpRamdA7G9tH4UeyGufqJG4E7ASYJmzwBxRM6o5syhPRjj vpRFuyl6CuwnFWPA+QFWXm8W8rClqIXr5ZT6IwyjcTDUyVNQMEsricCoc6qMgwpa9aqc M33w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127088; x=1741731888; 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=g9yH45YV1KCpKu1ZOSaE/nQIrSLBn5v2U2clJ5yvvVg=; b=dYKzvr6uyVgtGWL3vujbIQTrIjc+sVIOOu5RdwDowlBTvmR1pb1Frf5jAn7mfXHlLr uJ1pEhPJ4jm2WUYmB8ytZek7Ud1YcdEFvFCUYTdrL9lmcaCXFtqP0bkb2zVyBNGx0kJu TpNSY1lOquJb3+gRCSF6TY0Sw4dTgBnlPFAuzeXjrEnqB/HXE2Pz7q5ThLBLDjrU1hex JgGg9+u2K6GwLXk04DEQDiAS2bwvQeLXxLTKosK6dudz4ZZxeFwa7ijm7SOFRO5Jld8t 5JaHLWNhTjoOWXy70BgoLppAQE1BYICqlfVw/l5CQVxPJw8oq9SN1W6U8ygVHiI6sN6W 0dAw== X-Gm-Message-State: AOJu0YzzRTiasIbayRKXM26/muDhVr09qTv1bUi1QzD+83lXUocJQQqN SXvttuKIbou3wb8EYVuOAyKmwZFzoK3lMfXJZUvBwNbUEyImQ6uVtqZ1REC8lq0= X-Gm-Gg: ASbGncv+HreKYhr3sbTsQo7a6I/xQk4SSFMpwYCuyP+8BAB+zwCpHUFpE8+JE3HREcH 1Xq506FM9t7LMdg8BYdjPdpzJJ9NBIqP0eMuIK25G0m9Laz5Qr++iHq66u/Fb+nhj+NZUOpYJAq 5DsYa5gGshHuw36C6GDcEbrwa95zxwH+rf57sWyClKIk7siGPUMndcmT6RdPgQ9/PAddagLjDzS wQ/mcCS39nMrAmHRHJvTyNSn3aIIG9KI7MbmcH4IKeNYQH+Do/DdZ0YgAEXSsufHj0NOM6Cvc8Q HmpV/VmK7f/zsqVkjsLfa6OUwgu1eZK9eoOjcRzjf1Uf1jo= X-Received: by 2002:a17:907:7f29:b0:abf:7a26:c485 with SMTP id a640c23a62f3a-ac20e1dce23mr79596566b.50.1741127088452; Tue, 04 Mar 2025 14:24:48 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abf0c6ee654sm1017650566b.118.2025.03.04.14.24.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:45 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 413395FD22; Tue, 4 Mar 2025 22:24:40 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 09/32] tests/functional: Introduce the dso_suffix() helper Date: Tue, 4 Mar 2025 22:24:16 +0000 Message-Id: <20250304222439.2035603-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x529.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Introduce a helper to get the default shared library suffix used on the host. Suggested-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Thomas Huth Message-Id: <20250226140343.3907080-7-alex.bennee@linaro.org> Message-Id: <20250220080215.49165-3-philmd@linaro.org> [AJB: dropped whitespace cmd.py damage] Signed-off-by: Alex Bennée --- v2 - use simple if ladder for test --- tests/functional/qemu_test/__init__.py | 2 +- tests/functional/qemu_test/config.py | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/functional/qemu_test/__init__.py b/tests/functional/qemu_test/__init__.py index 5c972843a6..45f7befa37 100644 --- a/tests/functional/qemu_test/__init__.py +++ b/tests/functional/qemu_test/__init__.py @@ -7,7 +7,7 @@ from .asset import Asset -from .config import BUILD_DIR +from .config import BUILD_DIR, dso_suffix from .cmd import is_readable_executable_file, \ interrupt_interactive_console_until_pattern, wait_for_console_pattern, \ exec_command, exec_command_and_wait_for_pattern, get_qemu_img, which diff --git a/tests/functional/qemu_test/config.py b/tests/functional/qemu_test/config.py index edd75b7fd0..6d4c9c3ce1 100644 --- a/tests/functional/qemu_test/config.py +++ b/tests/functional/qemu_test/config.py @@ -13,6 +13,7 @@ import os from pathlib import Path +import platform def _source_dir(): @@ -34,3 +35,14 @@ def _build_dir(): raise Exception("Cannot identify build dir, set QEMU_BUILD_ROOT") BUILD_DIR = _build_dir() + +def dso_suffix(): + '''Return the dynamic libraries suffix for the current platform''' + + if platform.system() == "Darwin": + return "dylib" + + if platform.system() == "Windows": + return "dll" + + return "so" From patchwork Tue Mar 4 22:24:17 2025 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: 870141 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp493859wrg; Tue, 4 Mar 2025 14:30:21 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXy4U2k6+/G7X5v6dy5XgVO4dUP0fuyzKiV5Pe7KSfIIdIUWHxeeUn17hb1IUDNPH3/tqOCRA==@linaro.org X-Google-Smtp-Source: AGHT+IH5QgHIN4R7gBrjWQ5RdjvrstzvegwvglwdSGxuQSoplDeWb9AUpK3UNj+lbv/nJ1pY1Gef X-Received: by 2002:ac8:5956:0:b0:475:51c:ceb with SMTP id d75a77b69052e-4750b4580c1mr10182611cf.30.1741127420906; Tue, 04 Mar 2025 14:30:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127420; cv=none; d=google.com; s=arc-20240605; b=JgrPPOMeRwdzsxVD1N2lrln6cDfd3IqOWfySIOw2pAI+hk6WW58zmTMqN/AzHequ/P g+jwQJvmXbMRm+LxlHCpTG12SCE74XA3jJ7m31FY6VOjmME8AaNrGQP7bllflJKHpLrm WcsCWzKE7j7kMqWp6TrVWknFMyucCDLLZ6aRWO+gW0kRwQWnvna0bAUrVKSmx5yqNmZJ 5ulvjQv7G5M3Aie6QmMFyEfEDDM1Qi0RgVzB3s/1jH/puYPxn9o3HFujYiQqrq0KFnWl 8b22f8pMoTjScBA8JLRsUHJcVRB0DMKB4s7go2lxSZ3H0kiNdpLMBB1M52F2voVyzdk8 eg1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=1m7U5T2uale0lc0uqyyH6LsGapDRMZw5OtaQwPrcJTg=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=DshVz98orQ2LGZdaBZ2XfYrFrmyX1RxFRPT1Gb2qn0nqVD68r72zaupimz3iNf3X5+ ejNOV9OttaNvjDosFM4ITjqXbR+8xIFITwQXSDUY4U74dv3VUmQEURzPxTGtA1vNA7eH 820dfmW2z/HRgvubkFQY32CUEe2yYn1LN9mAhEDybQuXbyrnbOeAeeQwxaFSsbNqbLrn 6P7T/XUr/eX5tE7eQalavOEs8EsJZ+E5A0BzEdF/MMchzshCVs6uHRz43vzeseFcpFC1 ojxAcr/72yCWlXcdonqTq2XviSwQ/M0NV5HUi8oNNjJK6G/qH67BJPTCe7FG+Kb2ugmK lplw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jt0/O/CJ"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-474dca9c791si55234761cf.226.2025.03.04.14.30.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:30: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="jt0/O/CJ"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpaiS-00073L-QU; Tue, 04 Mar 2025 17:26:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpah3-0005Q6-MZ for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:59 -0500 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpah1-0006Wn-Hz for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:53 -0500 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-aaec111762bso1130210066b.2 for ; Tue, 04 Mar 2025 14:24:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127090; x=1741731890; darn=nongnu.org; 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=1m7U5T2uale0lc0uqyyH6LsGapDRMZw5OtaQwPrcJTg=; b=jt0/O/CJKSS1ZPibu2DkN1vh4YyEXnJyv/ceyw3/aaFW4f/SEGXCzjZv3s/+G9RkDW ZcmK6KmYGzo7P7V/kGZ0vA9LVoJF9eBC3uZL5Dd7PlxdlMEMqjUsALOgqZkFQX/NOHpw ZruesjTGuBN/gF3ReQMcjjw14qacXeQTuczdp5g7bipF9ZMBNOXHYB9Kp6RvHGyeQdM7 JeSFEJl/DoJNAUNJVzbpmRLX1tRIiHLMGcaX4rtmvyo/oi3ykHaUnDFosHzJkAHlwG4c B6dntzOgxGKk/SEumK3z9u5UfryQQZKpWmAVjLV/avhFiC2FveSJApHpmCl3h80c39/P 8tGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127090; x=1741731890; 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=1m7U5T2uale0lc0uqyyH6LsGapDRMZw5OtaQwPrcJTg=; b=CvE51kTAsnBX52U/ugl5N6vEu3nqX2EvdtKn65FZs8TN+Yi+mb1Y4bpGU+2AV3U3AB nIUcsYG4sKGBaRplhxTn+0xXD8SyEz0/gEY1Rd+j14KYxz0vh7wWA0A8tZgadaAEBKsP Q41rgPjDg0D9LBVUZnPcO91I66TTzDCyUELPyv8FnZsi/FMfCWq5H0OX84RqoqLv3djn bzb+Z4Yyxhv+3hY6K+xSL06XLAgKulI+kT3qnO3+xdtK1bupZpHoTAYK9CKQETErYFPj IIPlRCbU2wnbDNjR432f2EEb17iGHIHB3muIFT9knGr9MweRoq0Bqtb/8hL7pbD/s9E9 6g/g== X-Gm-Message-State: AOJu0YzsRJfqXxIUPib/RVUqvJ++iINODxAa0gxoMCkqeA3IRGbZfCnG 7trqK/Q5gKDZUZfmawAnUzXnYsgWjnaqu8uxTxEY0OPOV5A1oDtyY1CvGracQXM= X-Gm-Gg: ASbGnctM39iS765xD1WoDp/6R0FO1eNOjOKbdfWVkCNePshdNegTgebklkxYng+20b7 SetfhNMq1gmQ7dFWiXoptbYg1J/7sZKUSoWCCGdiTCr+VmgXc3gHFDCgVidHVdo5Gm4gEWzR0N0 9Sr/Ck5bv8ftGdiBVubnjSW+/N76l75cXr0qFGAWRgdcA4ovsnw2hs9/U7pbBzWcSlI9rlhM31A I8m2nohFj7raGrJPZG8PayqTDzolgzrTqnyWGQ5gF+j6cY/rZ/0nVdtxpkCySFzNc4XoMAUxgLw y1VZUczwum06E1KTvbhoBTNqKhgMdVAaAg237tW94fKVFPE= X-Received: by 2002:a17:907:7f8e:b0:abf:6a53:2cd5 with SMTP id a640c23a62f3a-ac20dafc718mr72673666b.48.1741127089633; Tue, 04 Mar 2025 14:24:49 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac165223834sm342885866b.165.2025.03.04.14.24.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:45 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 5873F5FD7E; Tue, 4 Mar 2025 22:24:40 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 10/32] tests/functional: Allow running TCG plugins tests on non-Linux/BSD hosts Date: Tue, 4 Mar 2025 22:24:17 +0000 Message-Id: <20250304222439.2035603-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x632.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Not all platforms use the '.so' suffix for shared libraries, which is how plugins are built. Use the recently introduced dso_suffix() helper to get the proper host suffix. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2804 Suggested-by: Pierrick Bouvier Suggested-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Thomas Huth Message-Id: <20250220080215.49165-4-philmd@linaro.org> [AJB: moved plugin_file into testcase.py] Signed-off-by: Alex Bennée --- v2 - move the plugin_file helper to testcase.py with the other path helpers --- tests/functional/qemu_test/testcase.py | 12 +++++++++++- tests/functional/test_aarch64_tcg_plugins.py | 5 +++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tests/functional/qemu_test/testcase.py b/tests/functional/qemu_test/testcase.py index 869f3949fe..9e1839586b 100644 --- a/tests/functional/qemu_test/testcase.py +++ b/tests/functional/qemu_test/testcase.py @@ -27,7 +27,7 @@ from .archive import archive_extract from .asset import Asset -from .config import BUILD_DIR +from .config import BUILD_DIR, dso_suffix from .uncompress import uncompress @@ -184,6 +184,16 @@ def scratch_file(self, *args): def log_file(self, *args): return str(Path(self.outputdir, *args)) + ''' + @params plugin name + + Return the full path to the plugin taking into account any host OS + specific suffixes. + ''' + def plugin_file(self, plugin_name): + sfx = dso_suffix() + return os.path.join('tests', 'tcg', 'plugins', f'{plugin_name}.{sfx}') + def assets_available(self): for name, asset in vars(self.__class__).items(): if name.startswith("ASSET_") and type(asset) == Asset: diff --git a/tests/functional/test_aarch64_tcg_plugins.py b/tests/functional/test_aarch64_tcg_plugins.py index 7e8beacc83..4ea71f5f88 100755 --- a/tests/functional/test_aarch64_tcg_plugins.py +++ b/tests/functional/test_aarch64_tcg_plugins.py @@ -13,6 +13,7 @@ import tempfile import mmap +import os import re from qemu.machine.machine import VMLaunchFailure @@ -74,7 +75,7 @@ def test_aarch64_virt_insn(self): suffix=".log") self.run_vm(kernel_path, kernel_command_line, - "tests/tcg/plugins/libinsn.so", plugin_log.name, + self.plugin_file('libinsn'), plugin_log.name, console_pattern) with plugin_log as lf, \ @@ -100,7 +101,7 @@ def test_aarch64_virt_insn_icount(self): suffix=".log") self.run_vm(kernel_path, kernel_command_line, - "tests/tcg/plugins/libinsn.so", plugin_log.name, + self.plugin_file('libinsn'), plugin_log.name, console_pattern, args=('-icount', 'shift=1')) From patchwork Tue Mar 4 22:24:18 2025 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: 870142 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp494017wrg; Tue, 4 Mar 2025 14:30:44 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVvOyFCvLfZzfz/xR8nmHeEkHi39w5MFnlC6cjBPCXULrCJY/goafrVjJ1uWHudXaqBmkaZHA==@linaro.org X-Google-Smtp-Source: AGHT+IHP5lomE8pprktFEDqfRfx5+qELLO0crAHaYQu/XDglkCufoY+s8jRtjqqkQj/Wa3jfkROp X-Received: by 2002:a05:620a:1d09:b0:7c0:bd0c:2f34 with SMTP id af79cd13be357-7c3d8ef2e18mr213847285a.48.1741127443812; Tue, 04 Mar 2025 14:30:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127443; cv=none; d=google.com; s=arc-20240605; b=UieUsOWjMC4k8+A+mIinJ+xco5eMLo5LEcP76sd4w/1Vlzq/zkzFw9M8A+inZqaRf0 6I+LefqrfIKPs+p7t1uBbC5rGWCgnXP2Mf1bgG3m0RUTXjxVZWhj3KAVtGdNHiAz2V7o h2e7JnA6fTgkEzTXdpthbbQcgX1RwsZDOxbfDRIT99cCT8ku83T5AHtyviEBGogA+l2T 2ZNoSdm843ZB0E7OEFk/M4cHZ3q6nB3lJ6T+fFXd8PWsSCn9UDErvuC442yZKKKEgeFr ++9/IJZw+iYMPGd/fUsbZZgOH5jIJaNqSPdNeZymosilyzH5F+gAi8T0ClsihogH2/xv dF0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=4ChjuR2jDGhR694vtAFHn3tQFjuCNzfk89rx1GhCEow=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=Y+vBLAbDmCczxWdiKQxOz0hWCaYPLB/6ImwtF7aGMejeQKC73UyHZTW5toxXKmg1G/ Wu1t/9v8MEqZeytR09quh/cuvYZCfHqpfxcGDwUpedxOBY34HHhCGZZz+blr2evNW1Vs kZYey4FmSOWlILkJjZobp6qJe8wQqQZUmmv2imJGzpwcshTY7Bs/ZTGyD0h71ZvlF+hu Uf3hCAkFTtko5DOQwpG3U7w7j4DbeXWGjHxEdieB1WQYPSTvAnKfn4A1gJOriSnVE3XT joKvIMsYee/eM6U97zKcBwPEM/EZxdNbMO5VxBLp1vcrMi7Uffi1jsfWRgiKwGp+6Pa1 bc1w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xwMgNeTQ; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3d67814basi98420285a.51.2025.03.04.14.30.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:30:43 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xwMgNeTQ; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpaiR-0006xg-CW; Tue, 04 Mar 2025 17:26:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpah9-0005ST-F9 for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:25:09 -0500 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpah4-0006YK-6o for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:57 -0500 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-abec8b750ebso1067405166b.0 for ; Tue, 04 Mar 2025 14:24:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127092; x=1741731892; darn=nongnu.org; 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=4ChjuR2jDGhR694vtAFHn3tQFjuCNzfk89rx1GhCEow=; b=xwMgNeTQeRADVFudaIjA2aPYyKFDFAMNcgfOtg80qZafzBGzSlCmAZ6Rfp5PYhQYse 1PbOrVpvQnbtCtNsoPZvkEsfJ+UVpja/cnIc4ccqCD2r/qBcGcuak5ZvwJFOX3VBmdO5 w+FUoNFya+/Y3hmAjy+i8RFjoLQqwwdJ+u9Xv/Ji6YdldYvfMvJW0hjk5KG6Gk0nZ9nJ b+6T1QOG3GOUewvuirAMCvb5jF7MKYAYJk320D3m1r5UE8LRg4WJHwoClXBDSXyYhHKF 2PdMqwUhImMSb2DVJ//LiXgh2dStbffBhNTMS6lGo+wqPeWBRwotIH9dP2r7iKhTEW/Y 3dsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127092; x=1741731892; 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=4ChjuR2jDGhR694vtAFHn3tQFjuCNzfk89rx1GhCEow=; b=Mvn0oLC4+JIEeEqWaoR5H97hVTSQxphXjkM9FBXHKV8cPWKh/6XX+ykQvEco/vA/TM q3F8gCgWAkdpZdW+g4sWe6sPmOKhnimaJrM+t7EL0x7UL0EQc32elWULOzspxwTF3qJL WsLcaKcNAfprNVSzijdHyDxnOHGEpS89WPDhtFuODgkMNXq3XoRQ9TO2R62KsIAd4/J8 MjkWNd/wTl1rE/VxBCIYe6rMJdSRxEoVvYeZS8jQ7siOhgjsdeORrp2huhoF0QSpTy4N O52X8tnbCQMmGyOY80IbMlxFEBEzCejep4MKImyvHIEdRS5x5uNdcTweTPzuGnfjn0yc CCMg== X-Gm-Message-State: AOJu0YxpLl5GcNgGRWwk1RFXAVp3UFyUGGlA1ARLrWPZPpbCWwUXi7jM TbkTJm/UX/8IKL3A6d4G0UlTS10AoC5Nzxpg2zE6KFqDzfUbA0+G5AyZHJ4bCms= X-Gm-Gg: ASbGncut+9D/C/IRUJ58LSucIdEk7SuC8XkolHrBMUcejLstPI0UNNOgVl8hKeJ9rFM zS8I492rLuIpif9LscTh29V+rE5US9R0niIQ8SqZxhIhlkFPbgLVsFler6la6xtnDordj4yWaUc Gch5v+t/VsZ+z45y5dlroz5bWGBCr1W6y8SzW7T3mZ3kZM/BRKE+wsIGlPXioM39JfzbYnyXsTN /nCJ5nYDiL2sL9NH6QHYlta3d2EATKbI1EnOw2E9CFfcJ/VAM7+t9bLFSIafkrVeyyDZ/FEKLpv J8v1jf9YO9HsIRu/YgSwXFeXHJJGrWlN1+5Jd/6BPD984vM= X-Received: by 2002:a17:907:2d92:b0:ab9:63bf:8105 with SMTP id a640c23a62f3a-ac20da4e5ecmr99678466b.1.1741127092214; Tue, 04 Mar 2025 14:24:52 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abf46a3ac00sm737706566b.25.2025.03.04.14.24.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:45 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 891625FDAC; Tue, 4 Mar 2025 22:24:40 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 11/32] libvirt-ci: bump to latest for vulkan-tools Date: Tue, 4 Mar 2025 22:24:18 +0000 Message-Id: <20250304222439.2035603-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x635.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 alpine baseline has also been updated in the meantime so we need to address that while we are at it. Message-Id: <20250226140343.3907080-10-alex.bennee@linaro.org> Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée --- v2 - libvirt-ci MR now merged --- .gitlab-ci.d/cirrus/freebsd-14.vars | 2 +- .gitlab-ci.d/cirrus/macos-14.vars | 2 +- scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml | 1 + scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml | 1 + tests/docker/dockerfiles/alpine.docker | 5 +++-- tests/docker/dockerfiles/centos9.docker | 1 + tests/docker/dockerfiles/debian-amd64-cross.docker | 3 ++- tests/docker/dockerfiles/debian-arm64-cross.docker | 3 ++- tests/docker/dockerfiles/debian-armhf-cross.docker | 3 ++- tests/docker/dockerfiles/debian-i686-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.docker | 3 ++- tests/docker/dockerfiles/fedora-rust-nightly.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/ubuntu2204.docker | 1 + tests/lcitool/libvirt-ci | 2 +- tests/lcitool/projects/qemu.yml | 1 + tests/lcitool/refresh | 2 +- tests/vm/generated/freebsd.json | 1 + 24 files changed, 35 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-14.vars b/.gitlab-ci.d/cirrus/freebsd-14.vars index 0997c47af5..19ca0d3663 100644 --- a/.gitlab-ci.d/cirrus/freebsd-14.vars +++ b/.gitlab-ci.d/cirrus/freebsd-14.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip' -PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache4 cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk-vnc gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle ninja opencv pixman pkgconf png py311-numpy py311-pillow py311-pip py311-pyyaml py311-sphinx py311-sphinx_rtd_theme py311-tomli python3 rpm2cpio rust rust-bindgen-cli sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 xorriso zstd' +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache4 cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk-vnc gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle ninja opencv pixman pkgconf png py311-numpy py311-pillow py311-pip py311-pyyaml py311-sphinx py311-sphinx_rtd_theme py311-tomli python3 rpm2cpio rust rust-bindgen-cli sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 vulkan-tools xorriso zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/macos-14.vars b/.gitlab-ci.d/cirrus/macos-14.vars index 25dff322e6..b039465f56 100644 --- a/.gitlab-ci.d/cirrus/macos-14.vars +++ b/.gitlab-ci.d/cirrus/macos-14.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 bindgen bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 gtk-vnc jemalloc jpeg-turbo json-c libcbor libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio rust sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd' +PKGS='bash bc bindgen bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 gtk-vnc jemalloc jpeg-turbo json-c libcbor libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio rust sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 vulkan-tools xorriso zlib zstd' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli' PYTHON='/opt/homebrew/bin/python3' diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml b/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml index 288156d1e4..dbcd2e076d 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml @@ -123,6 +123,7 @@ packages: - tar - tesseract-ocr - tesseract-ocr-eng + - vulkan-tools - xorriso - zlib1g-dev - zstd diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml b/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml index d497139ef3..4b8ee3d885 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml @@ -121,6 +121,7 @@ packages: - tar - tesseract-ocr - tesseract-ocr-eng + - vulkan-tools - xorriso - zlib1g-dev - zstd diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index f87c40fbfe..bf3bd5a30d 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all alpine-319 qemu +# $ lcitool dockerfile --layers all alpine-321 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/alpine:3.19 +FROM docker.io/library/alpine:3.21 RUN apk update && \ apk upgrade && \ @@ -111,6 +111,7 @@ RUN apk update && \ vde2-dev \ virglrenderer-dev \ vte3-dev \ + vulkan-tools \ which \ xen-dev \ xorriso \ diff --git a/tests/docker/dockerfiles/centos9.docker b/tests/docker/dockerfiles/centos9.docker index a9681c8a96..a942835a1d 100644 --- a/tests/docker/dockerfiles/centos9.docker +++ b/tests/docker/dockerfiles/centos9.docker @@ -115,6 +115,7 @@ RUN dnf distro-sync -y && \ usbredir-devel \ util-linux \ vte291-devel \ + vulkan-tools \ which \ xorriso \ zlib-devel \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 644fd3734d..0535585428 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zstd && \ eatmydata apt-get autoremove -y && \ @@ -135,7 +136,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsndio-dev:amd64 \ libspice-protocol-dev:amd64 \ libspice-server-dev:amd64 \ - libssh-gcrypt-dev:amd64 \ + libssh-dev:amd64 \ libsystemd-dev:amd64 \ libtasn1-6-dev:amd64 \ libubsan1:amd64 \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index 060da53796..6b1e4fc827 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zstd && \ eatmydata apt-get autoremove -y && \ @@ -134,7 +135,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsndio-dev:arm64 \ libspice-protocol-dev:arm64 \ libspice-server-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libsystemd-dev:arm64 \ libtasn1-6-dev:arm64 \ libubsan1:arm64 \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index a481fc9695..cf0fe63af9 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zstd && \ eatmydata apt-get autoremove -y && \ @@ -134,7 +135,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsndio-dev:armhf \ libspice-protocol-dev:armhf \ libspice-server-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libsystemd-dev:armhf \ libtasn1-6-dev:armhf \ libubsan1:armhf \ diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker index 61bc361e85..1c84dfb945 100644 --- a/tests/docker/dockerfiles/debian-i686-cross.docker +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zstd && \ eatmydata apt-get autoremove -y && \ @@ -134,7 +135,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsndio-dev:i386 \ libspice-protocol-dev:i386 \ libspice-server-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libsystemd-dev:i386 \ libtasn1-6-dev:i386 \ libubsan1:i386 \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index 9f6c4763c5..257204eae4 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zstd && \ eatmydata apt-get autoremove -y && \ @@ -133,7 +134,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsndio-dev:mips64el \ libspice-protocol-dev:mips64el \ libspice-server-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libsystemd-dev:mips64el \ libtasn1-6-dev:mips64el \ libudev-dev:mips64el \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index 2e979111e0..395c84d65b 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zstd && \ eatmydata apt-get autoremove -y && \ @@ -133,7 +134,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsndio-dev:mipsel \ libspice-protocol-dev:mipsel \ libspice-server-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libsystemd-dev:mipsel \ libtasn1-6-dev:mipsel \ libudev-dev:mipsel \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 8ee450dba0..1ae227ccde 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zstd && \ eatmydata apt-get autoremove -y && \ @@ -134,7 +135,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsndio-dev:ppc64el \ libspice-protocol-dev:ppc64el \ libspice-server-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libsystemd-dev:ppc64el \ libtasn1-6-dev:ppc64el \ libubsan1:ppc64el \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index f451a07c4c..afa81a57ba 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zstd && \ eatmydata apt-get autoremove -y && \ @@ -133,7 +134,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsnappy-dev:s390x \ libsndio-dev:s390x \ libspice-protocol-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libsystemd-dev:s390x \ libtasn1-6-dev:s390x \ libubsan1:s390x \ diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker index 505330a9e2..5b3bac43cc 100644 --- a/tests/docker/dockerfiles/debian.docker +++ b/tests/docker/dockerfiles/debian.docker @@ -87,7 +87,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsndio-dev \ libspice-protocol-dev \ libspice-server-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libsystemd-dev \ libtasn1-6-dev \ libubsan1 \ @@ -131,6 +131,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zlib1g-dev \ zstd && \ diff --git a/tests/docker/dockerfiles/fedora-rust-nightly.docker b/tests/docker/dockerfiles/fedora-rust-nightly.docker index a8e4fb279a..fe4a6ed48d 100644 --- a/tests/docker/dockerfiles/fedora-rust-nightly.docker +++ b/tests/docker/dockerfiles/fedora-rust-nightly.docker @@ -132,6 +132,7 @@ exec "$@"\n' > /usr/bin/nosync && \ util-linux \ virglrenderer-devel \ vte291-devel \ + vulkan-tools \ which \ xen-devel \ xorriso \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 7dc3eb03f5..a950344402 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -61,6 +61,7 @@ exec "$@"\n' > /usr/bin/nosync && \ tesseract \ tesseract-langpack-eng \ util-linux \ + vulkan-tools \ which \ xorriso \ zstd && \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index b64399af66..014e3ccf17 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -132,6 +132,7 @@ exec "$@"\n' > /usr/bin/nosync && \ util-linux \ virglrenderer-devel \ vte291-devel \ + vulkan-tools \ which \ xen-devel \ xorriso \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 4d5fb3e3a1..e90225dc23 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -115,6 +115,7 @@ RUN zypper update -y && \ util-linux \ virglrenderer-devel \ vte-devel \ + vulkan-tools \ which \ xen-devel \ xorriso \ diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker index e1b70b536d..88ce4ef9a9 100644 --- a/tests/docker/dockerfiles/ubuntu2204.docker +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -130,6 +130,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zlib1g-dev \ zstd && \ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index b6a65806bc..18c4bfe02c 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit b6a65806bc9b2b56985f5e97c936b77c7e7a99fc +Subproject commit 18c4bfe02c467e5639bf9a687139735ccd7a3fff diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index 80bcac0902..c07242f272 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -122,6 +122,7 @@ packages: - usbredir - virglrenderer - vte + - vulkan-tools - which - xen - xorriso diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 53f8d2585f..aa551aca9b 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -163,7 +163,7 @@ try: # # Standard native builds # - generate_dockerfile("alpine", "alpine-319") + generate_dockerfile("alpine", "alpine-321") generate_dockerfile("centos9", "centos-stream-9") generate_dockerfile("debian", "debian-12", trailer="".join(debian12_extras)) diff --git a/tests/vm/generated/freebsd.json b/tests/vm/generated/freebsd.json index 81fc38d798..c03e1cd586 100644 --- a/tests/vm/generated/freebsd.json +++ b/tests/vm/generated/freebsd.json @@ -73,6 +73,7 @@ "usbredir", "virglrenderer", "vte3", + "vulkan-tools", "xorriso", "zstd" ], From patchwork Tue Mar 4 22:24:19 2025 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: 870128 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp492811wrg; Tue, 4 Mar 2025 14:26:50 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV1haflnzWQBCW6nqQ5vLPWpr3GLA+rAZUOHdRibPqqcQfYCtFI4z9czGmqE0qqqetopYOKdw==@linaro.org X-Google-Smtp-Source: AGHT+IFByH8WgF2uaYwUlwI5TVB1pPzN+GAsqhLS0+f+tIFfAvVXUBjMaFA6TbGftHiHgyUC+OjO X-Received: by 2002:a05:6214:c48:b0:6e8:952a:240 with SMTP id 6a1803df08f44-6e8e6d1366emr14579836d6.32.1741127210666; Tue, 04 Mar 2025 14:26:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127210; cv=none; d=google.com; s=arc-20240605; b=ZhIzuXFhXe52GyzqZ7ta5U/YswryqmRYulwhJV5O/WLvj9WLSMS3PMVDwQm7tOJqbq 7PjRBLGDrbXuVlV5qcGoLOBi0c0x9WO//MTutxyDj1TGmWR2//bDKY1c/EUa+UyzbHu0 wsetSYbANlesxvppGkzTs8hCFq5rG76TQYPKvdnjRUlBJ6RU2fc5vYy4rUdQxZxoWlPu ditI/ggQnswUezLHs6dosru9VTuLy6+pfjzbS+t6cM1vGPqQtK8y7xCLznKWEvWOxmVR ALn6UNGONkJKmaI/Y/2ubqxV7qB/jaNEVaey8iUTrU87IJoGjJ0KtlOXfycg1CnGskNw PLHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=kU8wMZNvEzgPbmwhpM6JkBirf3HCpj8nA5DxvL7UJOA=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=J2d+z+9u6iO6OH4poX5ReiLygUMmVYWzU+VMmhgZV8ZOqbrXQ49VCgm9kJQf7nSyi2 uKbATyfpAbr5WIvhbWJfkqWivwsV2pJ/6IPbqcQ/Zv5RncFmk1OnBp8AMXgImXS23gOW 6402255vGeXQAeH8ZLcnjD9MLI1D2nHhGIflMF7HSWlICCBOE+SQYLvp+bvsCLIdGxfE tjckk/mQc14HxQcQ4zrfMH1CUBz92xeu7mBw5PTF/HpVLT4rjEUriJl4buhEg5Q4e5/U zbvsodD5OTXW3RpvlP7h+wSuzsaci4dNoYVefz0G3nUgEnxKcZFINNN4lkHez+Kfv/n0 zIew==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DSBgLkYM; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-474e6431f8dsi49880521cf.51.2025.03.04.14.26.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:26:50 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DSBgLkYM; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpahP-0005bC-J1; Tue, 04 Mar 2025 17:25:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpah2-0005PT-Oc for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:53 -0500 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpah0-0006Vf-NV for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:52 -0500 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-abf518748cbso663490866b.2 for ; Tue, 04 Mar 2025 14:24:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127088; x=1741731888; darn=nongnu.org; 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=kU8wMZNvEzgPbmwhpM6JkBirf3HCpj8nA5DxvL7UJOA=; b=DSBgLkYMBgHQIT7ghy2tn9YarNkeA4X7JmKOfeOMeav9yM4wJhlP3WQx03PDe3CcXm iZFoZk7Y+dOPSdDURpjVP6DpmRtQOvQOgVduZ0dpckZAmQpKUq3dsvS3T4AzZnLZKE4c JtceniQ6fKAwdT7O2qXqCxdDxVv/yOUn6BDuieY01dDsyNrgP7gHdCCJde2VTPjWyKAq PzUHdiEpYWGBzLwL3J7kCMxfiWKLDnWT2Pfm4d8r3hcJ2Hh5QkpKAIZKAhSdphoAn0B/ 3nZ9w4J49+S0LDiKhMuiKHjBszxzT6gfxWQk93osgd4iQaBbc43Zt7uy0jYZxZaF2Hx2 L/DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127088; x=1741731888; 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=kU8wMZNvEzgPbmwhpM6JkBirf3HCpj8nA5DxvL7UJOA=; b=BPwx28k2+dscs/qSCbwCAcI+USUCYhw3AaPPavffFyCiwqdf+KwXs2zawMtUXOGnKb KTYz9nu5Em/+jJyTmiQXyxwLu09bXAfHmqN/oaoqZs5Q3138IGLWgUSdK7Yyncf/UzY7 RcpxaNIlc90FP80Yg77fypI9aneUPKMrrkHYXQ8mg62+AzkE6DSLKmDcMQbnQcWCe3KA YvmrDABgf3EmEnYBA5MoKehDZcV56yeTlM1ztvSTZTljM5GuSkCl00nam4XfYwTZbAi5 tkNxHhO7vgQDZtDb8YbTG9nZAFjJ1bU6yAGoRdKxDpsXVWvvphqjY5fgZtm85QSIpa8K iU1g== X-Gm-Message-State: AOJu0YyZvVuqNzZn1TtUdoB2i9G3jhQlfAbL0ZVMbc55I7cNkQBXYY3p MrO/tJTlIJqIs2ZkaTfj6r1m5fciZSJmPM2VpleQ/6xEfO4eWQGo1iAZUd/JU2E= X-Gm-Gg: ASbGncsCUuGE8ftRVriH9rEQPMxhLfR9TeHKaEoHtIyoMP37XEfFUmKqz/xxWJkP9Kh x9uMa08N+YTsVeIp6KsCTUUyA+RooAwZNZ2DXgQr//2b1/bB688kmNlSnwgrgIVMWHqyfH4rINz ZUxIlRoePTL9a7QPUJKLNVBd6+BkNBEJ0vZXGsy55OjYxf+F5fZ3LnWUb1b83YLAQvbuhuU1JJG miFkihehGbdB/R9DruL7D1FuweuV0naTIc5KCs0rN9EYvtWRe57NmiMug32ZezkVXEvrH2/EZ5+ MvHT9qE3B4JuhT8Yn8+sauQxcbuimpQ5377nhuzwhajc30k= X-Received: by 2002:a17:907:728d:b0:abf:6e3b:4b4 with SMTP id a640c23a62f3a-ac20d8bce38mr75190466b.22.1741127088015; Tue, 04 Mar 2025 14:24:48 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac0e1fb5588sm357045766b.18.2025.03.04.14.24.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:45 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A1D5D5FE0C; Tue, 4 Mar 2025 22:24:40 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 12/32] tests/vm: bump timeout for shutdown Date: Tue, 4 Mar 2025 22:24:19 +0000 Message-Id: <20250304222439.2035603-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x629.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 On my fairly beefy machine the timeout was triggering leaving a corrupted disk image due to power being pulled before the disk had synced. Triple the timeout to avoid this. Message-Id: <20250226140343.3907080-11-alex.bennee@linaro.org> Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée --- tests/vm/basevm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 6d41ac7574..9e879e966a 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -83,7 +83,7 @@ class BaseVM(object): # command to halt the guest, can be overridden by subclasses poweroff = "poweroff" # Time to wait for shutdown to finish. - shutdown_timeout_default = 30 + shutdown_timeout_default = 90 # enable IPv6 networking ipv6 = True # This is the timeout on the wait for console bytes. From patchwork Tue Mar 4 22:24:20 2025 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: 870134 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp493107wrg; Tue, 4 Mar 2025 14:27:51 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW/IkeZMWl14jvpV49oHnW+Mo9BBslSDJU3q+tI/GYcquo6XoVGlEC1SJgkQzHeJCF2qv8fZA==@linaro.org X-Google-Smtp-Source: AGHT+IEjpnYCXRa9mPeWq9pBLEzdexOmqVcBVl393kuuLRkYSaESFWIBGYKErKWeaswucP2nTfGz X-Received: by 2002:a05:620a:8bc4:b0:7c3:d862:dfe1 with SMTP id af79cd13be357-7c3d8ed325dmr122845885a.51.1741127271016; Tue, 04 Mar 2025 14:27:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127271; cv=none; d=google.com; s=arc-20240605; b=PKERXZz5YzLH9XHltQS25kLfK8/EaKp4ziiXhGq6CmGYWMwKSPXT9X9iXAt2Aqzu8+ 2FCQmkKfCOtKhHWrCPLNUx7jdyTj7/Jnf3uZy9NYPAhPLIbI2QfzL8vJ+wSHe1RMerdj Nq6JApoThHGjaJW2//nk62nw/0ilYCZD//X66z/+i9soPPf1bWpi7tTKm11crAWlw5Oy xjHRz24fS384zp6o+T5AmJEqbipJUxUhe91mB8n9GSVFFWPHS3f89vnJN+TKv0hMqmCT 9u5cRvIoJbRG6Kd6cFP7kznLkXcpeUXJSxmJkCOTgTKiUgjDBA6MLRB39YUJCS/3DzQk M1mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=nuyU4RtfkAy5FahNVVdqaLuFf5A6JqdgckTnQGTYpas=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=DCOy5LJ80n+2+TPyxmQVzMe+/sWhB/ZtHPU2zC69bSVQRN5hlb4QKxV3ZmJHTMDFUn jChvw4RV5BggDJTyOIdHXFDmzcut4xIIcgq6SDtB5btB3TXyFBsOjuKBmT5PaMEh4RLf v2Kofnts3Uxz7H7uPsq9+h2ZyAbJl2/duojaaYZidqugh1MB9ihdk1PfhuRYBMfmvCGO PEPXthAAILWUlD+Z1ojDjcPTe6NSsothPX+1X0KRMPqReuYACCLyv3b1R2gRH4zLOVcH JDrdSuo4q7YLlJnlFnytq0ksiA5/WNIU4laUkdfRMI29W6H2dwgics0mJr60nNemUCfr BxDA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iScA6Wu3; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c397a1e1ebsi1133620685a.230.2025.03.04.14.27.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:27:50 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iScA6Wu3; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpaiN-0006dD-Bs; Tue, 04 Mar 2025 17:26:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpah9-0005SV-Fn for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:25:07 -0500 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpah3-0006Y8-IP for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:55 -0500 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-abf3cf3d142so560515166b.2 for ; Tue, 04 Mar 2025 14:24:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127092; x=1741731892; darn=nongnu.org; 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=nuyU4RtfkAy5FahNVVdqaLuFf5A6JqdgckTnQGTYpas=; b=iScA6Wu3v6BkZNKj3kuwjituD0sCmEm8SpnGQz0fwETsT3RqvNBV9bdCEcLrBf9CVr oVxmJ8FzoWdpZs05lGER3dMwH6LtUgHaD/Ec+t7wNjNeP8IIbIQyJ3EliQzT/5fJLK6S KShn76e+He03svR1Sxp9kd8sKn9FyS1s5zxeucxHSX8unnaOmxTLt4KS3OKsnkOd07w8 BLlhILoZsyCpQ9XGEzgzdw33JYhIKctuVtyzrErybOdFmo9lthTxZQX3bt+waX0TPmZ9 JT6pMl82DOSUZ5iwu/iOvbzqhXNPT1pHgZtvw+hHvH1TIUWTymOR5Lpq2cAQYr1KmxDC lJXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127092; x=1741731892; 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=nuyU4RtfkAy5FahNVVdqaLuFf5A6JqdgckTnQGTYpas=; b=deCZ5igRqYM1LkNMD/2IAGLtFVA+A+2jZNV2XRAXYjcerAUgAulbJdxn1i5+ymwN6J AxYsopd1j/sacxu2TG9uneB6eRAvYx9n7mAiCSTMXOvQJOtXz4PqJI1FmW7grLB2iDL4 I6e0aQf/VGPeBzJLifpulAapRU6HIFKIAp8n7Jiey8f78K+sR+Fv4dH/vpaBgfK0Ew+h crEfj+NBrTfJ0deJSzrGuGmkTolCFg4x33nr+eckiIiKym+mNy6bDt3Jvy+4Dc23XHci bguCGm95/5oOEbT9bk6XCo/x7oolg/JprtuihY3reXiINYb/r7I7sLtvbMm112cQNM1z B0xw== X-Gm-Message-State: AOJu0YxCDp0YERvedVkBWEIOtRQzEEue3i4E69t6SDifs35f6y7kObor kcmIFd2SXyzGuwOE5boclRPkSQlciZlPmmVGsociBnmjwMsYzu/YvYSPiBOQK3U= X-Gm-Gg: ASbGncscrINrIwpbam08YmYPMVUnPtEr2DyEKnJOaC2mQ1guWPvtsMtGzpYHSpG9xfq ZVUa0rYqP1Zj3ig1ah0tZnQIHFcC9nmqFD1RhShPCRwv3pWzHl4NW2rVDIfO4XUWaYeZ7kunsdR UExLJSk+rtHZfDtAWoiv4G8DTdIuioezyIirgBDvfM4ZM5LyNpfKDu7JntN/AfEH9HjivhcWmSn 9ClGsQEeGPQ9pdXe7N6qVdVMDgoMwMGT4qZXWQS6jvf+W5FY7kipO1JvlJcJ9ZnXLf0qwqjnphj cbC08irqWROWhYdUkIV7gIprAQeTpy0c9uphXLzdEE0IB0w= X-Received: by 2002:a05:6402:1e91:b0:5dc:a44e:7644 with SMTP id 4fb4d7f45d1cf-5e59f39d009mr1618069a12.2.1741127091776; Tue, 04 Mar 2025 14:24:51 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac1ea7dd823sm234374866b.109.2025.03.04.14.24.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:45 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id B70BB5FE31; Tue, 4 Mar 2025 22:24:40 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 13/32] tests/tcg: mark test-vma as a linux-only test Date: Tue, 4 Mar 2025 22:24:20 +0000 Message-Id: <20250304222439.2035603-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x632.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 multiarch tests should compile for any POSIX system, however test-vma's usage of MAP_NORESERVE makes it a linux-only test. Simply moving the source file is enough for the build logic to skip on BSD's. Message-Id: <20250226140343.3907080-12-alex.bennee@linaro.org> Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/tcg/multiarch/{ => linux}/test-vma.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/tcg/multiarch/{ => linux}/test-vma.c (100%) diff --git a/tests/tcg/multiarch/test-vma.c b/tests/tcg/multiarch/linux/test-vma.c similarity index 100% rename from tests/tcg/multiarch/test-vma.c rename to tests/tcg/multiarch/linux/test-vma.c From patchwork Tue Mar 4 22:24:21 2025 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: 870132 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp493112wrg; Tue, 4 Mar 2025 14:27:51 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVA+h0KIHrgCIHr4c2LhD8kWMJ1eGdRvh3VgmGGHmTem8KfShmerk7/tOIRhUVbXBIzC4SmTg==@linaro.org X-Google-Smtp-Source: AGHT+IH88UPF60IC6fBEf0a8KWIz69Vn1ak6wjiDeEMw4TUqxfmDtolKJADOLnQXikWYQfDwJDds X-Received: by 2002:a05:622a:5ca:b0:474:e921:7c1e with SMTP id d75a77b69052e-4750b4b642emr11685191cf.32.1741127271478; Tue, 04 Mar 2025 14:27:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127271; cv=none; d=google.com; s=arc-20240605; b=PXlGXHExktjstPAhPSZyMGvu6PxoGYKIaKdZjYBaTOMGm8q0SSlKvyCsIS/bf0awt8 fY/NnJMka/0w9YdrpUZbsbw4z+KDWerYg3OaZc5jDx+RZ3rz1QcCW/1xbEpsMYOY8Qd/ 8UhMe6uXTlyMyoXM789yCZFIlRscTdSUdSlUEUQo8uxG6R/9vf9GaAQb8UkJFGr7xvqb 8kqvpX4q2tazl2L9xw9lEkRSQRRqmr2yu8uqL6lFt4YfNlVlyuJMS8WCIOsGzzQZmN0a rCqRcooQ3cwsJjiTARqaXk56VpIX8QsNqSFo1SyTrVS3Ua7Fi+GOzePs6TOgweKXO+0r Falg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=MkolzpnShYDHmq3nWMVi4zmNW1Y0ZYg4oZccy87L1KU=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=PnuYe8YheZxLLYaEBA30yJnP5pHkcHukSIeYHwkTJXpANypBRI2gjShNxH6JOHRgef 1+A/KZppZ+NoOrS/ejCPuBK4Rv0n7ByCtUQD0JAPOxhuosAe8/6fIkZvY8vQvIFwNStL 2jLx/HPunopO5rn8U5+iZwvSeDaLwZ4kTbvs5LzV7dpz0KOeXmqoSyimDWfbRY9A9/Av btEUh22/9fuuqIhBOBS1tOVqbsLeRnn4YfssKpAxVkIJLJeptPwRjwLJ1Jxn/3zyTKtg sNlN/IDCEUIapkinAosibYARJ7WT7lTILfQkL4yt99CfH8XR9TAnU4XvlD9NQmHB8nQf MkKA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fN3j1WnL; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4746919d84esi120658791cf.116.2025.03.04.14.27.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:27:51 -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=fN3j1WnL; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpahW-0005no-Kx; Tue, 04 Mar 2025 17:25:25 -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 1tpah9-0005SU-Fn for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:25:07 -0500 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpah4-0006YS-6w for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:56 -0500 Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-5dccaaca646so557632a12.0 for ; Tue, 04 Mar 2025 14:24:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127092; x=1741731892; darn=nongnu.org; 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=MkolzpnShYDHmq3nWMVi4zmNW1Y0ZYg4oZccy87L1KU=; b=fN3j1WnL1TSd8yIMA1LMV95aKVG2bFy6GmnixgqX2WV43lr/clke4u4pJVsto+w6AW nCaNoul5hgxBp64IezZ96Ako2LMd0h94VZlRDVwv7mnXE8hsJbC95wuUN3r7GFB01NMJ rd73PtowENjFFgsjeJXPMTdNgC7Qd7RDkt/BgyJOL3yDE4T1+sVeXRUrrVRg39Y50f02 esn+ak540LYYGTxE7O76i+jr4R/4omDlPFBTnXMURQKhQbIjcsWW/zKqwtiteKp6gEuw FQF0AnmCu11p7ATABbcWia2jYtyQks/WEptq3N8gAB6d0y1ekk9rEgKKyKzpqoC0tmfO cPzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127092; x=1741731892; 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=MkolzpnShYDHmq3nWMVi4zmNW1Y0ZYg4oZccy87L1KU=; b=K8ryCRGk8zASn4ficGqOsJlF7OZSxR7Gc9dTLY06jNML5irTHGJjZ5AtCU6x6yzYP6 KnFYC17eD87ef1Nz5gHdv0RbrVzSUx/WhECLtoFcAa/2AFL5lbVUZXc6pUWFvtqMscyb MvfvcD48NwCvFFt5T9Ki2A1w1PRE2jPnegUWMvlJvKbgPQBpL5wWXNRPRiOznTOnAY7D 72k80TLqgSBUtxudBBREwDYWXNqPv3rzqt6S3ts9DDIQlL/MDZYtjnPVgwRl3pES+OP9 J4q8Gk5fdhwl1+BkWLBJDo5bDlFbIPVGry5e2POPpcqBb2kzHyXcl9d9rgqiqSw3Ybz1 Ccqw== X-Gm-Message-State: AOJu0YwUB9AQ/Pv2IcsbNI4PkUETPcKi1Kz0f8Dfi7rVwVOMWwwRbKQx kLZII29IT2iFMSHcAFN1r19PGuZ6JwqQE7eShc4WRu5QLMqeq4nhwndczjwv+oc= X-Gm-Gg: ASbGnctmUNWVQmueYNMDIs6t0u0qFfqOu+9TU4AYadoY1VKe5n2l6vmLoWmLW4iSNTq 97/Jo7PWVK6kvk1C19U9m1D9+TObqbtdrpQ2IzCyJQndOtp2aFQJd+/BqL4atEF62N5Rd4ETvwU YvQ8j1u1VTXPL9V8DHz8yZJfjLNjnGn2E/RHVMKt0GMsVHfsRhqAwD1NRy4Or38y3WB1W+RhgMl MhtEMCxCpEUZQOmgSJv9zeuMjy069S01+di5Mvcp/DKUzqknkyzu9ESAnyUV59AMO+w2HAD3knJ RCw09dtL8fuqkFIOhaXRoX8WNJRkzPGXelXSDaCCn3RMNQo= X-Received: by 2002:a05:6402:2554:b0:5d3:e99c:6bda with SMTP id 4fb4d7f45d1cf-5e584f51e2bmr4948594a12.16.1741127092568; Tue, 04 Mar 2025 14:24:52 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e4c3b6dac5sm8726271a12.19.2025.03.04.14.24.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:45 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id CFCA75FE3A; Tue, 4 Mar 2025 22:24:40 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 14/32] tests/tcg: add message to _Static_assert in test-avx Date: Tue, 4 Mar 2025 22:24:21 +0000 Message-Id: <20250304222439.2035603-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x534.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 In preparation for enabling clang and avoiding: error: '_Static_assert' with no message is a C2x extension [-Werror,-Wc2x-extensions] let us just add the message to silence the warning. Message-Id: <20250226140343.3907080-13-alex.bennee@linaro.org> Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- v2 - /defined/expected/ - let us --- tests/tcg/i386/test-avx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tcg/i386/test-avx.c b/tests/tcg/i386/test-avx.c index 230e6d84b8..80fe363cfc 100644 --- a/tests/tcg/i386/test-avx.c +++ b/tests/tcg/i386/test-avx.c @@ -244,7 +244,7 @@ v4di indexd = {0x00000002ffffffcdull, 0xfffffff500000010ull, 0x0000003afffffff0ull, 0x000000000000000eull}; v4di gather_mem[0x20]; -_Static_assert(sizeof(gather_mem) == 1024); +_Static_assert(sizeof(gather_mem) == 1024, "gather_mem not expected size"); void init_f16reg(v4di *r) { From patchwork Tue Mar 4 22:24:22 2025 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: 870138 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp493415wrg; Tue, 4 Mar 2025 14:28:56 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWsw2cbqhQw9trBkl89Lk7RfOePO04R3vClpZkkDzhJGnDN3OLKs3e6MHAnDGcnKOa2RA6iFQ==@linaro.org X-Google-Smtp-Source: AGHT+IEZXJ8nwcmGRMo7F2w581ATS8xnY7FZIxc43qUaldJDZpQscj9vmpJHw3KZdAdO+VHHRhPE X-Received: by 2002:a05:620a:2b87:b0:7c3:cc25:5109 with SMTP id af79cd13be357-7c3d8ef2cddmr175341285a.49.1741127336716; Tue, 04 Mar 2025 14:28:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127336; cv=none; d=google.com; s=arc-20240605; b=g4XCq9yir8tVn9fnLeDUb13XNfghTFqQ/fSoLwLgvQLqg0Lzr+X/4ki3AOsGbhLFqt YE41IHgDLp5Ax0et3Ez0KBSO4xz0j5FYzc8DxCuvIGGIhRz2uR1oVRvXWDXu1VM0y8S/ TqeVUZ13eny+x48a89uzaug+yJZUN4N9L6o8xsc7sDO+WHfUcjfXKvy3Qs1/RiK+8Gt4 Xya/ERegdY7EBPmWfhIFXiiv+AlrNuplC0JRpupVhSaz1bFjVkYizZt0xjhwGyAlXmvi MgX0G78eRSytUDlHEAItDolWhHjhqY1pcJe+D/Xp9I2YcV2kQaUtP2WdDKGeAecqqadl weTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=pZvYp7FSlelG8xgQuaTWht4mgcpsKdckID5yTml3+ZE=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=Q0UpZY5TItDTU2c8CuYw0ZxpGtzGt1UDJ5mArJ4bw3v40Fiz/OBR1i/zzvsBI0fo1m 0KYI7wIZLkITWxH2sDgpxiL6v8b/Ej16/rs+wqBJDOWswCjJIBD5XtjE2alqrDHzMwYx AGEw5DaRmBOz8QQu5PQprtuek12ydWYcARHq9VSOK9XBeNUgjK2ZGYURdpRAsFeQ4ybZ MOuK4YK1Rqu8xT4nK4L46TVk1SWtgyT+ScfKvHRD2Jzux6JanekkdCU5IFNGFAi7IFFT vvbiIDiIobw6OQ5EOCUHK2AnCuWIjf7pbjRrkdH0wjSal7R0VLCbhW/RvBtcyz4isF8N 4ZgA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SY2B9LIv; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3cf86da5fsi183999685a.409.2025.03.04.14.28.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:28: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=SY2B9LIv; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpaho-0005uC-HM; Tue, 04 Mar 2025 17:25: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 1tpah1-0005Og-Fk for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:51 -0500 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpagz-0006Vb-KH for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:51 -0500 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-abf4cebb04dso47557266b.0 for ; Tue, 04 Mar 2025 14:24:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127088; x=1741731888; darn=nongnu.org; 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=pZvYp7FSlelG8xgQuaTWht4mgcpsKdckID5yTml3+ZE=; b=SY2B9LIvLw53PYW3XUNPozfdyJjmZ87iTgcYRdAz27AVFN1Ye+fcorKqVxjY8boA5P WGWHSlfAZkCZXVuIQ24anpT52d0ULdLDrn+v7PIdDWbj3BKwQE4qZx5T1TJ+ecQCY4z+ Ji6+wwKrJOTfTmrYPSPmfVxj67ilSjxUyzoMIfppFw1sGMh6cD1TDdYTAhdkjCZxgI55 3o6fOZaOddPi+YjB6ghxWZjppSKG7jeB8pdDQRuHLzu8QF54RxxWgJH48d3xtDOqwavs NpCvtCbUmCf2qEpexJRVcA11XSLBxHdup6HBRY+U7BrfwClim6Fg7iK51t1OOjgM/PZc a8gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127088; x=1741731888; 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=pZvYp7FSlelG8xgQuaTWht4mgcpsKdckID5yTml3+ZE=; b=S1qhO1F6qQBIqkdrFBJPaTd+iaMsuIrrdCiCAVQJUqMWg8D6SpUbjMu59S77Rb4FVO Hf49wikpQXGYmDworNULySR1Yrzxizbe9e/ST70z4XlzDVvZJKedJLAhlbt1IUMMjpEp TT2yhdFbDkD6Hbx8kf4jlPm0xLB5iOExb38fzGaMc3eJKr1j3w7U8Lzl0bovwQC2Be0G /vyVlxDuTZcHZzwwFp+Tb4x5wd1Q96ERbz+fAQHZQM9+edA5NoLUcrbtDIxfuhqqbaKF 1xwVyvj5bpVP2sPTwiOBtviKqav0TCutDesgyHGPZq3NZR7lcIkIN/RkeL9gmTFxOKXO PgfQ== X-Gm-Message-State: AOJu0Yx7co8vJX0rdD9/xJCetFmc41/AzL5hkLZDcT9jk93vbN8JXFwt eLtubXKjlepys6YSEtXn5ZvMEEgNXSbBp6MBJP4n4/a1Ody/gEbiAbV1an8xGFA= X-Gm-Gg: ASbGnct7Gads7FyquKblrWkx77ZIQ1kf/PILYcfSQVm0DlnXKCNOuzhJXyu9p3SqR1T /j3jzj8761WqoBDrq57AKXSateCah5ZkO6Vaxsdg/ITwMJjKuqN2GN5CNLLcDGbXGPQq9ryHodY q1BX7rImjYbRUYwo1VbalCzsy6lZ8cD1hi81SOz8ju991bPbHdrYkUjio2kqnmdwyrVk+nu7eDA /CvkDhBC8Q4U984MkIsRTP5p5EEb3reZzHT44szEO7oWKJmpfRssgrinPzOlmbpaRCuR24cLhCD qjVUZ8k6run4ZBfyNd5xi+Cdg1ui1Qb2uN9Q9k3efdt+aXM= X-Received: by 2002:a17:906:794f:b0:abf:7a26:c473 with SMTP id a640c23a62f3a-ac20edb19c5mr90649066b.13.1741127087550; Tue, 04 Mar 2025 14:24:47 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac1e382a04bsm277988166b.163.2025.03.04.14.24.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:45 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id E509B6007F; Tue, 4 Mar 2025 22:24:40 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 15/32] tests/tcg: fix constraints in test-i386-adcox Date: Tue, 4 Mar 2025 22:24:22 +0000 Message-Id: <20250304222439.2035603-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62f.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 Clang complains: clang -O2 -m64 -mcx16 /home/alex/lsrc/qemu.git/tests/tcg/i386/test-i386-adcox.c -o test-i386-adcox -static /home/alex/lsrc/qemu.git/tests/tcg/i386/test-i386-adcox.c:32:26: error: invalid input constraint '0' in asm : "r" ((REG)-1), "0" (flags), "1" (out_adcx), "2" (out_adox)); ^ /home/alex/lsrc/qemu.git/tests/tcg/i386/test-i386-adcox.c:57:26: error: invalid input constraint '0' in asm : "r" ((REG)-1), "0" (flags), "1" (out_adcx), "2" (out_adox)); ^ 2 errors generated. Pointing out a numbered input constraint can't point to a read/write output [1]. Convert to a read-only input constraint to allow this. [1] https://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20101101/036036.html Signed-off-by: Alex Bennée Suggested-by: Daniel P. Berrangé Reviewed-by: Richard Henderson --- v2 - followed rth's suggestion and removed additional matches. --- tests/tcg/i386/test-i386-adcox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tcg/i386/test-i386-adcox.c b/tests/tcg/i386/test-i386-adcox.c index 16169efff8..d653fa86a7 100644 --- a/tests/tcg/i386/test-i386-adcox.c +++ b/tests/tcg/i386/test-i386-adcox.c @@ -53,8 +53,8 @@ void test_adcx_adox(uint32_t in_c, uint32_t in_o, REG adcx_operand, REG adox_ope "adcx %3, %1;" "adox %3, %2;" "pushf; pop %0" - : "+r" (flags), "+r" (out_adcx), "+r" (out_adox) - : "r" ((REG)-1), "0" (flags), "1" (out_adcx), "2" (out_adox)); + : "+r"(flags), "+r"(out_adcx), "+r"(out_adox) + : "r" ((REG)-1)); assert(out_adcx == in_c + adcx_operand - 1); assert(out_adox == in_o + adox_operand - 1); From patchwork Tue Mar 4 22:24:23 2025 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: 870149 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp495019wrg; Tue, 4 Mar 2025 14:33:37 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV4DgFJ836hde98DLW3S+e6864kD7qJpuhuMMdvV68XgbGvXEv+EFermobiR0ef3G0hRQzsMQ==@linaro.org X-Google-Smtp-Source: AGHT+IHjWpKE3dzVNiSAYCjeHvAY//i/VUs5o6bnDGhuX94Dr9lWS7MXBkZjWRiTb+jW1Y159A56 X-Received: by 2002:ac8:7f81:0:b0:474:fcb1:353b with SMTP id d75a77b69052e-4750b459e99mr12772711cf.31.1741127617201; Tue, 04 Mar 2025 14:33:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127617; cv=none; d=google.com; s=arc-20240605; b=b5nKwagV5vvp4mbeJMZF9kyCpTj+0/rSrAdKTh+6UfwAKERbPtS4Uz74s3F1OJVtE2 C99wlp4W6kMjURlwtngPYdbb5c19WmW9X1WzwCZMivQUT75m0D6Hc8RR7v0ylTnqqlys l6uWppmBC9H3iIx/ICcEDKZYc9UMgcI+yx/b7j/rlw2i/26/aVRzq/t+mV1o18rqtBWq zfBQ/0heI/vduYGuPRTDZDghhURpFr9Yv/pmBZC6rydEYuSjsiDIMD8khHYZAhm8DnF+ tTCUKx3svjkf3v61wXvZrvmQDieIhPsFz0oFvWeiXWRTH1AD+JqrtCG26/PS5x/FgY+8 7BaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=5MQuHd0qcU2J5poAhTVutiNlp9cSxVFs0o4bkyIqmvM=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=OS1baJ0YDkurH+qFraPrm218DYBdusY2lddrHXQcolfr8pj5kvGCbCVq+3kqPWFFVR qCtWUgX2rRwtv+3sFRkFPneNGnPrslrQp4yb/paxY/4jY/i+mPjglQ+zZkhUcrHhBTFw MuV1tvvHWHgyCCjpmmeD23cFzvCmonUju7lARw2YDnbFAFxY1PGFCH3/LZr56pORJeWp 6f5ktiUIhu0oVvQ7DwUE/M8MTz7Qk2RXVW8aIZ6Ye1hMA1ws0gggltN8a3D9A2T7tO6r 8Kzgd9q5M/MYiDERhYqwH0dghWCCMHitXRX0cb3v0GSv/AcVXmwpDpeJfJZO3PrPruF+ +Ztg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xPbj2aQB; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-474f9c988e4si29523321cf.185.2025.03.04.14.33.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:33: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=xPbj2aQB; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpaiX-0007Ps-Fs; Tue, 04 Mar 2025 17:26:25 -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 1tpah5-0005QE-Pu for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:25:09 -0500 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpah2-0006XG-BF for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:54 -0500 Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-5e4d50ed90aso7213601a12.0 for ; Tue, 04 Mar 2025 14:24:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127090; x=1741731890; darn=nongnu.org; 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=5MQuHd0qcU2J5poAhTVutiNlp9cSxVFs0o4bkyIqmvM=; b=xPbj2aQBugm4ORg4zRjkD3OMXB16L3CPgVdFVbSIJ7J6SkbtkQdWs4J3aBsoucclvX PVqCSjoD7QOwACPzupiBRmZdudgiZUJKzmFqMYGcd4xKL/ZkfliAqqynMREk7BYEEP9x ItZUHyVZaiIEQBeL9ALx8CU6XW4v3el5PrBeH9iFj1plDLQIE7jkfoe0FPm6uMw9DmJi hTAOdxDuWjVxjDTCOorEs0rt+fGaase4kfMpAM0bdQmFq4Ku0s85tfUlJ6HlTjsRx7ge k9M6W+eUn9XJnIB5GIjDG7EP/Kh2WZxN9ioayAaNRDJ2uc9szNNkmfcfJIHPnLr7KSQV uO+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127090; x=1741731890; 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=5MQuHd0qcU2J5poAhTVutiNlp9cSxVFs0o4bkyIqmvM=; b=jkqC9LgMDTEnUjm1XnXjAa8HFUQWHOY+xmJ1/TeH3sBD0qTdmKPpnY0AdJ6GrOOE69 R8zzTSH9Ijo7sO5HfbSnni8OPOCnDxVK+A9nqHnBjWQbnfakm2ZhIptwzcZ9yJJo3ZRe TPHVmX9qpq7TZeTASCB06W01xfgSl13bmLahNFngc+7Hh2LeaMEs3zkzqZLDBAXeQCTS fhuglpZ2XCxfKeQhAOaXxTHHxG6b0ogtEOlUIdjGvAIanN0pizCPFbMv5c06yQJUBHdD dEY9IJobencCJ2AytDM9gYFArYTRqxxkTxwsWxw7CqH2OIGqMTAx5hEBk1lCsdsRX30J /upg== X-Gm-Message-State: AOJu0YzY32wubiar49g0TJ2EDUQDrAzt9zIhdU5wLtv5wTnYbwqhaStz IG1s1wdUDW2dvIg3XNxqcNxkAEztaG0tjaSX8E7ONSaRBMuW3FcdxlLUL46cW+4= X-Gm-Gg: ASbGncsr6XtT3WQmkIqJNh+GpH9r25q4ZPuDbiOqrw5JVm0pPzRtqIOrW7u2MQXZ/Cg mzxuRPIG+yVRC7qVMvB9sAguatkm9x27quo3K3CXANwy2CyKyTDc+eyDM3zU2i7hg5RRXXakByt igFzUz38SYLqh9s9IYCO64/qwKS7+nfaMgmVMV6CA+JdLZghldMlyd7aNfr9rbnvhaq6fe0q+rh LCCJrvk3aaeF3FXAwJCNOiVvkhoio60qFi3mPd8hnSW/sc/YG89T7cHXNNCHaiAjpsbP+hcWkb2 2oMD7uxUtyn2r4/3ULSF6CAt+PfcfwVkkQR7x90SLRJZLa8= X-Received: by 2002:a17:906:6a09:b0:abf:733f:5c42 with SMTP id a640c23a62f3a-ac20d852f4emr73755566b.8.1741127090386; Tue, 04 Mar 2025 14:24:50 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abf5a6e59ffsm629108966b.171.2025.03.04.14.24.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:45 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 068806013F; Tue, 4 Mar 2025 22:24:41 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 16/32] tests/tcg: enable -fwrapv for test-i386-bmi Date: Tue, 4 Mar 2025 22:24:23 +0000 Message-Id: <20250304222439.2035603-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x534.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 allow things like: tests/tcg/i386/test-i386-bmi2.c:124:35: warning: shifting a negative signed value is undefined [-Wshift-negative-value] assert(result == (mask & ~(-1 << 30))); in the main code, so allow it for the test. Message-Id: <20250226140343.3907080-15-alex.bennee@linaro.org> Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée --- tests/tcg/i386/Makefile.target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index bbe2c44b2a..f1df40411b 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -22,7 +22,7 @@ run-test-i386-sse-exceptions: QEMU_OPTS += -cpu max test-i386-pcmpistri: CFLAGS += -msse4.2 run-test-i386-pcmpistri: QEMU_OPTS += -cpu max -test-i386-bmi2: CFLAGS=-O2 +test-i386-bmi2: CFLAGS=-O2 -fwrapv run-test-i386-bmi2: QEMU_OPTS += -cpu max test-i386-adcox: CFLAGS=-O2 From patchwork Tue Mar 4 22:24:24 2025 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: 870139 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp493586wrg; Tue, 4 Mar 2025 14:29:34 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXUf0LE5Kq5dNeNElMN+4JYjTuoZSWndlk4tjcsDcglS0MJmf9/lD9Tq7LejhNE+4yjAAZwSA==@linaro.org X-Google-Smtp-Source: AGHT+IFqtBX51o/qXa3aZR5eqPEjCWV60+wNrt/JBOwqk4OkhtLC5OX7nPSz1b2n9T/xaIsEX8yi X-Received: by 2002:a05:6214:230a:b0:6e6:6598:84c1 with SMTP id 6a1803df08f44-6e8e6d60d4cmr16036096d6.42.1741127374530; Tue, 04 Mar 2025 14:29:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127374; cv=none; d=google.com; s=arc-20240605; b=cu/7DTH8FKa0bBFdm01rLflyunqTa6n4wfKk4uhdUvOb/hOh2flTO/wEkryOUJvc4W Ez7PKbybow91QqT3k1NqgEym/QLg1S/tmqJfKl6BKdrSmEFHL2avhcm973OV10h1yl0e /MvKbBxXrBTSWeQL0EQ34oHZLofqZhgAYD6ZLGSWSnLi56HG3W8RVqdBu9G6u3KEhv0+ NnsAv6tWh7Z5Q6HooggIDMPgXiW9B70KdhskEnPc3qy78pHeXsv5gvpRoOswsMpQGgRb pSvyP7RUD0FyH313p02aZEYCLGCd/zL39eUxry6wl0ZoL/tpsTq8SWA2Pgli99nTIAlt Dsvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=ll+J79NMjC+5QcVirstPzb5huPWXK0xa5gPo5OevAj8=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=LSUsW6UwdagcCk3yMtRMWG6QfZaLZXHowaAynRva3Yq2ifT+xkUoORVy3jrd+5sNId spigc0BVz1J9VNRkk3g6xSVDAWsSsObylWW6XzD9ILFVVa+8TMx7My3GZRZcRLZAqzTz oDcDHJJoPGfo6gSXBCC6zBbpqDssvGmPs+BVr9IvFcL7platrpq9+6vo3VPmZSfWX0c0 kqICXIECD0z/bAYaAl57BlezEsGmUZT0QAPgHbHsmo9oU/IazZudPt0FBHk5rcpXkTVw RKd+jYRHOWcQN4/hW3yqrQjoHr2aHwoY91ngY6+N9OJTiFX9aC3hI7mrGJu+I2t3n55R L9VA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HjEuBsBx; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-474f8b0bfa2si31210771cf.419.2025.03.04.14.29.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:29:34 -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=HjEuBsBx; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpaiV-0007IS-Rr; Tue, 04 Mar 2025 17:26:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpahA-0005Sc-Rc for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:25:09 -0500 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpah5-0006Yw-G6 for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:59 -0500 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-abf4d756135so606747666b.1 for ; Tue, 04 Mar 2025 14:24:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127093; x=1741731893; darn=nongnu.org; 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=ll+J79NMjC+5QcVirstPzb5huPWXK0xa5gPo5OevAj8=; b=HjEuBsBxHJqkRjFNBveYKCBO+w4pYjc/VEZb+gL+QFB9aSkhujAbNdlKcKczHIixVI /7Qj4Co8RjTYxTpC3rxae9hVSFfj21cCVQb+iC/kmJVnPP2FXxGDk/I8lUQdJ0SKJdWA CWGNmfl9r6TVPmuqSEQqNQlmllb36WHZoylqVSF1ONrGg+k2k5wZBXubhnur0ammJaA2 uIt5neYF6q2eBE99QPtO1K5yHerDBCOwF1EOY2xe0CsrtfO/vQ31mTB05BLA/bKJbUyA YG03aMonUh5s1yZKMRywCM3UOHoti3j760UJe6vzdD8i9j6Kjt3JP3kOWMG74Utiu8Pv iNxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127093; x=1741731893; 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=ll+J79NMjC+5QcVirstPzb5huPWXK0xa5gPo5OevAj8=; b=Qs39BzuYDh474+q2l1BNvZ/tmLoaoTmLjLFX2PFdSSjLykC1LE/TrPCr2o3N8n3fv1 1JUtF+/fKsOz64DWDdl5HwXV+0FOV41ha9vFJts+hTnpVqMqC6tGqgGb9Su/TIi7E9CP jqnq+jYLMhe5T/yNxFGFSCahcZlDeGAz4Lw9sQav67G48xhSa6k7yk/7FkcNo42GgUzA 9b5MrCuU2ROXawEwptyNB9y01/DQyuD83tVFYIWHmLCimQoZ0N8wUiZszYbebJkkrBj3 LWIdYzASYAEOkEBQV32GBc7zeWHvRhRdSg8uSeWJpt+T7ot/GY9Smn/pAyjPSKCGAx1/ oFQw== X-Gm-Message-State: AOJu0YzeplZ/xaZSbrBXck5rLZ0gybc2zZhsWSL93wvlezJM4ATXn0I0 dmAS7TNU5HSYo+Q2FzunUU1/UT4MBTdZgWJnzSpuDU5UO+v1OZxAUjncsBe/K7Y= X-Gm-Gg: ASbGncvqGOki6nHi9lcEgOXyPwNiytX1+HpspgMgFMZc3BgNEDyudEaCwNYjHv38VCs BZmsvBKs14meT8jXfBKRXsCfEOE/m+5Njyh5/x3mMu640Wgwmw9KF1IEqzXxsDJdu9ZgYXdZCrN p2h1BXAXbmpVwgkUL+y1a0PCDj8EPStci3L3/W4orRZt7n6fZLZwVVSG4MvBgCIwhh1Vb3MmlgW ULWy/Ld8wEhZHwgxN+Pm73pqIRXCJR0ZZGHIdFO8e3jZiBtpC1mGVioNTCqSphhbnRUZjKyOyc4 QavZBaVB28Nwu21JUhKyDDQ+Anpsj+2Rm4x1GHCJb94wSmA= X-Received: by 2002:a17:907:3e13:b0:ac1:e00c:a566 with SMTP id a640c23a62f3a-ac20da97b7amr98887766b.45.1741127093456; Tue, 04 Mar 2025 14:24:53 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abf692b6b44sm523833166b.112.2025.03.04.14.24.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:51 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1E28C5FCAA; Tue, 4 Mar 2025 22:24:41 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 17/32] tests/tcg: Suppress compiler false-positive warning on sha1.c Date: Tue, 4 Mar 2025 22:24:24 +0000 Message-Id: <20250304222439.2035603-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x635.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Peter Maydell GCC versions at least 12 through 15 incorrectly report a warning about code in sha1.c: tests/tcg/multiarch/sha1.c:161:13: warning: ‘SHA1Transform’ reading 64 bytes from a region of size 0 [-Wstringop-overread] 161 | SHA1Transform(context->state, &data[i]); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This is a piece of stock library code for doing SHA1 which we've simply copied, rather than writing ourselves. The bug has been reported to upstream GCC (about a different library's use of this code): https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106709 For our test case, since this isn't our original code and there isn't actually a bug in it, suppress the incorrect warning rather than trying to modify the code to work around the compiler issue. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2328 Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-Id: <20250227141343.1675415-1-peter.maydell@linaro.org> [AJB: -Wno-unknown-warning-option for clang's sake] Signed-off-by: Alex Bennée --- tests/tcg/aarch64/Makefile.target | 3 ++- tests/tcg/arm/Makefile.target | 3 ++- tests/tcg/hexagon/Makefile.target | 2 +- tests/tcg/multiarch/Makefile.target | 8 ++++++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index 9efe2f81ad..16ddcf4f88 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -83,7 +83,8 @@ test-aes: CFLAGS += -O -march=armv8-a+aes test-aes: test-aes-main.c.inc # Vector SHA1 -sha1-vector: CFLAGS=-O3 +# Work around compiler false-positive warning, as we do for the 'sha1' test +sha1-vector: CFLAGS=-O3 -Wno-stringop-overread sha1-vector: sha1.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) run-sha1-vector: sha1-vector run-sha1 diff --git a/tests/tcg/arm/Makefile.target b/tests/tcg/arm/Makefile.target index 99a953b667..6189d7a0e2 100644 --- a/tests/tcg/arm/Makefile.target +++ b/tests/tcg/arm/Makefile.target @@ -61,7 +61,8 @@ endif ARM_TESTS += commpage # Vector SHA1 -sha1-vector: CFLAGS=-O3 +# Work around compiler false-positive warning, as we do for the 'sha1' test +sha1-vector: CFLAGS=-O3 -Wno-stringop-overread sha1-vector: sha1.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) run-sha1-vector: sha1-vector run-sha1 diff --git a/tests/tcg/hexagon/Makefile.target b/tests/tcg/hexagon/Makefile.target index e5182c01d8..4dfc39bc98 100644 --- a/tests/tcg/hexagon/Makefile.target +++ b/tests/tcg/hexagon/Makefile.target @@ -18,7 +18,7 @@ # Hexagon doesn't support gdb, so skip the EXTRA_RUNS EXTRA_RUNS = -CFLAGS += -Wno-incompatible-pointer-types -Wno-undefined-internal +CFLAGS += -Wno-incompatible-pointer-types -Wno-undefined-internal -Wno-unknown-warning-option CFLAGS += -fno-unroll-loops -fno-stack-protector HEX_SRC=$(SRC_PATH)/tests/tcg/hexagon diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index 688a6be203..c769a7d69d 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -45,6 +45,14 @@ vma-pthread: LDFLAGS+=-pthread sigreturn-sigmask: CFLAGS+=-pthread sigreturn-sigmask: LDFLAGS+=-pthread +# GCC versions 12/13/14/15 at least incorrectly complain about +# "'SHA1Transform' reading 64 bytes from a region of size 0"; see the gcc bug +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106709 +# Since this is just a standard piece of library code we've borrowed for a +# TCG test case, suppress the warning rather than trying to modify the +# code to work around the compiler. +sha1: CFLAGS+=-Wno-stringop-overread + # The vma-pthread seems very sensitive on gitlab and we currently # don't know if its exposing a real bug or the test is flaky. ifneq ($(GITLAB_CI),) From patchwork Tue Mar 4 22:24:25 2025 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: 870137 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp493345wrg; Tue, 4 Mar 2025 14:28:40 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWBjF7NtjqpKmao+qwzhItp+dQWbOaAuA6MgSNXeNZOEn0MgyU9lZMjZ1p0TXb4qEabCRBM7A==@linaro.org X-Google-Smtp-Source: AGHT+IHk5/4ljUGrY9a7FohHLerPydfzJA1zI9SKAMJtxPitqKmAax60STRgOfUv6LjUcYFnyLcJ X-Received: by 2002:a05:6214:2526:b0:6e4:4331:aae6 with SMTP id 6a1803df08f44-6e8e6d1ec58mr16024126d6.39.1741127320259; Tue, 04 Mar 2025 14:28:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127320; cv=none; d=google.com; s=arc-20240605; b=ewpGlmwuSSmy1xPu4B9vEdU8BFl9WhMgP6A0XwoYhGTeyJvqWNmg205eGJRIq29BO6 KltSjRSU8LhGXm8NHZaEmMYPcf0vRHIwptpk10oc5TD/9eHg747vvBjhEHV8YqrnTZaQ xx9xPRd09aEN45J7LwtIhbomfTICcgLAM6mhXzmNb9lAJhR5WKnWq9ykPQITA5XY77Zj gnodSlCGRsw9lgGIxSDxgA0On/5/fq12hNH2yIKXWpBhfbaKlUlSaTpK+HwYzdtGbDQ+ mseFrA7sc1vqGhpoYw1UVGFOKf7kTA8imXeylJ0KoDAIBAk1bcSRpPlrll0eqWRib5EB hOPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=hl3FvxWtvNwG3y+1922WYsiibfe37dBnVTxNDuvBYeE=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=M2k0TBTQ9H/5QBRbIKsMaQ/YuQrKH0zKz5JRfXO5Q3Ge5b73SSsrqc4gPU+xOv7KnR t/seBROdZCA/yqDeEndNWeLOjPO/vISixn7EdWO0tJHYDAvDC5hdafnT+pXX3YnAt1tS EMWsvzdN/5SmQQj527JE1IwKCcQe78eRxQ20BjCa3r0lB4j0rCosdweJc/imtIH9s7kZ XH9PufI9pFofZBxwoqawYbEqSmQwtINIMcUwQeC8kmcphzahjUK3F3DI3gfQTy7/VEsH A1l/vLm/49NNgXi/VSbM/nt3c69U9J7ZrZarNh4VgIagXmuGGIAMFlyMiqG9bUiLrNkl 6yeg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RmXgQVLO; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e8976c05b3si114963086d6.191.2025.03.04.14.28.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:28: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=RmXgQVLO; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpaiU-0007BP-2A; Tue, 04 Mar 2025 17:26:22 -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 1tpahA-0005SZ-Nh for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:25:09 -0500 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpah5-0006ZA-IK for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:24:59 -0500 Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-5e0813bd105so9784496a12.1 for ; Tue, 04 Mar 2025 14:24:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127094; x=1741731894; darn=nongnu.org; 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=hl3FvxWtvNwG3y+1922WYsiibfe37dBnVTxNDuvBYeE=; b=RmXgQVLOISEuh9CEtfKesy4t9IZ58BvWXTmsMjTVJOwHIS2rboU+5qTmAeiWnDELaL fBWER288znTdXHmcpeu8hh84p+7QDZ0zUIvvvq5ewhk+mcgmEelCEYbnEf3+ynrvTZ8n ki4sGkSi+713i1ejspIGx2g6QE9KZrXTiYf7sTKL5ENxvRhV8rVp91bLrtkxo5zuwlZX 3bOkgXIld343F7Ot4BZjXL4E5ce/bgZ25Fr2K30G2RW9laaA0p+h5i6afsCSprcNbpIC YF8eQ7Eciog9ZR+aJy938zD7iGVmkWiU0Hn7j7gIYVnpCYPY7HxRzkxMT7FxMm+nCjGT elqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127094; x=1741731894; 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=hl3FvxWtvNwG3y+1922WYsiibfe37dBnVTxNDuvBYeE=; b=Qc8hEfddlNwlfUo8JJWsEUKk+IteIfRJhLzlOEPhnJlprEjtHkOqYV32wErkQ7u7r3 iAEqQIxzgJH6z9Thhy7uW7OH8JxBEx2NCV8yj9Bfgc3Jr87gXzhe56Fvq4vDAFcbDZrV HOFIHtjb0Z32RKyYevI4wo2kN8HohkIengTEvZhRPuPOxGBJI6KpIwd7YuFUAcH3Ubbq kR4zIOokjgjrPKFIU3P1XJgjk/gR9omh2/ga7IWDF/1RoEe/mIQBVVLum1sxn//5Shgb qKzGzJ3dWcQhVyd9/VMNq0fuveuGkH3DBeabvZkduKQ1uENIOK/zcDibUxnaQM67hHDd CrwQ== X-Gm-Message-State: AOJu0Yw4PNnqrFtaW//gqsFdhsBm4+QehQyWbuncBAifuWf8cev1xnVN 6FT0XqwNXB7c4Obe4SqLolXiwGEgBwJXMMiP9zEkuvbkWHCcllCVXLW8bq9kbyE= X-Gm-Gg: ASbGnctqu9iydQ2abiccleCRz/1+Lkg+ixk4Fa6Zdg0niqJywtteOLrBboiP4nApN+P jTUKex5aLyxqRO7yplCcAAiW4zTcshTx5YoLmqo7GByf5gDuV7lsywT0qMm+AD1/1NyR7Kz4ZmB dFRQHkTgmRjXuWhZV4fk0KiI46DyPGE22xBbH1mH5jmeKC9FsztIW9PfO3+q0L/8Wf4d5+gKid3 kBnnbWyoChZyh1pBSEKIPnrYIUg+FMY4sylM2V2nsSxwYw+kfRQOVSW3AFR6JzVgtHpwdBVR0ml Ld6FUx61+bUUf4eqHo1RNCYbryHRL8pGm1I3yegrcn5OV2E= X-Received: by 2002:a05:6402:3784:b0:5db:e7eb:1b34 with SMTP id 4fb4d7f45d1cf-5e59f3d67famr765205a12.13.1741127093846; Tue, 04 Mar 2025 14:24:53 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e4c3bb5ad8sm8715799a12.34.2025.03.04.14.24.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:51 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 32B946082D; Tue, 4 Mar 2025 22:24:41 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 18/32] gitlab: add a new build_unit job to track build size Date: Tue, 4 Mar 2025 22:24:25 +0000 Message-Id: <20250304222439.2035603-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x534.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 want to reduce the total number of build units in the system to get on our way to a single binary. It will help to have some numbers so lets add a job to gitlab to track our progress. Signed-off-by: Alex Bennée Cc: Pierrick Bouvier Cc: Philippe Mathieu-Daudé Cc: Richard Henderson --- v2 - do all json in python --- .gitlab-ci.d/check-units.py | 66 ++++++++++++++++++++++++++++++++++ .gitlab-ci.d/static_checks.yml | 22 ++++++++++++ 2 files changed, 88 insertions(+) create mode 100755 .gitlab-ci.d/check-units.py diff --git a/.gitlab-ci.d/check-units.py b/.gitlab-ci.d/check-units.py new file mode 100755 index 0000000000..268a4118d5 --- /dev/null +++ b/.gitlab-ci.d/check-units.py @@ -0,0 +1,66 @@ +#!/usr/bin/env python3 +# +# check-units.py: check the number of compilation units and identify +# those that are rebuilt multiple times +# +# Copyright (C) 2025 Linaro Ltd. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from os import access, R_OK, path +from sys import argv, exit +import json +from collections import Counter + + +def extract_build_units(cc_path): + """ + Extract the build units and their counds from compile_commands.json file. + + Returns: + Hash table of ["unit"] = count + """ + + j = json.load(open(cc_path, 'r')) + files = [f['file'] for f in j] + build_units = Counter(files) + + return build_units + + +def analyse_units(build_units): + """ + Analyse the build units and report stats and the top 10 rebuilds + """ + + print(f"Total source files: {len(build_units.keys())}") + print(f"Total build units: {sum(units.values())}") + + # Create a sorted list by number of rebuilds + sorted_build_units = sorted(build_units.items(), + key=lambda item: item[1], + reverse=True) + + print("Most rebuilt units:") + for unit, count in sorted_build_units[:20]: + print(f" {unit} built {count} times") + + print("Least rebuilt units:") + for unit, count in sorted_build_units[-10:]: + print(f" {unit} built {count} times") + + +if __name__ == "__main__": + if len(argv) != 2: + script_name = path.basename(argv[0]) + print(f"Usage: {script_name} ") + exit(1) + + cc_path = argv[1] + if path.isfile(cc_path) and access(cc_path, R_OK): + units = extract_build_units(cc_path) + analyse_units(units) + exit(0) + else: + print(f"{cc_path} doesn't exist or isn't readable") + exit(1) diff --git a/.gitlab-ci.d/static_checks.yml b/.gitlab-ci.d/static_checks.yml index c0ba453382..c3ed6de453 100644 --- a/.gitlab-ci.d/static_checks.yml +++ b/.gitlab-ci.d/static_checks.yml @@ -70,3 +70,25 @@ check-rust-tools-nightly: expire_in: 2 days paths: - rust/target/doc + +check-build-units: + extends: .base_job_template + stage: build + image: $CI_REGISTRY_IMAGE/qemu/debian:$QEMU_CI_CONTAINER_TAG + needs: + job: amd64-debian-container + before_script: + - source scripts/ci/gitlab-ci-section + - section_start setup "Install Tools" + - apt install --assume-yes --no-install-recommends jq + - section_end setup + script: + - mkdir build + - cd build + - section_start configure "Running configure" + - ../configure + - cd .. + - section_end configure + - section_start analyse "Analyse" + - .gitlab-ci.d/check-units.py build/compile_commands.json + - section_end analyse From patchwork Tue Mar 4 22:24:26 2025 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: 870144 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp494389wrg; Tue, 4 Mar 2025 14:31:34 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVd2LkPcOfU1ELZq3suEkzu+XyTfwPhg+bR2MSaCzdmvdefNijmwjpUuDXNcUGzRpVYD6cTJA==@linaro.org X-Google-Smtp-Source: AGHT+IHMj547XN+DJOpEm1SmsocKwjT04MO5XiD0tXVO/5mnuH4nfTlS4aCBeNf0aDtunUWU7o8q X-Received: by 2002:ad4:5be4:0:b0:6d8:850a:4d6a with SMTP id 6a1803df08f44-6e8e6cc6bc8mr12957306d6.1.1741127494337; Tue, 04 Mar 2025 14:31:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127494; cv=none; d=google.com; s=arc-20240605; b=a2rB6FzSEiIFXxN7joYXKfCDRrEQjpVEJdc58tToVlzGol2cpugJCGwFVAXF0pXbU9 aSk3JuRczatgYw+jr1cg6chb1P2AlQHMMbmzQdLTrVdLGiMa/VVqJc5NJCOS6CO+8ahi uJnFnRgj5UBop+OvHTx/Jrcw6QCZw4QzbNnD+1AAyX3uDpZVKfEyqTo+o7GHQXfcm0MB KMfU1W/7R36amP4PYkptdNETTI1BFtQQV5gZxNKi+qCsdWpYQtw/3ff7sjPxmuk1B83a mq7E0TZuCbqCHUNgzDY0BAxP4RdavoFCAqzfZX8qu7OJeR3T7ju8KlcuMcvI7nCQ/dt7 by8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=rTtmDnmwvkhdA/58TzSBQMrhe3CiA531O+6zAKZ/Bs8=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=hEwyMk+2Sb9YTRNrrQmQoQKe4mZy+hYjpagLny2Y0c3voAp4TlpGrRIqU1HvLQi53a rCQtkDA09WzFIh3yzj7EXcgfnGoI0zeEVDEtbiO2BnhsPg5OvXjzNfc/bf1hY2nc7zfM Cvtr1k3ejM3gelrM9Q8uPWvO5Ga7T+e/1N9Ho5B1lwy59FB6bd7OyCYyOVEygJpuiOV1 ckI143AyqG+GbiUrVFvRWnx7/H6dGrkClETbrt4FQ6Wy8+mHoF2VJnEH3r8/jreosZXT zkO0mvGEoNGKORbsHLETEYAF1y25HA7LyZwzV4wu5rwkq8CWbd6ot8kHpU/bO2envOTs KvHQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="oc1Vm/Le"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-474e31299e6si51949101cf.295.2025.03.04.14.31.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:31:34 -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="oc1Vm/Le"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpamZ-00018Y-8f; Tue, 04 Mar 2025 17:30: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 1tpalx-000864-M2 for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:30:01 -0500 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpals-0007lu-Ng for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:29:54 -0500 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-abf45d8db04so606696066b.1 for ; Tue, 04 Mar 2025 14:29:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127391; x=1741732191; darn=nongnu.org; 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=rTtmDnmwvkhdA/58TzSBQMrhe3CiA531O+6zAKZ/Bs8=; b=oc1Vm/LeqIB5DfQs3g/7Mu58ikOwEiNNBKvAmTJRSJTNDkEsBvqgGzlS4KbynOyfZz le7ri63xD9tSBahckEg7A6VmO05ucHbf7+TsCXH9dd1WFcvDGcoey224SA0hvBuXd5qq dwI+Ywsbf+VRMt96OIj0U6ty8vT9f2WjRvMxbQ8FsqRVIaCz3T2hFHXh+FjYHtzLUw2L 71UAaUnvdHtxzOAweXblveVwfp4ic2LtTQSZmGG9OVHFfMHa1O64u6mRquuzc/TCIMYt IMV7BUHElZSBdJ5E6iSHAV5c3bG6yqHIKOV+0+WwDQqlDYNzVZkC3Um6dd72OBmu+N6u /PlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127391; x=1741732191; 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=rTtmDnmwvkhdA/58TzSBQMrhe3CiA531O+6zAKZ/Bs8=; b=HwuytNzUkEywDnAIIJeGgHl+YrcoiuPNHkZq70WKB8xyTxQbDKlcdJX4JXnyyVXnKy 6TUHi2Z6posQVAyiTDrgKJwLXZ65C/Ru12H3inxGx+c/SvMbeZxXS1qki1T51xcmnbyo JavNJCIqvNOwq6caILVIn5d0QljJqkanbJqwkak2XjoJ1L4QV/O3LBoxv0SZSjm3Jg30 U6NihDGwZ7OjWLYrHKbbCVmo/EoL4O9zmwBLn7YItH36k/HBQ4tXdKl/5nNcoz/3k+TC prQKziEL9/hHCuGCLY6gSGM9xNE9yPd7baa6BvltTfldcxUajxW4XJv0XQoHYLVrq/qn krzA== X-Gm-Message-State: AOJu0Yx/9uEOGKnMUV0Mz6TdEuL8zmkZSqCmeHKw+5oWx7Bpvj2fvdDL 7/JylYTc2aow7Fd4BzBSXlrXbMrLMVOaIbTMImDbi8jJy5BOGM3mUpKVZjVx+9I= X-Gm-Gg: ASbGncvt9zs2qqkuhjsTBiU44sDXmHZ0NSWra6G0aVBwnMJr9MUkPv4ZrkXeH86IWw2 COfEKDwh/rywObLdRVU6YJ7xXjm8HqIO96hGoprinnQANBJfKbwecHdeTPFA9J88cHYKOM5MVyw O/yQpAxjqzNIwZKnKJOR00but81eNT31P0kRreaDUuobGP9VAGO38+Bap8mZ+NsNfNgRBpOzGYL gXkgtMJ9XVkQqgOpHTGUY0CZj2/2kJboRJzfi5FiB7urbQyRdROXwE+wQ7/XH7Ngg7JNVfUBZTT dAonoOT4AvOusFTD7ls+LRslKwD1bAhnUBPMKi9npFAJfwI= X-Received: by 2002:a17:907:6d14:b0:ab7:d87f:665b with SMTP id a640c23a62f3a-ac20dafc17emr78306366b.48.1741127391262; Tue, 04 Mar 2025 14:29:51 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abf0c0b9956sm1037106766b.16.2025.03.04.14.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:29:50 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 4D4A860853; Tue, 4 Mar 2025 22:24:41 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 19/32] tests/functional: add boot error detection for RME tests Date: Tue, 4 Mar 2025 22:24:26 +0000 Message-Id: <20250304222439.2035603-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x635.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Pierrick Bouvier It was identified that those tests randomly fail with a synchronous exception at boot (reported by EDK2). While we solve this problem, report failure immediately so tests don't timeout in CI. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20250303185745.2504842-1-pierrick.bouvier@linaro.org> Signed-off-by: Alex Bennée --- tests/functional/test_aarch64_rme_sbsaref.py | 3 ++- tests/functional/test_aarch64_rme_virt.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/functional/test_aarch64_rme_sbsaref.py b/tests/functional/test_aarch64_rme_sbsaref.py index 93bb528338..ddcc9493a6 100755 --- a/tests/functional/test_aarch64_rme_sbsaref.py +++ b/tests/functional/test_aarch64_rme_sbsaref.py @@ -60,7 +60,8 @@ def test_aarch64_rme_sbsaref(self): self.vm.launch() # Wait for host VM boot to complete. - wait_for_console_pattern(self, 'Welcome to Buildroot') + wait_for_console_pattern(self, 'Welcome to Buildroot', + failure_message='Synchronous Exception at') exec_command_and_wait_for_pattern(self, 'root', '#') test_realms_guest(self) diff --git a/tests/functional/test_aarch64_rme_virt.py b/tests/functional/test_aarch64_rme_virt.py index 42b9229b4c..38e01721a4 100755 --- a/tests/functional/test_aarch64_rme_virt.py +++ b/tests/functional/test_aarch64_rme_virt.py @@ -89,7 +89,8 @@ def test_aarch64_rme_virt(self): self.vm.launch() # Wait for host VM boot to complete. - wait_for_console_pattern(self, 'Welcome to Buildroot') + wait_for_console_pattern(self, 'Welcome to Buildroot', + failure_message='Synchronous Exception at') exec_command_and_wait_for_pattern(self, 'root', '#') test_realms_guest(self) From patchwork Tue Mar 4 22:24:27 2025 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: 870146 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp494971wrg; Tue, 4 Mar 2025 14:33:30 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW9Mj/BRB/i49wi1APuC6cEPxTcg2ypDPinsyGGiaE6cFui3/odpJwIxf+IFQ18IuBA+umclQ==@linaro.org X-Google-Smtp-Source: AGHT+IGKoZBsihajM+x68cJPFVtLegRGhIDYAEg+oGgXBBvxocgt9r5+bJOFwbc5eoLL0Ds+t1Pu X-Received: by 2002:ac8:5fcc:0:b0:474:bc66:a905 with SMTP id d75a77b69052e-4750b23c752mr13230661cf.4.1741127610344; Tue, 04 Mar 2025 14:33:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127610; cv=none; d=google.com; s=arc-20240605; b=N16WThnxsVgO1XSVfqsPxPe+/UjD8xnRa9Jy54eMMVA42x/sZQ/ZvZ3d8tzEJhDeN4 oi3DkUGvCcLd3852mIhOOZY6tQo0zo4fYWsfxGEWEeKhbGrhUz+K31eipVFiumw+ykBS b6xYg67bGb9xh6mUXavveuMWQ7w6s+HTCDRBknkl3nNf1dDP7BSNh4s3nyLkitsKszKS U2YZZKZxAfppihenrPv+jWpV3wRsgBdtkjxExEPu11fTG6RYpVheS0/ncO3EWPJUpcIr xWQjDSRVNTjChz1araNXo7DPORfACh+lhwPtWwIIyoNvuwIesLEfo2pHEfzRdE3TuVNv cKRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=Vs8Rq5vK4O3QcQ93DYTQizcZdV8tDfXluF6Fck8WA/w=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=EoOPHvVwh3jNJeML+LQKP8TxDrWHZkDped11PT0la0nFyt68M2yZzR9qauAKF/LZIx gd9SuMWVccx+YAHLMVv6/PZ2k55wtwv4kNoz0I6xrEGkSB7mEUIRLKGEKC+q0Fc4VLHX BP4bFfU94HQypfs3k/pchlpTdEGGQPvB27MM9AxsQI2v/8/LDoOgrRg0lNU3F/jPTolF pTa7OZPUmznpeM5nH6CpgKxBEYmNlnaiF6tWpSxJwByZ9ifH+CGqgXANbd281TiInD2J M5l9b867wv3CC0UPEDn0lQ0r6SIbtQT5IsViGNN5Fud04/J3F6+0ffmqERqsIoIm/FMz wZ2w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ANe3VcYB; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-474ed9128dasi44821061cf.591.2025.03.04.14.33.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:33: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=ANe3VcYB; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpaoL-00032D-O7; Tue, 04 Mar 2025 17:32:26 -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 1tpamC-0008FM-Hg for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:30:17 -0500 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpam4-0007nK-MA for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:30:08 -0500 Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-aaf0f1adef8so1142626766b.3 for ; Tue, 04 Mar 2025 14:29:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127394; x=1741732194; darn=nongnu.org; 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=Vs8Rq5vK4O3QcQ93DYTQizcZdV8tDfXluF6Fck8WA/w=; b=ANe3VcYBrJflqJsd5isrrmoijLUGlbFhZWU7Uputxcg4MeSpiRgJF31mDog0Lv0y1r hjC6tpw89hTKI3JFjbpc3Rkn7aOv+sTh7cQY15ZylKPTwjyYZ3X9AQ+ogCTIkUpDCOlC s7BzNwOH3V8ZN2jPQIP2mGcG9DmZeJE5gOzKGg6MVQU7MIQoUzpECydAfvcNMan99hke rP8EU6s6GpYVMw0CFu2Hx93c/S+mlY+cI4o0ePzfnreFpNQrLkqRcwi1fkHWCleg8zj2 SO3JlENrgtDnJxgjtQdzuYijJOtzvulqMKCHY3sXsDiu8ezoSF2DdpdCmtvALv6emn2s 1MIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127394; x=1741732194; 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=Vs8Rq5vK4O3QcQ93DYTQizcZdV8tDfXluF6Fck8WA/w=; b=nxAOpCEUwv7gd25joxn/FOYHbTr71+YcU72PkafWCkKuyE9w6gCwUjnbFAgttqPz8o tYMNCTPiOFt2ZH7M+Q2yAW37DDLr7ewv4K03OzVhPzlwLFkCgZxyJuS1OC/Xg23bUMHr IrNAmsXQDdxoZQAPx+GV0Yf8EpQnD4/5/1OexRZQUTMb7rRqFvXT2L48WHZtJv0hJP/B YbnxFFs7T9jPpOBaTZe4bNghhUWduow26b9WBkUtu8Xzbzv6hvnr+wLZj/llXE0ddCsn dXNL+G0QymuNCATbskwWqcNQJvxQalfeBWqR5y55bBIl/K6FGnISnYGLYuzY3jICqAP1 XdTw== X-Gm-Message-State: AOJu0YwKv+ycqn4fyVQ+oVDkq3fpyg9KTNDWkfhyOnDkrrIf95cx2SmQ 1UJfgqowBIduPmWfcmMX5C4d1Z0sHrZF0Fqj1uPjNOG/SV12FwINyna2JVA2KqY= X-Gm-Gg: ASbGncsnPahFrMim/7wzGtwkxN4QtZLvNQD2SmpYSsxotjh00REosNDAvj/Rm+/nfTz mP6tad6hEcXM1JeiJzmtY0SdRNzVBygBmn2ZH0jthEQ56YupKuC8hi8IAK+Ncbrc9NqZzB/vlW+ Wrwb2GLsYN1nZnladSYnXsWse0nYeFYmKdkRazRr6mF+Vgt5hSodwWW7Gx1gQdwEeMYl/kNTcUu 5Uwo7Z29v4UNCLWM/0lqLt8NjOw7oSRH604AwFUO8Xb5AMg+gMxt2PX2Ca3AWW4IVHhGasaJxPn UEKcugFAnaKEYd9UYyeb26vPF5QeAVTMTJ+UbmN6ZEmwm/A= X-Received: by 2002:a17:907:94cc:b0:ac1:ed46:7bf5 with SMTP id a640c23a62f3a-ac20d8bcbcbmr76665866b.19.1741127394284; Tue, 04 Mar 2025 14:29:54 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac1e87587basm253720166b.66.2025.03.04.14.29.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:29:53 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 657FD5FC87; Tue, 4 Mar 2025 22:24:41 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 20/32] plugins/api: use qemu_target_page_mask() to get value Date: Tue, 4 Mar 2025 22:24:27 +0000 Message-Id: <20250304222439.2035603-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62a.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 Requiring TARGET_PAGE_MASK to be defined gets in the way of building this unit once. qemu_target_page_mask() will tell us what it is. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20250226140343.3907080-16-alex.bennee@linaro.org> --- v2 - use the proper qemu_target_page_mask() api --- plugins/api.c | 3 ++- tests/tcg/hexagon/Makefile.target | 2 +- tests/tcg/multiarch/Makefile.target | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/api.c b/plugins/api.c index cf8cdf076a..fa4d495277 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -43,6 +43,7 @@ #include "tcg/tcg.h" #include "exec/exec-all.h" #include "exec/gdbstub.h" +#include "exec/target_page.h" #include "exec/translation-block.h" #include "exec/translator.h" #include "disas/disas.h" @@ -287,7 +288,7 @@ uint64_t qemu_plugin_insn_vaddr(const struct qemu_plugin_insn *insn) void *qemu_plugin_insn_haddr(const struct qemu_plugin_insn *insn) { const DisasContextBase *db = tcg_ctx->plugin_db; - vaddr page0_last = db->pc_first | ~TARGET_PAGE_MASK; + vaddr page0_last = db->pc_first | ~qemu_target_page_mask(); if (db->fake_insn) { return NULL; diff --git a/tests/tcg/hexagon/Makefile.target b/tests/tcg/hexagon/Makefile.target index 4dfc39bc98..e5182c01d8 100644 --- a/tests/tcg/hexagon/Makefile.target +++ b/tests/tcg/hexagon/Makefile.target @@ -18,7 +18,7 @@ # Hexagon doesn't support gdb, so skip the EXTRA_RUNS EXTRA_RUNS = -CFLAGS += -Wno-incompatible-pointer-types -Wno-undefined-internal -Wno-unknown-warning-option +CFLAGS += -Wno-incompatible-pointer-types -Wno-undefined-internal CFLAGS += -fno-unroll-loops -fno-stack-protector HEX_SRC=$(SRC_PATH)/tests/tcg/hexagon diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index c769a7d69d..45c9cfe18c 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -51,7 +51,7 @@ sigreturn-sigmask: LDFLAGS+=-pthread # Since this is just a standard piece of library code we've borrowed for a # TCG test case, suppress the warning rather than trying to modify the # code to work around the compiler. -sha1: CFLAGS+=-Wno-stringop-overread +sha1: CFLAGS+=-Wno-stringop-overread -Wno-unknown-warning-option # The vma-pthread seems very sensitive on gitlab and we currently # don't know if its exposing a real bug or the test is flaky. From patchwork Tue Mar 4 22:24:28 2025 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: 870143 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp494383wrg; Tue, 4 Mar 2025 14:31:34 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVYUNmr5zGw5BgPvxJn046JHpyLG/FY4psBLrsVNMBWRDoFLhEdh8NdIPEx8I56xmE9K3DH8Q==@linaro.org X-Google-Smtp-Source: AGHT+IHgZVyun/5RHM8iethvL4CSfxBLwg6vFk+AL2GyFOHNiqz4R/M03E7Fm5U4nMooJcnpXbf4 X-Received: by 2002:ac8:5891:0:b0:475:8b7:26c7 with SMTP id d75a77b69052e-4750b232d1dmr14279771cf.2.1741127493864; Tue, 04 Mar 2025 14:31:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127493; cv=none; d=google.com; s=arc-20240605; b=KU1elnyRu4PB43AikjGyc8E+JYfzxoNzxP8s5cl+2TzwGcqJEJ5oGAe6j+CwNGvzw5 FXVhBlRL5s7I7CH5IsipAR2HfljtzYJrNaAcIslh2U2ugc+GCrjQCmlIL5zhiGj6WgHf QxitDOGI5LrUgDhQnVs4bJltCS6lZvW3Wa4YNhoOlC3kHWzSiDP4b5sq9gp/fcwlxtzb cNDFs6rUlShO4+pvfBL4HX+2mI0QmvtdC/MvzwDyOXDlGQ+zrv+4nk8sM5Br1iEA4vQ1 fnNtzvaSH2SsUDyOKo6QgzotAkwTG0ekkrLO30MHqbPLyuG1+kLpgp02A0UU3XLklkno hwig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=r6DDeqPK1m6ewykNxxzzXStrfWH34KNa8iyzVW/f3D8=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=bl+XEsDr7MSJFuXOj5IEnMWpJ4cSwvcye28peDqQwiVUf4nOU+wM+gAagUa5/CPGDn kObMVI1YUnpvA9wL4+8M66cMnqQ3ZZqGpCCxSTmzy5KKVXdS9enIa4FsQwpjDciaXVWW HTL/ytniy1LBZdTCA4vsmm58oX8kL3MgcUYehe4X5zFVdAhNq+GXrFZ/dTTY+CMyAVE/ WgpnyUiw8DE3gPLaAMqPqCjHGfPFSu7H6tus0APTlr1NEF6Mtw5hKmbwwxTW7h8Oskua OuxI3j6UuVLS1mG9wtw3KaDCG8AHU9gWquBtf1ocizw17rd6dTHwKe9wy/T2NTOEE8Iq oLyQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WGH4L7Ba; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-474f0821f77si41655941cf.55.2025.03.04.14.31.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:31: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=WGH4L7Ba; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpami-0001jz-SJ; Tue, 04 Mar 2025 17:30: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 1tpamC-0008FN-Jo for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:30:17 -0500 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpam2-0007my-M2 for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:30:07 -0500 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-5e535d16180so4085571a12.1 for ; Tue, 04 Mar 2025 14:29:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127393; x=1741732193; darn=nongnu.org; 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=r6DDeqPK1m6ewykNxxzzXStrfWH34KNa8iyzVW/f3D8=; b=WGH4L7BanjW/bEYumIveYp434V0zrCNl/AvZz4mX/ln/NV0FsQ7i74eYenOjfSqSHI 1cohN5AGcL3zOODSlSM8mrBxHKa1anLVzCDjlgra3ZIpfSk9U5FIy5nc9hkDozi57kUj UKVGCHYqCiroK/tvIlXQ7636KTqvwz459hrmzaTWYoRL5e/ChHSQoUl4UeON6w15xXZt T2cEPBMyBtXCE9BLNZJAYdKmJyirXaNFfz61raVxLK1iRL6etciQupMfEAk7N447O0WK /aO2hbVSRHgmWk0s6A0CGMxDKCHQENmwXuK0I8qSnpHi69zdeoXuGOHvzZc6C3WOLQsN 1thA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127393; x=1741732193; 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=r6DDeqPK1m6ewykNxxzzXStrfWH34KNa8iyzVW/f3D8=; b=GnhsKAs1IEJAfKOP9QSUKzXI3Cr3iqv0J4iC/2yZUw5xFySks64ZDado5AyaSqOLj7 VNXvnR67tEqsw4ZwuHtt0Bzh66H1BTp9Xjwr8S5BcejYZzcjQFBFCHCMrN2XREHTxZj/ 60OR3Aftl0vaRPxZjgrRlA6s6YbAEW0yoNcqbdlL1lefNe/xTYM/0d8l2X3FhERi6EMI nd27I8545NZPSH0tyeE4+dwXtxLiy4x3AelBhE7atb4fbZ+DIb0ZupgVMqjZ+7G+HIOb JvKIDj6i1+tbYeTJgc1kPzpjzHs8TuH8jm0PSzqQ7ChW2saq2diDXQAPip9WUeZGlPeR 6PvA== X-Gm-Message-State: AOJu0Yw6heJjpTJWHaX9g3X6+Yao1Og4YOj2fKqhLf7yHJYKCYGxOCty DaWErjZOIOjwSf/h8fjNLUSxsN0b9ikxVRzsJ1JDnmJ5hq9AsZ8mziTER6f+IFM= X-Gm-Gg: ASbGncukRhaFnI84Lida6lUFggcrHtHYxPoEYwoeQnrNotlnOnVYs6Er3HGj8c5WGqa zVKIzdXYPWhIb07FtsvQXYWgSIX4mkDuGMM32dEEwio5wn9qcHwjb2rrvA8xuFHe2ojhg50XYLx QdN1OiN63caJjH4ePW8rzggIv6EJOVIHHbyWsiLVMUCzHonOiH4Ytw26g9ywguDJ4H5Msauhz3O t3H57kkpY7DCyPRYDEDxzMjTs2KrFXHZOTcndLTbkvlPsVEsgT6LYPHpUAMuAxjd5lF31i1vmNu 0l0651mPZNmjoOl0+LI0G35xX62GUcy6pBMpSaqIf+iCI5s= X-Received: by 2002:a05:6402:35d6:b0:5d0:c697:1f02 with SMTP id 4fb4d7f45d1cf-5e59f3efb5cmr1781860a12.17.1741127393588; Tue, 04 Mar 2025 14:29:53 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e4c3fb51e1sm8997174a12.61.2025.03.04.14.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:29:50 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 7D44360858; Tue, 4 Mar 2025 22:24:41 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 21/32] plugins/loader: populate target_name with target_name() Date: Tue, 4 Mar 2025 22:24:28 +0000 Message-Id: <20250304222439.2035603-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 have a function we can call for this, lets not rely on macros that stop us building once. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20250226140343.3907080-17-alex.bennee@linaro.org> --- plugins/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/loader.c b/plugins/loader.c index 99686b5466..827473c8b6 100644 --- a/plugins/loader.c +++ b/plugins/loader.c @@ -297,7 +297,7 @@ int qemu_plugin_load_list(QemuPluginList *head, Error **errp) struct qemu_plugin_desc *desc, *next; g_autofree qemu_info_t *info = g_new0(qemu_info_t, 1); - info->target_name = TARGET_NAME; + info->target_name = target_name(); info->version.min = QEMU_PLUGIN_MIN_VERSION; info->version.cur = QEMU_PLUGIN_VERSION; #ifndef CONFIG_USER_ONLY From patchwork Tue Mar 4 22:24:29 2025 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: 870150 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp495149wrg; Tue, 4 Mar 2025 14:34:04 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXENw0w6Q5umDi2Is3fl4Pm5TcI/TuZJ2zA92GD/miJ4aQypZdtmappj5662SfzWd2L8dViZQ==@linaro.org X-Google-Smtp-Source: AGHT+IELIAskG0DPwR1FWq70I0yJ8o8xhmqrEzxxjq6PonaxmOskMF0nJUblGj6iwobWl/65u2wx X-Received: by 2002:a05:620a:2815:b0:7c3:c676:ffb8 with SMTP id af79cd13be357-7c3d8e20f42mr168253185a.10.1741127644499; Tue, 04 Mar 2025 14:34:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127644; cv=none; d=google.com; s=arc-20240605; b=DkLL0A2rhYytH8W6GxO8xXDdNKBk2CQ8NHvHvCt4xGLsjvF2TzoCEDcXEeAekv7yd7 i6X5LOBhwGZLZJEjlD3MzABERM8HZmTlLcIuPSHLbL9FpUBXoB7XjEtXQvr6STOG9Lp/ SpLegL/7ACRF6ULja+7FMbDz+t6XsU4Fgw+E0as3GI8lRFSXvaH3mkWRrkUC389/vWlb omfMlSnf2cF9nWqI09Sokz6iSPQnjZMHnY58kErw1InUBmOm89V+CkFmJEo2Kgh34Jof 2kmUSQosgEGgd6tiTJV8pyI5MuFJtK0bOHQA5Y4C565fJui35UFklnhJjI8rOY3Kqe3d OWqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=sxlbdGkJ13G1o6ELtDmgQA5UFhIUKmW1fQAOczDQAMQ=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=C5hVwUjSGrJxyFSNvvCULagJmfuNMCFPlJyTQY9r5BZI30zxnQAruM4zAvwRYRL62s zxCYCi6YcbF4suPIU7ymFWaT1ltFIQepWmYrbUg7qLlpApWfC3NkdPIwEV9w/0PXr79z f7dTcZsniE+M6IOUbwOBTP9IJGcpXbaDwouHMSaVilCjj5ZDAPyz+C+H4pZOnunprlGn lkox1Uve1P9irz2sgZ/yVgqpvRwTSxPlQBxpmrDkcFdLhKvpyKSj17Dx/e7F5uwn85nY JkgcTyNfyKQziv8GDJYthjf36ltYMSXurHothmdlb83Ra5DRoHkrN6REgNKtSTIcK+sk 1yIw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lhmXeaV6; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3c1fb770dsi397705185a.347.2025.03.04.14.34.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:34:04 -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=lhmXeaV6; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpamO-0000Hp-E1; Tue, 04 Mar 2025 17:30:25 -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 1tpalx-000865-Lv for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:30:01 -0500 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpals-0007lj-93 for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:29:53 -0500 Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-5dc89df7eccso10107263a12.3 for ; Tue, 04 Mar 2025 14:29:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127390; x=1741732190; darn=nongnu.org; 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=sxlbdGkJ13G1o6ELtDmgQA5UFhIUKmW1fQAOczDQAMQ=; b=lhmXeaV66TOoPR1GX0c7Mbqbh5IDjMQC3hPEJGvSKlc2JStkxtcTOIbsdDT5cMNrff qE9lmKmYeGjJdEzC2TIBqpJnZeEpXNwl+ec2Xdc9vTX9b5zTjw+p9SelDjvY3A53Y0In 0lTbnP2A193Tg4lWBCNygX1rbOzbyjzwPLB8W13dKGZsx7S6bOvNGW7Dc5nn8iy17JWp yn826qYiA4gWzDiV0Pce/35ACtpJaFz6Fat8clZPdFTd3MfwiwmF7Wpf29DlB1rNBPBf b2Jn6Kc6fntgVAm67k4GPnQgJ4lb/w44G2qkjnpUpy4/fqNjsnPflF3Z3ZEWGh81hZmR OnGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127390; x=1741732190; 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=sxlbdGkJ13G1o6ELtDmgQA5UFhIUKmW1fQAOczDQAMQ=; b=b5w2oA7AZ/pRkskvdRbPoqML9VQk87PYGb7uFWdvRRXKnYHVhG29ZjO09Fi1BQKIoC 1e9le3rLK/nb3xfrAdwPS6f4CvleaG710e8Y8/0FLUJ4SGo+dbm8QfjCxHNUD9F1/6nI fkIjmCTM1AtspaacxCO3PU2VBuY54XLvX4Kdmywyvzb4h8dfrUXHv4HUcQGU6nMAEypn 8k3Q7F1CUyAgi7XJBAwolDjy0OC/sSID84bIi6n5TpmvCPRq7rONvbvHBZZIwQx8npBl OyrwH3a3yexhwR2F2vg5D+Nw+KthOvqNMRorQ5hBEtTTHjtcAqe+2RuyhkPcswRK5W3u Qg8Q== X-Gm-Message-State: AOJu0YyDhDSVnyK5MDgJXzeCh6dKvSjRahATXf+AO3DPNtsrNxF/HfLI T6wYOlK6f2DbqUTeCpuKuGTrTiH3FW9EetA2xctNl4VNzEenJC1p7sXnbnJj5zU= X-Gm-Gg: ASbGncuZNnYFUKZAYYrk4BYcwPnrWA/lvANUicKX7VGOxW6dBv3+bm9ByTEEF1oYCIG 9AiT9CBNDSjnC/zfL0z1iW13zvOw7za7b+UMjyMX3fgz+eg6wy5O/eSm9DOpZJRa1otAKdOz9gm sMbQfGSzfVXLT3ZWn3uZNEHS6H8HF5e54llJ+V+DDpDx2UyybZFHHpa/EQXVBzkj5sLIqNr13PG 3N6qfhwReGrmPpFSMWlHuUPG0WvCXEUfsidyeWvAIDwaxZNh0FRXJ8GWU7J5qhpLD7LvgJTM31Z we6sdU96h77TTUow0VubGeG1Zj3RI4/jzDolo0VoygKpMyc= X-Received: by 2002:a17:907:9728:b0:abf:6e6a:885c with SMTP id a640c23a62f3a-ac20d8fc704mr94724366b.23.1741127390502; Tue, 04 Mar 2025 14:29:50 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac1e57faa1dsm274634466b.95.2025.03.04.14.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:29:49 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 94B9F619A7; Tue, 4 Mar 2025 22:24:41 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 22/32] include/qemu: plugin-memory.h doesn't need cpu-defs.h Date: Tue, 4 Mar 2025 22:24:29 +0000 Message-Id: <20250304222439.2035603-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52b.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 hwaddr is a fixed size on all builds. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20250225110844.3296991-4-alex.bennee@linaro.org> --- include/qemu/plugin-memory.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/qemu/plugin-memory.h b/include/qemu/plugin-memory.h index 71c1123308..6065ec7aaf 100644 --- a/include/qemu/plugin-memory.h +++ b/include/qemu/plugin-memory.h @@ -9,7 +9,6 @@ #ifndef PLUGIN_MEMORY_H #define PLUGIN_MEMORY_H -#include "exec/cpu-defs.h" #include "exec/hwaddr.h" struct qemu_plugin_hwaddr { From patchwork Tue Mar 4 22:24:30 2025 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: 870133 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp493116wrg; Tue, 4 Mar 2025 14:27:52 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUUy/V2UHx0DmzRgP2Ehp4q8dQSzF30FnqgrG51YtXg/Zdg6oyFA3DYxhqXmPnuRaLCAsvK7Q==@linaro.org X-Google-Smtp-Source: AGHT+IEohOtMDqnc5VYl3EcXktQJ0UB6kEpj3AmyMgwV1A8e/f0o5yWsN8+nW76cOf8Neh9vp0SX X-Received: by 2002:ad4:5bee:0:b0:6e8:9c5c:5385 with SMTP id 6a1803df08f44-6e8e6cc0055mr15851056d6.5.1741127271931; Tue, 04 Mar 2025 14:27:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127271; cv=none; d=google.com; s=arc-20240605; b=TVRhZL0pZJhoG48Mnd5WW4LnRdGliHOLIE+SlvEU1HjpmF5vN9RJfTyWJoU5PUWFbm 7u4hixRJuBwlWQ2xUC7tJNebcfEh/kFbaz7msLslBRBDP+gflziHeyI5BelimaGjZ+/D hj+Y24SPJGUt8myihMo89zCBn6LZC70lBxAUTCguDaTqp7K5mNhjRQW+hAXL3xLvc9Gx oJJ6n2AhgEek1TE4P3i0OjcsNVC3sfYyZGQou8ZWwr6BVSSbtxVh4xhmRSNtSD8zblLu J56z5LLGtRHL6r3UC72wi4M8G3xf0S7ZFTKvO1V38Un1FgSSekkqY350FzsBlEBdg3AM pfoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=4NyoI+xGCkLBfsyhs9LhZ95ONl5hcFB5ViM1AJoAqTc=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=XfaSaReZgkmTDF83Vf8G40xwW6YN1Y+076xPlEFFA8EN0nMAWua/usizTUVjy3vKHO X+/hr9hUfNHiK468QZz3XF52tzLP5Rvw+eeAJbvBia9089q2cFvsq3H9g2COxM0bh6cO PsVkeSZOd298GaOncq1gUJlqNvhjcUE0FnPYikfEBmv6oGcseUGRu/welMosusm+9rR4 6UiZ1M4B91wjLLxbnqLo2uxCaW6c6Nc8G8LiopwXLNeJFepaQp3vRqEJfuDsFCphlvKb OhjuIyJ2nAO9PK5yMFeBzN7ZIvzim8L5yxFmqHcFY04vEjkE9/x2isddISTjPkAkK7L2 Lsjg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kCYVQHYL; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-474724370cesi116256831cf.502.2025.03.04.14.27.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:27:51 -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=kCYVQHYL; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpaiW-0007Ju-5R; Tue, 04 Mar 2025 17:26:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpahC-0005Sq-77 for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:25:09 -0500 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpah9-0006Zm-4R for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:25:01 -0500 Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-5e4cbade42aso456265a12.1 for ; Tue, 04 Mar 2025 14:24:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127095; x=1741731895; darn=nongnu.org; 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=4NyoI+xGCkLBfsyhs9LhZ95ONl5hcFB5ViM1AJoAqTc=; b=kCYVQHYLF4yWt6gTQLN1cPPHOT3EhV2B7SdtM4ZJqkYy35skY8aD2coMAltoY5LiIc +cYLjg6t3QRV/7mPWN1GveHe7QLyQkUZAomiBzQyiGA5xif5CcLYU3gLzALUV6jnJoT1 OY1wGkrw2jwB/+z5Rlt4hmNS4Z0o0gbAUMC5cURRqmGazpsXZxyYVcv8yNVhcFfdP7H6 ShK7s9DGLm4nCF5HW3eIWuu6+cIlx7KHLNO1+RdcU1dvaQehqLLXbagtIl5w55sIp4FF tAsajpGM4j9FLjrDwOs36Cz/MkReMJ6Mvpph9+liWqRH1gSwpn2j+FvZ3K6PN0LuTb8c WStg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127095; x=1741731895; 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=4NyoI+xGCkLBfsyhs9LhZ95ONl5hcFB5ViM1AJoAqTc=; b=vtFTsFtSM4j1lbYfDtLdaNgDO50Gt773QUMWQADJPukzlaoapcwjx+QT1ITQm6MN+z LwiT2DPdmkx5zooBpVEyTXdUNSC8rWHInqgVqgIWMwA8BRPyECs2tuNnj+hvg+NjGeLI VlVSAtOFnurcGx6Y6QL81UgkGrJQ3IBCaXwUdSY50jr9fRNXRcoxapAsKT28aaoPvBtE cfcw2yG/Uh9J5w4s6Ts/Dk8+ULq0/8GKV5O9zUGPBxjoRjjKyb1sFsX2dYK+JP53651j Oucu2LO+o0fPZ7+MOEJMNmMse8D5YuvEhtLf+JyE70l2QzCp86P6LBFllX9Sq3q5uof3 1qzg== X-Gm-Message-State: AOJu0YymrTRvwMsPjG356Pj1KbjB+Nspw2Z0RS3IBu832Td1IGHMLwfz yNAuaAh8LvFFgg/mzlDLenxoc9mUBjRuBCnX2OOve/6pwBbkcHBO2FWxAaeUbZw= X-Gm-Gg: ASbGncs3a/dSFBGRancIO0ysG8rkWPny1JdO05KLbyMPwit9+R+TZgfnai3LbBdXOM6 miqjh6CdrcpmgaAbsVB54uoaISToQcoWg3HsDn9ukZHbc7t2rA4jWEehnKOp32JuDgtV4ArzCeS K3njOjvIaVE0SEAUp60Lq799LOQB5RSfY4DsY95/zfmbcvritj1DbB3h1MRkE95WUbUQCHjI72Q UUeevTeAkGvzrPCBA3w/9I74kMJtgtxb8aEvyYPOggAyaZV4EoUTBVrXuU4mK9md8s7Z5eBa9SW P1a3UhNdcTRtvzuHuOdRr16O+D5iOqrBdeyANa0NwMMIZCw= X-Received: by 2002:a17:907:3daa:b0:abf:6d1c:8f4a with SMTP id a640c23a62f3a-ac1f12c3464mr527854266b.18.1741127095167; Tue, 04 Mar 2025 14:24:55 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abf3f3bbfb3sm777192566b.77.2025.03.04.14.24.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:52 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A9AF8625B4; Tue, 4 Mar 2025 22:24:41 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 23/32] plugins/api: clean-up the includes Date: Tue, 4 Mar 2025 22:24:30 +0000 Message-Id: <20250304222439.2035603-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52d.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 Thanks to re-factoring and clean-up work (especially to exec-all) we no longer need such broad headers for the api. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20250225110844.3296991-5-alex.bennee@linaro.org> --- plugins/api.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugins/api.c b/plugins/api.c index fa4d495277..c3ba1e98e8 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -39,9 +39,7 @@ #include "qemu/main-loop.h" #include "qemu/plugin.h" #include "qemu/log.h" -#include "qemu/timer.h" #include "tcg/tcg.h" -#include "exec/exec-all.h" #include "exec/gdbstub.h" #include "exec/target_page.h" #include "exec/translation-block.h" @@ -51,7 +49,6 @@ #ifndef CONFIG_USER_ONLY #include "qapi/error.h" #include "migration/blocker.h" -#include "exec/ram_addr.h" #include "qemu/plugin-memory.h" #include "hw/boards.h" #else From patchwork Tue Mar 4 22:24:31 2025 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: 870148 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp495017wrg; Tue, 4 Mar 2025 14:33:36 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU1cG5vcwCZdU5b+TXQD77XK5JG6/8nJA7o+GCk36F6VWfuiT7EKglWaF9Mt4SUGiiR/Ch7yg==@linaro.org X-Google-Smtp-Source: AGHT+IFA1fV0buKkxnVRPDvpbO5BDB9LWAZnSKQ3/SYGp8SSJ3NvzPtkUEflu+/8cr8jKFChtATj X-Received: by 2002:a05:620a:4c8b:b0:7c0:9df3:a0cb with SMTP id af79cd13be357-7c3d8f10b02mr142887685a.53.1741127616611; Tue, 04 Mar 2025 14:33:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127616; cv=none; d=google.com; s=arc-20240605; b=gljV1ETdIOENX7KFV+ROAYx8c6iNxtFbEsM7N2qWPomKXb6S3NaJeG1hQIVTdC9gvZ o/GQvWNJB7eXJyG4oxMQtXAwr31N1o8/qwwfTqCBSJRWLsVZajA7Tn84bFrTSbFCK/IM jwaqIJYZWINCUXXDaF5EguDol9LRyWQyQlYHjIS0owHBIt/hP79HIP7SjMzX9M0Gq25y Cla6RcVJJzNWMSx7ymj1iajtyUmhV7jFaOkQMQZmgFYT5FKXhO5rzLL5b2I8sBaRLhu9 GCnb4vG+eX458t+ot1sDnD0LdQW7joQPle18w9qDznCr+t9IKMVON3xYaKZ2ZOR96FEE IYvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=3MUzqz6FU8Y/M1Y0uPwJOCVPftv09cieoqEpBt2LY4U=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=Dq04/g9PHwFeczECz5XivqevlX3w1tOCAX0pairje5f9A8tN6hpbBPum20IcjlglQk VtlLyNV0hakJZ6SQfqGRqI1vzSXmKL8W6cKiQrnNjeeNp8BDTDV5XjkVo/hyAMIKNMsZ TCJgx0DnQzl7jbqfR2nLhcrboGz0JC32O0kLw6PQbYQ3jQBQH8ZonYePytSlTioYUYUn pXNOM2yE5eYa2+8qICqRxTf9CqItOCQuXVoBivpLDx3M3DGsW/thWbMRy/77BBQKLCs8 uj+rV9ysgN0/PZ40/MZcXieSY5o9kWwVBHGGdeVEMzClkJl181FK1n8IeShuUpq54m56 IbKQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gOrHS6Ic; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3b75a304fsi542118385a.170.2025.03.04.14.33.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:33: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=gOrHS6Ic; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpamS-0000gI-Qx; Tue, 04 Mar 2025 17:30: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 1tpam4-000899-W7 for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:30:14 -0500 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpalx-0007mD-Na for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:30:00 -0500 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-5e4b410e48bso9316494a12.0 for ; Tue, 04 Mar 2025 14:29:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127392; x=1741732192; darn=nongnu.org; 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=3MUzqz6FU8Y/M1Y0uPwJOCVPftv09cieoqEpBt2LY4U=; b=gOrHS6IcnjPMtnDeVDxf+yUEFpK3E+x//YOm9KKdMdy3jkjWUuE8uXRfLWAI2L0r3m YWqj9i3Fik0hQC6OzXvm0/FbxuuGsB77K9Psk9xvXcrC/QW8LHz4qdE6EadMgAwMuPqP opiUpMz5yJqZPcVvxlLY95BT0S+n0WtCIgCFlAcMdM8xfc6cxyCVNplud3ep89Rctd1V LQTFLYdU8iaS5LEwrk3EObc7j5aRBDLZ4Hgr8SzcjoSp//csaa9LJESj3XeNNHECQHQ2 L0BIDd/9XptFp7qTK3pH9ZGSMm+1sovRL/N0dZqWOFGQllJz1D5d3ks8c1gFuhXPXjEE n/rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127392; x=1741732192; 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=3MUzqz6FU8Y/M1Y0uPwJOCVPftv09cieoqEpBt2LY4U=; b=g6c4Ren53AeIuW6WSmiJH0/EY1DNu5RK1KI1bYOoJq48GJLizqcCbQ0vZPJ7Z7ALpm CQCGecKs9IgwMnLp+REE5Pnry4g8XM/0efVwp9l4PAH8vepYrcH/jCQipqknm6yF23uh R/yO41sH8iBjVuGuhY14kC5xJ37rJ6C2YdseJHLwnUgjtg4F5b2bgdSWT42t8HqX/Rrl FeAccAToUI67FSpRlNaDaMIXXDSBuSlrpHCriloefHWIC7zAc0aLwlh2vKeHbhnW6hBd MsakqvJgU64vjYAm6aCR3tntxugqw0+PIXPInAd/tBkCVuq3OMrgjKxqDQBZCqLk17Oq eASA== X-Gm-Message-State: AOJu0YzJMilgEwBLddEQQOpaThAWW0ITZ086brrakKE0DStWQJX41Ncf YTKSgayMRxF0TxbLgXXJmHr6nJQXf7+t6ebkvmy3LhgW4ziDysmAaYGtmM4WgOA= X-Gm-Gg: ASbGncvk17NAxgrbtXXm7MlHmI86vPiu4n8OGAuiwPlEDr+Ko/r2UQQxaA6fsUVyp1s D28EjpgEHJR2xSci4Jk6H1ZUy2L7OR7i+JIklpemvQeVm6jwD/vXvCRLaoC3eNgXWDhXYnSTfrp 54OzeX3SfxoElD2bHLm3fS5s4359mmRenhS4yreWMylAaPIY0F4VjuWZZQeHZNJc+FNg/tr3fDK XD0Bp2bGrgmjRyj+W+nelTMmGGFP8YsNGjcmomGaGbtAdnhIuo/m5Hqk9fy3FnmXtYdMlAj+Ix7 2xmOvrgySyyWW+t04gI7pl0wWlBoG60BPDLv/b2gImytTBo= X-Received: by 2002:a17:907:7da7:b0:abf:6b14:6cfb with SMTP id a640c23a62f3a-ac20d84494cmr79356166b.5.1741127391992; Tue, 04 Mar 2025 14:29:51 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac1e2ced681sm283977066b.1.2025.03.04.14.29.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:29:51 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id C14A2625BC; Tue, 4 Mar 2025 22:24:41 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 24/32] plugins/plugin.h: include queue.h Date: Tue, 4 Mar 2025 22:24:31 +0000 Message-Id: <20250304222439.2035603-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 Headers should bring in what they need so don't rely on getting queue.h by side effects. This will help with clean-ups in the following patches. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20250225110844.3296991-6-alex.bennee@linaro.org> --- plugins/plugin.h | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/plugin.h b/plugins/plugin.h index 30e2299a54..9ed20b5c41 100644 --- a/plugins/plugin.h +++ b/plugins/plugin.h @@ -13,6 +13,7 @@ #define PLUGIN_H #include +#include "qemu/queue.h" #include "qemu/qht.h" #define QEMU_PLUGIN_MIN_VERSION 2 From patchwork Tue Mar 4 22:24:32 2025 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: 870145 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp494959wrg; Tue, 4 Mar 2025 14:33:28 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX9dSrdHrEyCDGzV7hL8HCeAzT+jzaKehWHgj8GTT4yX7R4iG8//divfKcMekNNvnkfP+k53g==@linaro.org X-Google-Smtp-Source: AGHT+IHKAn6J3AXC5VM3mPr6//F3K4pp5MW063OcsbTR/Nok1p/d0nbtKpVIgVXsPYrkbs9t2sJ7 X-Received: by 2002:ad4:5ced:0:b0:6e2:49eb:fb7 with SMTP id 6a1803df08f44-6e8da74b4bfmr74656136d6.3.1741127608112; Tue, 04 Mar 2025 14:33:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127608; cv=none; d=google.com; s=arc-20240605; b=LgZ0WRHEnrNeXvC0R+SXq0grfdLSYSX8po2T4U8YMnnq48wTdYWbU+OULnt6UXnGa9 o69Nv45/1/A/miOV9xKW+6Y+oDY+xYbfXs1M//CkF4I87AkKz3VO80C6VsLPaxiYS87o 9lftkLS0Jxm8M0aH+y5727E/ELydiz39xgldVBhA+6rsnkrfpZ4p3yFIgPSR7Eg5CYOn Mj+R1TnHB1vYFLorFpholM7N6kgG0wmFBClZ1etUn4J1HkuLf7f4scnD46yb4BufPq2y 9P8MbBFgIMjBBK4InahUokKV5ewfmBsqJ3EHkRDBd9ekqZVaAYGu6iTkQ8Eet2essMyG BcfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=7NduONkNHzryA23734KniKbJ3709Oe6o9/gEpRh5YHc=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=huskrheRlC/xYJdFGo5KLxXPrYTfH8eX9lcM8nq1g6LcFn6yi9z6Gb3pGEk0Iq19L4 C9ZgW3q9V37oll4YUZbYUYyJBGO/yhSbL3sjBntswzxmMS0Qi7i5Yvt16uNHgVU6TIxN lI84Ts+Bx38/ye53zy989EcU81Ct1OB5QF+6LbPfNYzxlwO3PE8/QD3yOce9Y0fPSlaD U7/L4gHcHRLQTqGkLLIiVYMk9jsr6Yn74TdqeXnLR+sqsxLvHC4w72Lo9XEhRXMkFlzU pv4pau0uVxc9ivAMLbOagiIO9s5gHUsEo4QqXb86kmCNi7TjBwJqRfzJNsTyYgdlL60t pRFg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RyN3ESyu; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47509ff4b76si6490451cf.328.2025.03.04.14.33.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:33:28 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RyN3ESyu; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpamZ-00018d-9e; Tue, 04 Mar 2025 17:30: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 1tpam6-0008BP-T3 for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:30:15 -0500 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpaly-0007nU-BY for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:30:04 -0500 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-5e04064af07so11473278a12.0 for ; Tue, 04 Mar 2025 14:29:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127395; x=1741732195; darn=nongnu.org; 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=7NduONkNHzryA23734KniKbJ3709Oe6o9/gEpRh5YHc=; b=RyN3ESyuMkXpQgsGbrMy2kuOC0npfErUFUcL2qnVF7BQdv7tYH/foXh5yb6LSlhtkC rw8q7gYU2mhiR7LecI7+JTBBF+4qAG1oLEvE8qAYF2n2K+oej46+DeCdXtSns+DTUV/7 cNgNVduz6wlGxU+PB/pYjjn17rGVQFAuzgOQtLRg7ckihhpzf93WmT67a5Z5AvJq+Z/p vIyCvwexuCab0PWWxNiGbEi1URje/algOSC1AjiZ4atAouawBVpx7lVl32VkjHjaAWoY OjTAh/t2r9nL05BJij5vqPxypOMUHAbMKNimfSRNTzctWyS7YPRqFJ1Nk+6C0Tfc9pO9 k3+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127395; x=1741732195; 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=7NduONkNHzryA23734KniKbJ3709Oe6o9/gEpRh5YHc=; b=SFMYkWbiktbiFRkh2Xdn7nSkmiX8UC8ieft4mX5AMGiXGP7teDvGBH3VMKa0X6OJgv SDFS5kAQW8CXY+FuUXHuEeLWBDSnhy2qgXJVGf5ggpzCTJGRW/UPmcUI/cC/byswjrxz e99tPqDrma+KPbBimcyUdkBbMJtVRxcfkFfnMX3oo+mK75MzKHb59tuXgx2JKGj9v4/o j5bINRp4C93c7u5NrEOtSWirBrAPQu2QQ9degSzXvumiSHok0Y7rknEAwxSBZzfiI3Ty kr1p8aJGtBWeq9jFpxzsRE4iaVKbvH3+zLunUusIyQJSj3UYIhSshi5T9kmxX1RUKrHJ r0Bw== X-Gm-Message-State: AOJu0YzwncR81MiH8MMHqr9JB2+BEvk7SFPmLgwSoOpnI9IodMy25dA9 VOdeWMT1YGey5ok9ofGk4qrpJlbSznJIYvYquxv4BM1DLTRtl11IRzf0zXGh98E= X-Gm-Gg: ASbGncux7sNkuEFYQbXzX6iiu7P6EIMETQ6rs7AYweGaZ720xUqFUvbR+QsQ9xzQHTY scLHznLN8f5B+Wg8MH95ZYUsEdpe6+edelUTeuinJm1jRB5/2yeCk4vWMs/MRdIrx+8Vz81YBD9 PkeNnDvgE/XrCbwtGveUTeYx3ptTEr9yTLGn3tqu/HpS89MTM72zembk+2gvldJ5bEUSXwHc8VZ 5O3If5yKqBwsffl6KY9s30VTSgz/fuQL8o/mumeX/3ZfNWlW677lf3jcsTTr1BGf+1P4UNE1rMX 5Jqnfd0hL0oOEFGpQM5YJura7lwaerLfnCmsBpyc1V+X/3c= X-Received: by 2002:a05:6402:518e:b0:5e0:9390:f0d2 with SMTP id 4fb4d7f45d1cf-5e59f455d54mr646687a12.20.1741127395009; Tue, 04 Mar 2025 14:29:55 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e4c43a66b1sm8643141a12.71.2025.03.04.14.29.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:29:53 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id DC3E1625C3; Tue, 4 Mar 2025 22:24:41 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 25/32] plugins/loader: compile loader only once Date: Tue, 4 Mar 2025 22:24:32 +0000 Message-Id: <20250304222439.2035603-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x532.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 There is very little in loader that is different between builds save for a tiny user/system mode difference in the plugin_info structure. Create two new files, user and system to hold mode specific helpers and move loader into common_ss. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20250225110844.3296991-7-alex.bennee@linaro.org> --- plugins/plugin.h | 6 ++++++ plugins/loader.c | 13 ++----------- plugins/system.c | 24 ++++++++++++++++++++++++ plugins/user.c | 19 +++++++++++++++++++ plugins/meson.build | 7 ++++++- 5 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 plugins/system.c create mode 100644 plugins/user.c diff --git a/plugins/plugin.h b/plugins/plugin.h index 9ed20b5c41..6fbc443b96 100644 --- a/plugins/plugin.h +++ b/plugins/plugin.h @@ -119,4 +119,10 @@ struct qemu_plugin_scoreboard *plugin_scoreboard_new(size_t element_size); void plugin_scoreboard_free(struct qemu_plugin_scoreboard *score); +/** + * qemu_plugin_fillin_mode_info() - populate mode specific info + * info: pointer to qemu_info_t structure + */ +void qemu_plugin_fillin_mode_info(qemu_info_t *info); + #endif /* PLUGIN_H */ diff --git a/plugins/loader.c b/plugins/loader.c index 827473c8b6..7523d554f0 100644 --- a/plugins/loader.c +++ b/plugins/loader.c @@ -31,9 +31,6 @@ #include "qemu/memalign.h" #include "hw/core/cpu.h" #include "exec/tb-flush.h" -#ifndef CONFIG_USER_ONLY -#include "hw/boards.h" -#endif #include "plugin.h" @@ -300,14 +297,8 @@ int qemu_plugin_load_list(QemuPluginList *head, Error **errp) info->target_name = target_name(); info->version.min = QEMU_PLUGIN_MIN_VERSION; info->version.cur = QEMU_PLUGIN_VERSION; -#ifndef CONFIG_USER_ONLY - MachineState *ms = MACHINE(qdev_get_machine()); - info->system_emulation = true; - info->system.smp_vcpus = ms->smp.cpus; - info->system.max_vcpus = ms->smp.max_cpus; -#else - info->system_emulation = false; -#endif + + qemu_plugin_fillin_mode_info(info); QTAILQ_FOREACH_SAFE(desc, head, entry, next) { int err; diff --git a/plugins/system.c b/plugins/system.c new file mode 100644 index 0000000000..b3ecc33ba5 --- /dev/null +++ b/plugins/system.c @@ -0,0 +1,24 @@ +/* + * QEMU Plugin system-emulation helpers + * + * Helpers that are specific to system emulation. + * + * Copyright (C) 2017, Emilio G. Cota + * Copyright (C) 2019-2025, Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/plugin.h" +#include "hw/boards.h" + +#include "plugin.h" + +void qemu_plugin_fillin_mode_info(qemu_info_t *info) +{ + MachineState *ms = MACHINE(qdev_get_machine()); + info->system_emulation = true; + info->system.smp_vcpus = ms->smp.cpus; + info->system.max_vcpus = ms->smp.max_cpus; +} diff --git a/plugins/user.c b/plugins/user.c new file mode 100644 index 0000000000..250d542502 --- /dev/null +++ b/plugins/user.c @@ -0,0 +1,19 @@ +/* + * QEMU Plugin user-mode helpers + * + * Helpers that are specific to user-mode. + * + * Copyright (C) 2017, Emilio G. Cota + * Copyright (C) 2019-2025, Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/plugin.h" +#include "plugin.h" + +void qemu_plugin_fillin_mode_info(qemu_info_t *info) +{ + info->system_emulation = false; +} diff --git a/plugins/meson.build b/plugins/meson.build index d60be2a4d6..f7820806d3 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -57,8 +57,13 @@ if host_os == 'windows' command: dlltool_cmd ) endif + +user_ss.add(files('user.c')) +system_ss.add(files('system.c')) + +common_ss.add(files('loader.c')) + specific_ss.add(files( - 'loader.c', 'core.c', 'api.c', )) From patchwork Tue Mar 4 22:24:33 2025 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: 870147 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp494987wrg; Tue, 4 Mar 2025 14:33:32 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWKRBxzNScY7UuLZ/bE07CG7G27Pn3kmFv1F3V52ybs61qKzXm9J5kC0e7BuqggOv1mU8mjwQ==@linaro.org X-Google-Smtp-Source: AGHT+IFSI15Zqw75Hn/RdosdlOEgOXsATnIm1ykez0FPxDPmevgTm9akezsRm72lMAybvPTfS+Hl X-Received: by 2002:a05:620a:43a7:b0:7c0:a58a:cc9e with SMTP id af79cd13be357-7c3cc37ab16mr711316985a.25.1741127612732; Tue, 04 Mar 2025 14:33:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127612; cv=none; d=google.com; s=arc-20240605; b=iiKSoSr2Kbc/IC0MMvjb9ZpraSxFiajh4a2f5y/ZPcP520hIwP0O8NxpI2EVPM63AK 1mEZkxhxpCZBtXrrDgu9olpJKiLPK8Y+1wZxsNMY67/92kmQskr/wkP6LmEo5qxyPF4H ZaLA4wJvAHw5L6I537541dZz5r7wgdsosakSimaDjSPiZKLe+sTRw/qcvgMgnd/GgBXI c80G10tgMc9Snm0v69rlS4AaDPctZrW5mFRRhDpM0nenEHF/FDgX6XaHmBZj4ZoAqHqn idcZAA3IqC1i6yHFZzvMMmxT21W06NaVe2yPsYtACb45TnQH3FuDyezzsP5W9lMlNzbv JVtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=4AVfGi7ra8MkKWd/PMrFZCQLGgeEHyEMJkQKuf70mbg=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=hQeOjm1A5PTkW99Uf2IZocElrr06+1qpE3rjvTlm9qtfZEucsBxzSRDXJkYSmXrO0v 3qnPCVPng4Wymrjz0K2kE4MhUtJVDoqDrE3d0tkFXDVdRhdkhrV6QV/Y4xcIBcGQackQ D5eZ8z1chfaAyvLa1SE75V/xrJQFnzJaigexfjmSV63z+7Lqfiw3+tduCzrpHXGF6Nmt McHV9WYi5YfPYfa5srIIMY0NRm1vuPKmz60aL6OgcD4xbSmVQ2v1Le5onyCGPdLvKrcC HFz3IRxOSZglsxOnxR78IPiGqTbcT3rJQwQsEwKhtrYxr7F5/BeABhYagZuyKC4be0Sk z/Ag==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="SREjOW/D"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3c67cffc6si344347985a.302.2025.03.04.14.33.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:33:32 -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="SREjOW/D"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpamP-0000RB-IR; Tue, 04 Mar 2025 17:30:25 -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 1tpam5-00089F-Jp for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:30:14 -0500 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpaly-0007mq-Bd for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:30:02 -0500 Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-5e549af4927so4688889a12.2 for ; Tue, 04 Mar 2025 14:29:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127393; x=1741732193; darn=nongnu.org; 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=4AVfGi7ra8MkKWd/PMrFZCQLGgeEHyEMJkQKuf70mbg=; b=SREjOW/DiS/TR1yGxrLznKg+HuYAIimZM2F8m1leZ/vwBzaynvVNwC6Gb8z4kQmA9B yZ2fsrLA0N0dEAr4IskFHVpoBEMW+oQYy1B5K4tva/nj74O2dL84U5vJHrTi2LFddQja rx3rfF0OX45Km9VXpnK0cdRSKUxqPGHlhe8Wbt4oGMuuFeWXtVhPoThW/i8M+1gftwSh yy8HBGFX0ro3RpbFD31EbZ+yRjLZUgDCv9XDM2gWSdHara0N8lh7EY9X1zdDyfw8volB nvaUHFH/WGmE3SrFEynqiSfnbzTtOizPG8aset4x4J3GxWLGebDjVxJTIIwf2iWN0qQU vBuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127393; x=1741732193; 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=4AVfGi7ra8MkKWd/PMrFZCQLGgeEHyEMJkQKuf70mbg=; b=oprnL/tep3sMirHyzwRYPfMunZ12Z9Gu1NdyItMOnGW2IPzagR7IOs/wI0Shng8DCN LnPmzADG+ZNYkJ3F72FI7SUVKVwHk5h+CgDBcSIBT5vNt/owbjm6wRfhGP12jvHm2lzP jHT1YZ9/u6Sgyf0Yefr1dKRKo/eqhTU2Y+9PabOQOFGzCxYoPaeTyNv9TgsjafpiiDex Sn1NEQZMu2iMlQIMauEmQ706WksODwFZRjjFt69r4GRuRMkTfJ0XvkBMaP1+VFyqN8+9 GmNV2vHm2B3D6qg/jIh1ufocNIJ9sE2CoCY6HDcCPdUf8kHKgWkYFGZGmmXOewisEw44 bIoQ== X-Gm-Message-State: AOJu0YwqdY28GHl6gRncam0/rSLQj5bWEaZXAMI+nUG1WKxhYsn+V43H /KSEFAxGb+AGCp1ucknS+V0GmYmpcsV+zklzFXrU+FPcH5DNlynedOSl8j5Sgsg= X-Gm-Gg: ASbGncur31jm9CUo4W7RZ5tY8ODtoLZUaPwJroG5LHEYhYzktHFmfKiR9xCzHQ0vUIg dUDhGUW6l3QJ67KPH/1LoM0KJ/YzHPUmycQFPhtEBnDJHJD9DoJU/Hq9saHFITvzbwPp0PutW+d vS2tdAUbL8/D/QH19e4l1mSayw+akObG9aGOT01YRwi/AcchiQvjn33dgojMz5B2Jf3roR3Csym 0oCuovfEUDXa0rrlLXfnMwZMWIPYs4PASBO7ktXwnMHLMOZeVFpCP0DWRvzay3ONuCyKQ+ncF/U 0714fnwNwaWaqYIz8yrUmvHZlgm5ryEqeogHjlVkaKR9OQ8= X-Received: by 2002:a05:6402:3596:b0:5e0:7509:4543 with SMTP id 4fb4d7f45d1cf-5e59f48a5c3mr627213a12.32.1741127393170; Tue, 04 Mar 2025 14:29:53 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e4c43a6ab7sm8743631a12.74.2025.03.04.14.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:29:50 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 09CBB625D9; Tue, 4 Mar 2025 22:24:42 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 26/32] plugins/api: split out binary path/start/end/entry code Date: Tue, 4 Mar 2025 22:24:33 +0000 Message-Id: <20250304222439.2035603-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52f.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 To move the main api.c to a single build compilation object we need to start splitting out user and system specific code. As we need to grob around host headers we move these particular helpers into the *-user mode directories. The binary/start/end/entry helpers are all NOPs for system mode. While using the plugin-api.c.inc trick means we build for both linux-user and bsd-user the BSD user-mode command line is still missing -plugin. This can be enabled once we have reliable check-tcg tests working for the BSDs. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Warner Losh Message-Id: <20250226140343.3907080-22-alex.bennee@linaro.org> --- v2 - use common-user/plugin-api.c.inc instead - add commentary about state of plugins for BSD user v3 - add missing osdep include --- bsd-user/plugin-api.c | 15 +++++++++++++ linux-user/plugin-api.c | 15 +++++++++++++ plugins/api-system.c | 39 ++++++++++++++++++++++++++++++++ plugins/api.c | 43 ------------------------------------ common-user/plugin-api.c.inc | 43 ++++++++++++++++++++++++++++++++++++ bsd-user/meson.build | 1 + linux-user/meson.build | 1 + plugins/meson.build | 2 +- 8 files changed, 115 insertions(+), 44 deletions(-) create mode 100644 bsd-user/plugin-api.c create mode 100644 linux-user/plugin-api.c create mode 100644 plugins/api-system.c create mode 100644 common-user/plugin-api.c.inc diff --git a/bsd-user/plugin-api.c b/bsd-user/plugin-api.c new file mode 100644 index 0000000000..6ccef7eaa0 --- /dev/null +++ b/bsd-user/plugin-api.c @@ -0,0 +1,15 @@ +/* + * QEMU Plugin API - bsd-user-mode only implementations + * + * Common user-mode only APIs are in plugins/api-user. These helpers + * are only specific to bsd-user. + * + * Copyright (C) 2017, Emilio G. Cota + * Copyright (C) 2019-2025, Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu.h" +#include "common-user/plugin-api.c.inc" diff --git a/linux-user/plugin-api.c b/linux-user/plugin-api.c new file mode 100644 index 0000000000..66755df526 --- /dev/null +++ b/linux-user/plugin-api.c @@ -0,0 +1,15 @@ +/* + * QEMU Plugin API - linux-user-mode only implementations + * + * Common user-mode only APIs are in plugins/api-user. These helpers + * are only specific to linux-user. + * + * Copyright (C) 2017, Emilio G. Cota + * Copyright (C) 2019-2025, Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu.h" +#include "common-user/plugin-api.c.inc" diff --git a/plugins/api-system.c b/plugins/api-system.c new file mode 100644 index 0000000000..cb0dd8f730 --- /dev/null +++ b/plugins/api-system.c @@ -0,0 +1,39 @@ +/* + * QEMU Plugin API - System specific implementations + * + * This provides the APIs that have a specific system implementation + * or are only relevant to system-mode. + * + * Copyright (C) 2017, Emilio G. Cota + * Copyright (C) 2019-2025, Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/main-loop.h" +#include "qemu/plugin.h" + +/* + * In system mode we cannot trace the binary being executed so the + * helpers all return NULL/0. + */ +const char *qemu_plugin_path_to_binary(void) +{ + return NULL; +} + +uint64_t qemu_plugin_start_code(void) +{ + return 0; +} + +uint64_t qemu_plugin_end_code(void) +{ + return 0; +} + +uint64_t qemu_plugin_entry_code(void) +{ + return 0; +} diff --git a/plugins/api.c b/plugins/api.c index c3ba1e98e8..ffccd71e4b 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -471,49 +471,6 @@ bool qemu_plugin_bool_parse(const char *name, const char *value, bool *ret) return name && value && qapi_bool_parse(name, value, ret, NULL); } -/* - * Binary path, start and end locations - */ -const char *qemu_plugin_path_to_binary(void) -{ - char *path = NULL; -#ifdef CONFIG_USER_ONLY - TaskState *ts = get_task_state(current_cpu); - path = g_strdup(ts->bprm->filename); -#endif - return path; -} - -uint64_t qemu_plugin_start_code(void) -{ - uint64_t start = 0; -#ifdef CONFIG_USER_ONLY - TaskState *ts = get_task_state(current_cpu); - start = ts->info->start_code; -#endif - return start; -} - -uint64_t qemu_plugin_end_code(void) -{ - uint64_t end = 0; -#ifdef CONFIG_USER_ONLY - TaskState *ts = get_task_state(current_cpu); - end = ts->info->end_code; -#endif - return end; -} - -uint64_t qemu_plugin_entry_code(void) -{ - uint64_t entry = 0; -#ifdef CONFIG_USER_ONLY - TaskState *ts = get_task_state(current_cpu); - entry = ts->info->entry; -#endif - return entry; -} - /* * Create register handles. * diff --git a/common-user/plugin-api.c.inc b/common-user/plugin-api.c.inc new file mode 100644 index 0000000000..5b8a1396b6 --- /dev/null +++ b/common-user/plugin-api.c.inc @@ -0,0 +1,43 @@ +/* + * QEMU Plugin API - *-user-mode only implementations + * + * Common user-mode only APIs are in plugins/api-user. These helpers + * are only specific to the *-user frontends. + * + * Copyright (C) 2017, Emilio G. Cota + * Copyright (C) 2019-2025, Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/main-loop.h" +#include "qemu/plugin.h" +#include "qemu.h" + +/* + * Binary path, start and end locations. Host specific due to TaskState. + */ +const char *qemu_plugin_path_to_binary(void) +{ + TaskState *ts = get_task_state(current_cpu); + return g_strdup(ts->bprm->filename); +} + +uint64_t qemu_plugin_start_code(void) +{ + TaskState *ts = get_task_state(current_cpu); + return ts->info->start_code; +} + +uint64_t qemu_plugin_end_code(void) +{ + TaskState *ts = get_task_state(current_cpu); + return ts->info->end_code; +} + +uint64_t qemu_plugin_entry_code(void) +{ + TaskState *ts = get_task_state(current_cpu); + return ts->info->entry; +} diff --git a/bsd-user/meson.build b/bsd-user/meson.build index 39bad0ae33..37b7cd6de8 100644 --- a/bsd-user/meson.build +++ b/bsd-user/meson.build @@ -13,6 +13,7 @@ bsd_user_ss.add(files( 'elfload.c', 'main.c', 'mmap.c', + 'plugin-api.c', 'signal.c', 'strace.c', 'uaccess.c', diff --git a/linux-user/meson.build b/linux-user/meson.build index f75b4fe0e3..f47a213ca3 100644 --- a/linux-user/meson.build +++ b/linux-user/meson.build @@ -27,6 +27,7 @@ linux_user_ss.add(libdw) linux_user_ss.add(when: 'TARGET_HAS_BFLT', if_true: files('flatload.c')) linux_user_ss.add(when: 'TARGET_I386', if_true: files('vm86.c')) linux_user_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING', if_true: files('semihost.c')) +linux_user_ss.add(when: 'CONFIG_TCG_PLUGINS', if_true: files('plugin-api.c')) syscall_nr_generators = {} diff --git a/plugins/meson.build b/plugins/meson.build index f7820806d3..9c9bc9e5bb 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -59,7 +59,7 @@ if host_os == 'windows' endif user_ss.add(files('user.c')) -system_ss.add(files('system.c')) +system_ss.add(files('system.c', 'api-system.c')) common_ss.add(files('loader.c')) From patchwork Tue Mar 4 22:24:34 2025 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: 870151 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp495240wrg; Tue, 4 Mar 2025 14:34:14 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUn0g5AK8frUDX3VYmu32SE2QJqJu+elbBfSEEEQyNqJ5SzGXivkjU6bNRLgv0LnKZmWMKANg==@linaro.org X-Google-Smtp-Source: AGHT+IHzMvrwsQWw8SfC9nerueLyPe+OJVlteokOZhdSN40+XhrTSnwk9Cf6hzLCmFIjMgc21Zop X-Received: by 2002:a05:620a:2694:b0:7c0:6ac4:3cba with SMTP id af79cd13be357-7c3d8dd261bmr142958185a.19.1741127654738; Tue, 04 Mar 2025 14:34:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127654; cv=none; d=google.com; s=arc-20240605; b=XO0uNPNQBOwjxg1nQrVZDk3JCS2jMaWQEFZ+pq2+FYRjsM75QkYTbFtxBKoYO6G1gx ucST8Hx7A2aE/Sh72pZ2xf2WHAwNcFh3hdJuQgQzd8igfmgE/lmrtLa+b0agQMrgRE/a P6QcppmkDjFdDvOyyQu+yGXeat9CEA5wEKVBk5zhkB3eJSCVYXt99IMIyjO8x51FY52a ObQpYtfrJ26sxRH5LGbD7D/hrKgoEEJZAT7rWV6p45WrniP61gzmZVrs56hnma7CFQLo pCl6x4k4s+jMyeHmgIpDxLYgIovQ1o+JkrPzzovr82Dff4cGaU7bPNHj+bMvpedBb+RZ 6sPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=EwXIoTVaV7c7ogp6tUTthi1R1m80novWJbwMZ2E1Z9E=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=VS3mqs4tj/8YazYc38KbLI0+rUb9ghbxm63tzWMoB3hbRigHNkmlnCntZBVYUchRk7 tpio1rg8l1ZEh8TfdK9VsKw1KsghhdqfEqtqi0Q6pweeLRgoeK2coZ5t2YG3tt/sfaJj +Y9sr0xQ035RwbhHmChhG2bZKotKn3alg2hcqffbRCVP0CidBI99yoJJycmBXEiEGzd6 lov86Gvgmg5upXvEZUPBj8n58PUcOyUTPTQBvR7ukjhgZCqNSMouY7jCmibpDOqSKm08 RN2teYqPahMdczy77vdtHVTXt5g7wFrIDcR9oHi9sIpjWbe58GZ+LU6llwtCeQEqgRBB WxDA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=flvJ0mJ1; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3cf56030dsi193164685a.430.2025.03.04.14.34.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:34: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=flvJ0mJ1; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpanO-00027Y-Ju; Tue, 04 Mar 2025 17:31: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 1tpam4-000898-VB for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:30:14 -0500 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpalv-0007mV-AN for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:29:59 -0500 Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-5e0813bd105so9789877a12.1 for ; Tue, 04 Mar 2025 14:29:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127392; x=1741732192; darn=nongnu.org; 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=EwXIoTVaV7c7ogp6tUTthi1R1m80novWJbwMZ2E1Z9E=; b=flvJ0mJ1beqgWp69jYHEekT+y9GfuJjZtydzPApXBAhtFgda6cA/Lmx3jsls03OueA AlO21b7RPkYCIswkMd8qbsdeZReBHgG2Hml2kAs06jMX0VphpRte9YHSl2/nfoWqgSvh v3n3NhTuNcMCktX5CqGGgqAFT1h++oyDYkZbwV+ilDdvGXRYvG0MvHCScZcabqXj2flB bT0vCnTMf9JnAXoJU8oNI6sx3JSfa7MXinyEjVBJ/qu2EkWDvpDOkJ0lvnCMEi9jUNeD McTfBGqDz6I05PKV6Rh2hS2egmVR8QYIKgdcFJEMJBDiQNjWt/n3e41pS7GRGL7+zqNr TMYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127392; x=1741732192; 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=EwXIoTVaV7c7ogp6tUTthi1R1m80novWJbwMZ2E1Z9E=; b=EPf+cnrTF86JcfxJGriCOQLxGI1ot+zDz8Od8IHrozx5i7r9uFX8YdP1L9vGldQNBE mxJKukXo8QrxyGgkojkPF8j2CHQp+LzYHkkJG+vRuK/EAnYE38GspH5Ik45xeMdI2ewB 3ziFK1xs13U/JNShETsxgWaXFJ43WWz/C8KsrGE+qVlvKKrxjfnKOCEhcG83qAkTk+Yv ahI5uk9jzQzHgo4fAkq5+x2UP6VtbR70/J43Ws5yqWDrxsgRkaZ940vxSUDziGbCCbDt sD57zh6m0zXmFPj/CAp7Xsd/5Di+U9KH1Ukc6Gw8U0ygpeEfW2eNc2sIgZ/ibyKF2n13 67bw== X-Gm-Message-State: AOJu0YwwY4hFKlrJrAQtwChur6X4RyBfXaWlC/efBdB39n/yg8r0KX2L pBaQ77pQvjv7FCtkGkNFfLFGr1E70SMbXuaQ00qwfyVmHMkgeJtbu9ulcmdZTD4= X-Gm-Gg: ASbGncvS8eY9yNmJDOVYmqKhNkFU6gBwmOVKbxJTXss+SrI04fafaxE3WeoJCmm54uj oXFm/5wXCHlVBNLToWCfKXUhdLp39/Ov827Lbel3Vslf7lPDGEXxEPWkGKpQnm9D/n9BnSSpVpf FAHYdmhVbxKQy50du+dYAZDNdKgFXNLB0WK+4KAx92MyHR13vHGRUezplFpw5f0lfBFGWloKnd8 5lD4E+FIljK6oA09vtDoM0GFraB3Uw7oypvOmSZTQCS+SDCPzK8fylSAEhYXMChM6JpkDw8grfN I2jNBwTo+KhkgBDsbVs+WGcbCfoJFHWTADgsvu7BB5c6no4= X-Received: by 2002:a05:6402:5109:b0:5e0:8c55:532 with SMTP id 4fb4d7f45d1cf-5e59f3a2351mr781671a12.4.1741127392578; Tue, 04 Mar 2025 14:29:52 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e4c3fb4885sm8699562a12.59.2025.03.04.14.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:29:50 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 269E8625DB; Tue, 4 Mar 2025 22:24:42 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 27/32] plugins/api: split out the vaddr/hwaddr helpers Date: Tue, 4 Mar 2025 22:24:34 +0000 Message-Id: <20250304222439.2035603-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52d.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 These only work for system-mode and are NOPs for user-mode. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20250226140343.3907080-23-alex.bennee@linaro.org> --- plugins/api-system.c | 58 ++++++++++++++++++++++++++++++++++++ plugins/api-user.c | 40 +++++++++++++++++++++++++ plugins/api.c | 70 -------------------------------------------- plugins/meson.build | 2 +- 4 files changed, 99 insertions(+), 71 deletions(-) create mode 100644 plugins/api-user.c diff --git a/plugins/api-system.c b/plugins/api-system.c index cb0dd8f730..38560de342 100644 --- a/plugins/api-system.c +++ b/plugins/api-system.c @@ -12,6 +12,10 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" +#include "qapi/error.h" +#include "migration/blocker.h" +#include "hw/boards.h" +#include "qemu/plugin-memory.h" #include "qemu/plugin.h" /* @@ -37,3 +41,57 @@ uint64_t qemu_plugin_entry_code(void) { return 0; } + +/* + * Virtual Memory queries + */ + +static __thread struct qemu_plugin_hwaddr hwaddr_info; + +struct qemu_plugin_hwaddr *qemu_plugin_get_hwaddr(qemu_plugin_meminfo_t info, + uint64_t vaddr) +{ + CPUState *cpu = current_cpu; + unsigned int mmu_idx = get_mmuidx(info); + enum qemu_plugin_mem_rw rw = get_plugin_meminfo_rw(info); + hwaddr_info.is_store = (rw & QEMU_PLUGIN_MEM_W) != 0; + + assert(mmu_idx < NB_MMU_MODES); + + if (!tlb_plugin_lookup(cpu, vaddr, mmu_idx, + hwaddr_info.is_store, &hwaddr_info)) { + error_report("invalid use of qemu_plugin_get_hwaddr"); + return NULL; + } + + return &hwaddr_info; +} + +bool qemu_plugin_hwaddr_is_io(const struct qemu_plugin_hwaddr *haddr) +{ + return haddr->is_io; +} + +uint64_t qemu_plugin_hwaddr_phys_addr(const struct qemu_plugin_hwaddr *haddr) +{ + if (haddr) { + return haddr->phys_addr; + } + return 0; +} + +const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h) +{ + if (h && h->is_io) { + MemoryRegion *mr = h->mr; + if (!mr->name) { + unsigned maddr = (uintptr_t)mr; + g_autofree char *temp = g_strdup_printf("anon%08x", maddr); + return g_intern_string(temp); + } else { + return g_intern_string(mr->name); + } + } else { + return g_intern_static_string("RAM"); + } +} diff --git a/plugins/api-user.c b/plugins/api-user.c new file mode 100644 index 0000000000..867b420339 --- /dev/null +++ b/plugins/api-user.c @@ -0,0 +1,40 @@ +/* + * QEMU Plugin API - user-mode only implementations + * + * This provides the APIs that have a user-mode specific + * implementations or are only relevant to user-mode. + * + * Copyright (C) 2017, Emilio G. Cota + * Copyright (C) 2019-2025, Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/plugin.h" + +/* + * Virtual Memory queries - these are all NOPs for user-mode which + * only ever has visibility of virtual addresses. + */ + +struct qemu_plugin_hwaddr *qemu_plugin_get_hwaddr(qemu_plugin_meminfo_t info, + uint64_t vaddr) +{ + return NULL; +} + +bool qemu_plugin_hwaddr_is_io(const struct qemu_plugin_hwaddr *haddr) +{ + return false; +} + +uint64_t qemu_plugin_hwaddr_phys_addr(const struct qemu_plugin_hwaddr *haddr) +{ + return 0; +} + +const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h) +{ + return g_intern_static_string("Invalid"); +} diff --git a/plugins/api.c b/plugins/api.c index ffccd71e4b..82241699a5 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -383,76 +383,6 @@ qemu_plugin_mem_value qemu_plugin_mem_get_value(qemu_plugin_meminfo_t info) return value; } -/* - * Virtual Memory queries - */ - -#ifdef CONFIG_SOFTMMU -static __thread struct qemu_plugin_hwaddr hwaddr_info; -#endif - -struct qemu_plugin_hwaddr *qemu_plugin_get_hwaddr(qemu_plugin_meminfo_t info, - uint64_t vaddr) -{ -#ifdef CONFIG_SOFTMMU - CPUState *cpu = current_cpu; - unsigned int mmu_idx = get_mmuidx(info); - enum qemu_plugin_mem_rw rw = get_plugin_meminfo_rw(info); - hwaddr_info.is_store = (rw & QEMU_PLUGIN_MEM_W) != 0; - - assert(mmu_idx < NB_MMU_MODES); - - if (!tlb_plugin_lookup(cpu, vaddr, mmu_idx, - hwaddr_info.is_store, &hwaddr_info)) { - error_report("invalid use of qemu_plugin_get_hwaddr"); - return NULL; - } - - return &hwaddr_info; -#else - return NULL; -#endif -} - -bool qemu_plugin_hwaddr_is_io(const struct qemu_plugin_hwaddr *haddr) -{ -#ifdef CONFIG_SOFTMMU - return haddr->is_io; -#else - return false; -#endif -} - -uint64_t qemu_plugin_hwaddr_phys_addr(const struct qemu_plugin_hwaddr *haddr) -{ -#ifdef CONFIG_SOFTMMU - if (haddr) { - return haddr->phys_addr; - } -#endif - return 0; -} - -const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h) -{ -#ifdef CONFIG_SOFTMMU - if (h && h->is_io) { - MemoryRegion *mr = h->mr; - if (!mr->name) { - unsigned maddr = (uintptr_t)mr; - g_autofree char *temp = g_strdup_printf("anon%08x", maddr); - return g_intern_string(temp); - } else { - return g_intern_string(mr->name); - } - } else { - return g_intern_static_string("RAM"); - } -#else - return g_intern_static_string("Invalid"); -#endif -} - int qemu_plugin_num_vcpus(void) { return plugin_num_vcpus(); diff --git a/plugins/meson.build b/plugins/meson.build index 9c9bc9e5bb..942b59e904 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -58,7 +58,7 @@ if host_os == 'windows' ) endif -user_ss.add(files('user.c')) +user_ss.add(files('user.c', 'api-user.c')) system_ss.add(files('system.c', 'api-system.c')) common_ss.add(files('loader.c')) From patchwork Tue Mar 4 22:24:35 2025 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: 870136 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp493343wrg; Tue, 4 Mar 2025 14:28:40 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXGsom9oxhmhFTOa8Fyxx/95PR4qnoWraezxkhaSyF7ckTf4HJyVr/vpKQKguj0sx9nAl+FGw==@linaro.org X-Google-Smtp-Source: AGHT+IGZ9ywAUqY+CF2KFLs/xpjztPr+YLYneIi+UY2MQTo/s9raabGfppFvM29DUYCG019Irx+A X-Received: by 2002:a05:6214:e88:b0:6e4:4484:f35b with SMTP id 6a1803df08f44-6e8e6d99600mr13711076d6.30.1741127320230; Tue, 04 Mar 2025 14:28:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127320; cv=none; d=google.com; s=arc-20240605; b=bfWigTB8PA6pH2TornqkmRvYRy4zrd38pKl+rWSoK/v6ZeEJC+Hcj7nIfeyvkQD0h8 /Nv8ATPTlqUWIkK1BINSH8S6HSJGyN/ty32W07nl73OGlzv4KO7KdguOBOXQXeLfH07Q Ygypgg2/7PwfcVpVTv10R2r7S8XWcxzlPlD7/MoWXKMIwa8RNRN6qkGsT3RTlTv0T+zo ssPwtAC01I+Gtx5rzqALtzJQ5+K2xJmAxn7Qpv8k0IW5mo1O8qNVcZTwFp95i6Dzlskd ARlUVbCtyoBCiiJc+5fZPKsYYckzFVsT15EoHbJKT+DNGafPKh55LqGW5AuvjUWUUnBA gzYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=j3uOOlAeKCJac1lfZ8pMilX54y2FsqgRLkG3Q0WCNcI=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=NihT5IKOwUtT3M1J9/94+HGRM7oIOQuFCnSSr58Q7sMeC0p3xu50425xHOalYB3KxB W1mk+xRB89Be+rIDGje/ATJ42zTFFQHnuQP6Olq4oBFhGQ2bDj6MbMC3l8WZzDdzCUhN gd6UdxV1FledfBkw+rCy4s+OgC0E1oTUMUczUWEyCcPf026kCDXT/M1kIOxhAy3850RY pAGfPFL0Qr2gfRfVvN/dz4Ebz2oJaRkMEqiRhJtTUrL7vUI2ErB8PjXWRecCR8VMItPI nnWrGoEMnH0zde5ws/Q4vJ8G5y8mwgp3D7vel9hpxSZdLzkxBxxMdgjADEf66sk/QnAt t0cw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VfY4Taqo; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e8976d0d84si119533896d6.361.2025.03.04.14.28.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:28: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=VfY4Taqo; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpaia-0007eL-Ig; Tue, 04 Mar 2025 17:26:28 -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 1tpahF-0005T2-5N for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:25:09 -0500 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpahA-0006ZQ-Fi for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:25:03 -0500 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-abf3cf3d142so560528966b.2 for ; Tue, 04 Mar 2025 14:24:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127095; x=1741731895; darn=nongnu.org; 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=j3uOOlAeKCJac1lfZ8pMilX54y2FsqgRLkG3Q0WCNcI=; b=VfY4TaqosyYOcfSNOqmnNoQ6Jl0SoUx3AM9LAnYw4F2oKaTIL0J09AbKBnp/IRHDSg BXvT6HYpEaKZwxfqDDKazlxEATVGK2VrFTGvydyZGvh1W5tNuaoa7K9iJfp1Of1vlePm 99ujkARQBmFIyQbjFFFMehCmHnxiWvPsRREv8C2i4q5l+XD3GdPikJzWBiHTfnhD7HjQ GKm7q2fbGq6YujxYIMTiATHQX7qYHlPgqXM22vHZhn46MLgJQju5iBPl5y3WgaLPeJ/r h9fR+N/gHv5Q5TL3Dw7ufISYqzp4BRBy791ikEszidJkxvKsoog0r6td68D1yQR4ci2b dDCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127095; x=1741731895; 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=j3uOOlAeKCJac1lfZ8pMilX54y2FsqgRLkG3Q0WCNcI=; b=eJ8CGMkxD5IB8iOksUjhkVoLImKsEHayeMX+rqxw7rhKdh7JaMXkxwsmAkEHAWBTjD mEG3xB4HJn8V9/qW8ahYERaBkJXd35I4GK2pXp6avS6TkjFXZKUoyYBEZm8YGi+/Gby8 lj0P8MWPL2V2Fb/JPpdqRmpSzaeYo9pkgc1e2F3xrfqvyo3RR3ghFJUJQz1K8amTZKfX kzM4ImOAx96JbAROXrkZimH2AsGCHC/GRVXpRhl5sZoIeXFDJ7epg9lwIO72f/NAZWHg 0/IJmwbt00PWmzj2JVhElF8rRYBq+PbwzVHmRni11Q2v/C10X2ebNu8DZFOxVeLcYQK6 FtAg== X-Gm-Message-State: AOJu0YybaqrbJUwZ4AfzanTG9iZ8G24OKtARIhi48noXqSfqNwvSlXWW YfxZcP86THUjfhwQ/r8I6tjncrBDFpW62Nr7lKOJd2HJOSoQTUVRJy3dhz7wT/U= X-Gm-Gg: ASbGnct+Zr7U/5IdteXDVHo2o3MqeIKJhfzEdNe4XXRFHlnOBzHnRconOKsQoS6QSml Mye1IHIBCW7bxSVbVWvAVacNahCRw1tI1QvWDj+6/lywVrgY4SmDhjBu6taxejPhKpYm6bYeqRj 4XePkcysBMiGhFJS388fOp61vKnzGKo4752Jehq+9Sx0/ECbj5TGVHlvJyh6z8FlNmYsbUrjPst axU1jOYiuw7S7FO8JCmhkIwi1Ko6WH1t+uF3U/+TMVID6flmykGJGeRllZfTuQ/a+bTlmw45/k7 yrbO3abbeQvej5hr3mDx5hh2nfvlpOotfzo8Rqovnag02cs= X-Received: by 2002:a05:6402:2114:b0:5de:a6a8:5ec6 with SMTP id 4fb4d7f45d1cf-5e59f3d3780mr1642524a12.10.1741127094677; Tue, 04 Mar 2025 14:24:54 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abf6166d3f7sm583129566b.57.2025.03.04.14.24.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:52 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 3E0AC625E2; Tue, 4 Mar 2025 22:24:42 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 28/32] plugins/api: split out time control helpers Date: Tue, 4 Mar 2025 22:24:35 +0000 Message-Id: <20250304222439.2035603-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x633.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 These are only usable in system mode where we control the timer. For user-mode make them NOPs. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20250225110844.3296991-10-alex.bennee@linaro.org> --- plugins/api-system.c | 34 ++++++++++++++++++++++++++++++++++ plugins/api-user.c | 17 +++++++++++++++++ plugins/api.c | 41 ----------------------------------------- 3 files changed, 51 insertions(+), 41 deletions(-) diff --git a/plugins/api-system.c b/plugins/api-system.c index 38560de342..cc190b167e 100644 --- a/plugins/api-system.c +++ b/plugins/api-system.c @@ -95,3 +95,37 @@ const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h) return g_intern_static_string("RAM"); } } + +/* + * Time control + */ +static bool has_control; +static Error *migration_blocker; + +const void *qemu_plugin_request_time_control(void) +{ + if (!has_control) { + has_control = true; + error_setg(&migration_blocker, + "TCG plugin time control does not support migration"); + migrate_add_blocker(&migration_blocker, NULL); + return &has_control; + } + return NULL; +} + +static void advance_virtual_time__async(CPUState *cpu, run_on_cpu_data data) +{ + int64_t new_time = data.host_ulong; + qemu_clock_advance_virtual_time(new_time); +} + +void qemu_plugin_update_ns(const void *handle, int64_t new_time) +{ + if (handle == &has_control) { + /* Need to execute out of cpu_exec, so bql can be locked. */ + async_run_on_cpu(current_cpu, + advance_virtual_time__async, + RUN_ON_CPU_HOST_ULONG(new_time)); + } +} diff --git a/plugins/api-user.c b/plugins/api-user.c index 867b420339..28704a89e8 100644 --- a/plugins/api-user.c +++ b/plugins/api-user.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "qemu/plugin.h" +#include "exec/log.h" /* * Virtual Memory queries - these are all NOPs for user-mode which @@ -38,3 +39,19 @@ const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h) { return g_intern_static_string("Invalid"); } + +/* + * Time control - for user mode the only real time is wall clock time + * so realistically all you can do in user mode is slow down execution + * which doesn't require the ability to mess with the clock. + */ + +const void *qemu_plugin_request_time_control(void) +{ + return NULL; +} + +void qemu_plugin_update_ns(const void *handle, int64_t new_time) +{ + qemu_log_mask(LOG_UNIMP, "user-mode can't control time"); +} diff --git a/plugins/api.c b/plugins/api.c index 82241699a5..832bf6ee5e 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -526,44 +526,3 @@ uint64_t qemu_plugin_u64_sum(qemu_plugin_u64 entry) return total; } -/* - * Time control - */ -static bool has_control; -#ifdef CONFIG_SOFTMMU -static Error *migration_blocker; -#endif - -const void *qemu_plugin_request_time_control(void) -{ - if (!has_control) { - has_control = true; -#ifdef CONFIG_SOFTMMU - error_setg(&migration_blocker, - "TCG plugin time control does not support migration"); - migrate_add_blocker(&migration_blocker, NULL); -#endif - return &has_control; - } - return NULL; -} - -#ifdef CONFIG_SOFTMMU -static void advance_virtual_time__async(CPUState *cpu, run_on_cpu_data data) -{ - int64_t new_time = data.host_ulong; - qemu_clock_advance_virtual_time(new_time); -} -#endif - -void qemu_plugin_update_ns(const void *handle, int64_t new_time) -{ -#ifdef CONFIG_SOFTMMU - if (handle == &has_control) { - /* Need to execute out of cpu_exec, so bql can be locked. */ - async_run_on_cpu(current_cpu, - advance_virtual_time__async, - RUN_ON_CPU_HOST_ULONG(new_time)); - } -#endif -} From patchwork Tue Mar 4 22:24:36 2025 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: 870140 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp493603wrg; Tue, 4 Mar 2025 14:29:36 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVhMzPjxBtg5xuOC1Cc9xXryv0V9uQJmLxaBDiy8cZQ0GuqAuXS+scHMaWn2kGB2S4XMLfMJw==@linaro.org X-Google-Smtp-Source: AGHT+IH5AcTU8yt1Xfy0l9ATr9PrQCrf0saAm3HuydPPw6kB6iEWuL3CngkGZHmk2w49sCktUbFM X-Received: by 2002:a05:6214:3014:b0:6e8:9b52:7a1d with SMTP id 6a1803df08f44-6e8e6cc0301mr16156886d6.8.1741127376158; Tue, 04 Mar 2025 14:29:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127376; cv=none; d=google.com; s=arc-20240605; b=UBZxRGEHuo7LNPnJGBLc0zU8AWAT2xoV7H9xuDiBCUEhYlIcficvigL5z0LjgSO95r 90hNZkZIhHWOfy95M0FZmGBLTfhgCct9sKUcwmKHFv1H8YPUZteDPaBqnDKFnGYW9sEi 5Wl0tXM9dZtJdlknBSFdtZfM4DkAd3RZ9KmQoNnwqxo8EoMII6SJFvEAO8dz9EeH/SxB VLkvfpE/7PutmvcSDCZJCrSN5p+vrGdLTTVL8rEEnCqkN3+UeccGXOQspe3RR+p7uN3C lhHOHhVfoWjmc6vA5t+6WXsmdtHS3WVWVcX0UdmtymS9StkTRJFOylYv8PhOj4W859mu wgnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=Jk0L9tiR8Pw91LWiTI1Z3wlxkKLipHgTcC6b1a+5kwk=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=CpnWxXVjfmzW7N0hqgNVwsbWfuv7JPxn+T8TjN2MuMmDCNbQ5CRvMV67d4OCsPsT7a zFWYJqjDABT7F2dpFa1Awhcu/50xJHuU3JTL7xY4hz9jFT2Qen0GEFaJzKWp/7LBfioF 4oJqC37G018VpDiEGJObHhxXAg4ivuCYLzPViFv8csHhw7aIB9vmYJzg1E1i7/Foqn9H 2Q9g0oCIgNnaML1u/XxeGLZxqYbwyJgvXLiVFnClmCmzb5OwUZiwbMXXebCiKSvo4CYu d3O4YehCF/CpN3Zdvh0KTRynkh8DuEmXFH1RA9/isTFr1Mr/2WibTQ+JWK9nctDG+Tt4 n8Qg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K4Qqxobg; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6e8975e7e58si117624596d6.56.2025.03.04.14.29.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:29: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=K4Qqxobg; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpaiW-0007KJ-Hc; Tue, 04 Mar 2025 17:26:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpahC-0005Sn-3B for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:25:09 -0500 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpah9-0006Zx-45 for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:25:01 -0500 Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-5e4ad1d67bdso9753734a12.2 for ; Tue, 04 Mar 2025 14:24:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127096; x=1741731896; darn=nongnu.org; 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=Jk0L9tiR8Pw91LWiTI1Z3wlxkKLipHgTcC6b1a+5kwk=; b=K4QqxobgGpnRBGZ6VZ1TXgp6BHR/9DGr6hbOX50/vYHJoAZqOFpqMFYWfGPlgOn+z/ 389RiJmV42o0f5wZCtEwkAK3kPBPPRer3fwnm8zDMZK/A3VNxzZJZVFbrwgaxEL06riS 7QfAmIG8MsH/nILMqSnggeZNx9cdOrF3SK78Rk6M8Xm42kGYoDJw6F7o7Sz6nwbV1ZUj BlJ/EyAjxlgxysrf/HINEjnVeeHQtu2peWk16fPTqZNk9Kyyc1ZBoTlf4VVc5h4xlDUo xtoX69ybUq1bMcVr5ax8nOJRdYQNaTyEx3DTjsFaew5F16aa0BLh0Y1g38tmjMWrFPxX VaZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127096; x=1741731896; 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=Jk0L9tiR8Pw91LWiTI1Z3wlxkKLipHgTcC6b1a+5kwk=; b=WFG3FjyIL73g3abYu4VzPJq5KYD5QMFaN7fZHqOyc84ibutHIJGYa6MHWOMoyQBECk Wc7naV2iqEg5Rm+ZeH8mWQxjonLgBw9Imf76RhBVziivwax7R42FJFZR6b7Gv/XXxzIK wiYgA8WNW+7rjPZHu/4isiJjlnZBdGQb0m/W0ENcS0AIUKnKZE6WoKAuoWybBXCb/N0y z/OrNAtcJnt6qhNX0xAOtNZoMuMoB6dVaifzBjiG2boTWreXfEcIaqJzoNEDziK3d3Nw BkHtVUXhhuHbt9wLcpidGAym/U23U6FyhG7uhRgthjrj+6mEHVqikKVlZKGGhquiVvU8 NBPg== X-Gm-Message-State: AOJu0YxUYRin4x4cIOJfIGVNQHcNHtOcwxzWXvoPpgLmATwHIR+kmkB5 NknK13SWs/nXnl9I/T3dUw6xdceXunckpMMmGuCOS5frHZRMX+7GSbvw6Ljs1ZU= X-Gm-Gg: ASbGnctOtAtKvT8sD1QwZLwcSbMZTABPuklHi2y5UegTov6JLlvLfqEJTe3kbD4Mrcv UWZEmwkIOIlyhiRE2fCC41jE93cRUw3kHl6FCyzm3Aug5/mMAcJ+TAY73XD3wNybrwXJmZzugyV mmW3YApCkHg3VMHi4+/yjI26eTR25DEKlWOgVevBZD8b6rkUd+5hXekr+d5ghqDL0AGMhZYiFlx MhP5HZcEj3a1mm3KCKXtM/USn21weTu3FMVu1/smcLgOfwcKreP8vKRTKG7UlFhI3gGwCb1x9K9 /R7/9+qTQgdp++LS12CHKZlfT/DVXdpkc+DMgp0zFLrtl3A= X-Received: by 2002:a17:907:7d93:b0:abf:6cc9:7ef5 with SMTP id a640c23a62f3a-ac20db05bc9mr102181266b.47.1741127095791; Tue, 04 Mar 2025 14:24:55 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac1f6a3769bsm164672266b.14.2025.03.04.14.24.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:24:52 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 561CF625E8; Tue, 4 Mar 2025 22:24:42 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 29/32] plugins/api: build only once Date: Tue, 4 Mar 2025 22:24:36 +0000 Message-Id: <20250304222439.2035603-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x533.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 Now all the softmmu/user-mode stuff has been split out we can build this compilation unit only once. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20250225110844.3296991-11-alex.bennee@linaro.org> --- plugins/api.c | 11 ----------- plugins/meson.build | 3 +-- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/plugins/api.c b/plugins/api.c index 832bf6ee5e..604ce06802 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -46,17 +46,6 @@ #include "exec/translator.h" #include "disas/disas.h" #include "plugin.h" -#ifndef CONFIG_USER_ONLY -#include "qapi/error.h" -#include "migration/blocker.h" -#include "qemu/plugin-memory.h" -#include "hw/boards.h" -#else -#include "qemu.h" -#ifdef CONFIG_LINUX -#include "loader.h" -#endif -#endif /* Uninstall and Reset handlers */ diff --git a/plugins/meson.build b/plugins/meson.build index 942b59e904..d27220d5ff 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -61,9 +61,8 @@ endif user_ss.add(files('user.c', 'api-user.c')) system_ss.add(files('system.c', 'api-system.c')) -common_ss.add(files('loader.c')) +common_ss.add(files('loader.c', 'api.c')) specific_ss.add(files( 'core.c', - 'api.c', )) From patchwork Tue Mar 4 22:24:37 2025 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: 870152 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp495601wrg; Tue, 4 Mar 2025 14:35:29 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXCM4mkAID0xamWEZoV4rlvIBmoVuxW4rElvP7ffgJq35nWDg40OT14px10/B0vBamqARMlvA==@linaro.org X-Google-Smtp-Source: AGHT+IFi6pgna+gkplFNHbdp5VFgLuJnNx958GBKenq13V/p6D12sY9z3KQGdxDuAMruQXPxMUoK X-Received: by 2002:ac8:5842:0:b0:475:8d7:bb56 with SMTP id d75a77b69052e-4750b4481d6mr11099051cf.18.1741127729267; Tue, 04 Mar 2025 14:35:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127729; cv=none; d=google.com; s=arc-20240605; b=kfmaE/v3B/hm+mh0860Rr5COurPNxLMiXlc50Z9MpxsQsN/9w8iHXePA7sGWD/VDzM PEpaGhqkOuRGnhQWPr1byy9RCnWpls66rVG2rZwyT5gASSma5/Sb4u71oPFaEP9A+DW0 0j0GiPU9p6a3wZ0Fh52SVf8ju1FVYbww8s0j/C5UcyHYwZ5C170IikPC2P5bMQv+F+9z wDtlCHLFpxxsx5MPQlzdn4Tkzm+jHnIQGdDUTySU8l6yPOReERS+V/sIEPdXHY1Zev9G 87PWY3TFymPPzr9Ea1LTfzhbsoubzTyaiQQjAOSVvrAin3X8lpaJaWdYW8VUbS43LDpM 1TUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=5gbc4xRevNcxKhPTEVM7Uxyv/yl8OruDV/F/XzKp644=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=dIIVIJMH8f5y5qZjmLx7+PNCLIdx6nxDPYAfeVwomlso5h0TlK/hAPJX24kNZ+ZrIZ 5OEGQBLs7bqScFk6ysXmAhP7U6HqYyoCcxFOu2Zg0V1YFdkEl7Idwzknk5dGWzFZ8b90 +Kxr0HXD3WpVqCS4gIlmRwkQwkH0iqEX/EqL2wyl4RiXdzTpaQgYyF19Fz7CqR+jhi9F T3wQ8IPkumQKuSRG6ZF1oKM8Ybj0sQ1Xrq5PPiS/rIVnVtOQhgNP7kJhkAjwemofvl3f Wuy2g3J0KgOPboLYHeWndqWlRu92vrKzh86tI55IJzvWCOUPIHkpt6rEegv5/W8dNbI5 aZuQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PsNLfvJ5; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-474fa7f1107si27833021cf.343.2025.03.04.14.35.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:35:29 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PsNLfvJ5; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpaqv-0000Zu-NY; Tue, 04 Mar 2025 17:35:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpaqj-0000WW-G5 for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:34:54 -0500 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpaqh-0001O3-Np for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:34:53 -0500 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-aaec111762bso1131455366b.2 for ; Tue, 04 Mar 2025 14:34:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127690; x=1741732490; darn=nongnu.org; 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=5gbc4xRevNcxKhPTEVM7Uxyv/yl8OruDV/F/XzKp644=; b=PsNLfvJ5CXXusCN22XmWgrLRLAruiaxVSkYJV59D/3WtDj/MB4ByA8WeF39N+VxgK0 wlJiUp9ELrO/iCGtE5jbgLZT/gOtlW3NvNLALE0f464qwoxdIa1kXAu+Hva5BX+YDuoz rp2FPiSY/240jcPBJZGl3ij75EloO5dZhRdd9HAbLJ56+uk5j9cKrfza+uxHDZ3gh3mr cp4hNALDGMwAQWVLVMUDrsvLJ8FpTXI/84EKsI2ni+bXDkyT34LB6W1mHqW89fUYSI9w R9PBd60Dl/AI7GJVP8f7SDl5lCUR92U+3DkW9gGlg6aT/MAN4ZLDtWBv/701xk4noJhT EG/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127690; x=1741732490; 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=5gbc4xRevNcxKhPTEVM7Uxyv/yl8OruDV/F/XzKp644=; b=DCvu199/gicVGXLGtYEVwy98ksh//FYtNsg2+6TII0Wz/NouB9hvT4GBh5RzS0L557 A2bkWh8N1DUVuuol0/gDrYrE6uictvmhgod79pAlPmMM6b6q8zOhKJsivypg4OafIPDn 0CY7kprpjVs2sbI1xNmixTtQltjL/w68NgXqpzeMhi0+jRkkgCMFLaa3stG7IQ4PWHMP ekzfuAiGVNr9be6Z8EwUj6uYndFTHbysg7d5PpqezDQ3e/dH5hazZ2JdIr6xIUGnO7fk NSoSRRCH+asFF6NMdcySN+AKxtoDDZQkOb6RD98uyoEyFfegt1Uq7/N0ITd3UJUjAvD6 Q8gA== X-Gm-Message-State: AOJu0Yz8BKkxoFrKbQqmtE2Dilk+J7CSC3CR8RQDulTpKZAWXrE+TiSv VLl5JB8JAj1jeGO3V3Qm4xPFQEEZURKdRfHodk9uKcMbv1kx+HCznAD0K9EDvXo= X-Gm-Gg: ASbGncsneEbCAoFluw9wQ3vnMpo0SBQegRr6VQ4cP/7iKxV37Q2jnHPTPUUg0vLcJVQ vvQl3+GbrUWL03E+pNdlc1f+B6BvdnExrlNoo3khC+vFYEvK/R36/gV1FeS9dMoPBuE6gx5tvpD rloyGrz175wnNLrxMsirSmJJMDErtaVMRjkZQz90vd7+WuS9QpH8j86Kfl4Bjg82s5QbXWNXarM 6nnySuahIFBeYmNMs4piAEGORVAxoxmpa4TJs3hP8We38N97bbktelBVl4CdWYYRYouaTjf5Mtz jYnUTiMnE5tMd/SccY54ZdbLoLqWKRM2e2oXBO0VubRPMEk= X-Received: by 2002:a17:907:d9f:b0:abf:6424:79eb with SMTP id a640c23a62f3a-ac20d8bc9d6mr98437466b.20.1741127689626; Tue, 04 Mar 2025 14:34:49 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abf7a9306a3sm397112466b.90.2025.03.04.14.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:34:49 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 702AB625FA; Tue, 4 Mar 2025 22:24:42 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 30/32] plugins/core: make a single build unit Date: Tue, 4 Mar 2025 22:24:37 +0000 Message-Id: <20250304222439.2035603-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62f.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 Trim through the includes and remove everything not needed for the core. Only include tcg-op-common.h to remove the need to TARGET_LONG_BITS and move the build unit into the common set. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- plugins/core.c | 10 +--------- plugins/meson.build | 5 +---- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/plugins/core.c b/plugins/core.c index bb105e8e68..eb9281fe54 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -12,22 +12,14 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "qemu/osdep.h" -#include "qemu/error-report.h" -#include "qemu/config-file.h" -#include "qapi/error.h" #include "qemu/lockable.h" #include "qemu/option.h" #include "qemu/plugin.h" #include "qemu/queue.h" #include "qemu/rcu_queue.h" -#include "qemu/xxhash.h" #include "qemu/rcu.h" -#include "hw/core/cpu.h" - -#include "exec/exec-all.h" #include "exec/tb-flush.h" -#include "tcg/tcg.h" -#include "tcg/tcg-op.h" +#include "tcg/tcg-op-common.h" #include "plugin.h" struct qemu_plugin_cb { diff --git a/plugins/meson.build b/plugins/meson.build index d27220d5ff..3be8245a69 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -61,8 +61,5 @@ endif user_ss.add(files('user.c', 'api-user.c')) system_ss.add(files('system.c', 'api-system.c')) -common_ss.add(files('loader.c', 'api.c')) +common_ss.add(files('loader.c', 'api.c', 'core.c')) -specific_ss.add(files( - 'core.c', -)) From patchwork Tue Mar 4 22:24:38 2025 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: 870153 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp495631wrg; Tue, 4 Mar 2025 14:35:35 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUTD8kcW68NwldCVgVQqP9MZAda0WdrauqC0i07tFA2y57EpFPJmCPUffjGmbeZ8QtCnjLTug==@linaro.org X-Google-Smtp-Source: AGHT+IE2rVgcQGPiTqBgOl0G7PArAR9S2SatGTm3LHpdluAe4qeVONH9HIskbF2Dk8S9i8UK0QG7 X-Received: by 2002:a05:620a:601c:b0:7c0:b5bc:a122 with SMTP id af79cd13be357-7c3d8e79f46mr197566585a.35.1741127735085; Tue, 04 Mar 2025 14:35:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127735; cv=none; d=google.com; s=arc-20240605; b=HZHW3p1g/VKVmt6J+CTZFw0RRlxDFsZ78aACu2u7wDyYDAvcTmggfd3L1YQmjuEVXR kqjpYiLevd68vX9b8/vVCSq4c0cA7WsIM1UCMiIrZTi8Gb7o24uqE4WaqnGty+SAeyB1 1WV7nVVm9Q8RE6tYPCldqi8e1oiDJ3RPpAXwcO4Xv8wu0yHCXrrdkgiJoG1O612yY55V LHEtNf9DVxadjVXLxGIC7UtqmUD58k/8TGW7OrYc6lK2Uur4CsxZ+NQ3aUsFPAACTOd0 9qvv3iV+GugMNG79SZJGGNDmHT0gYX80nutf4SPQSRwTlelFwe7nubtdGHnHxkgNnw3h 2CzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=CtiqEtuzstbJtMIqpkXLIIVivSH/DtdTgEZN65u/fk8=; fh=rmRPTT/CaE9Lk1zz9/5XvZjFqL01QyH4V9PKxZKr8SQ=; b=FiGxsXa95n8PBDQUueAR24glOk3f9O/W+ecqWLuNHc/h0t0u+ufeP2jTjGwrRPOEZW z/0O7xCvE6h4wjE8IuxkU0cmiwua4eMUcMZPDMBPrnddajYa+mjkHecd1+ijItyPUkv8 JXqZzuEEnIbtiOwM0iMk3mgloA/i6UUi4I3fwdp1qojnPAAwWdKFXrRc+u1E91g+bIJt /Vfvn5x30Z/4R01Jk4FrtSrcm+SBTCBj1tWrIuUhW5NirTxyF8bhVTPbVgcMEzTNzdPP +XCiB0LMMils5GOjPwRx4SuRpAzUpTAQFucusTNlrQMlVwMa9R9faSYKLtVC25dVBs2u hgbw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ehwGdeAR; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3bc397499si493895885a.129.2025.03.04.14.35.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:35: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=ehwGdeAR; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tparG-0000tW-0z; Tue, 04 Mar 2025 17:35:26 -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 1tpaql-0000XG-7n for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:34:56 -0500 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpaqj-0001OS-D3 for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:34:54 -0500 Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-5e0373c7f55so9507687a12.0 for ; Tue, 04 Mar 2025 14:34:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127691; x=1741732491; darn=nongnu.org; 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=CtiqEtuzstbJtMIqpkXLIIVivSH/DtdTgEZN65u/fk8=; b=ehwGdeARXFwMF+VD6DYuTZDuPQ/K9Ty4ZkQFTmqlnVN9v4iG1MN1IXCXxHAmqHKwVc e1Z/eJs6dC84xUNNQghm6OKpkhXxe1WvLvrSLrp/gY4p2RTRmEm9TPdYP2UMKf+oZKu/ lk6oFa1z7ksuXwEd/ECb5i1cY3dNGGYiG9nn8VsCDFYjN+muc95qQAGOsUP/I921L1JY Qz2mvTrrVlmd4FetorN1fF9ZcoTzoX2eYYgLuA5dBFE+udIq2YAsAq0Egsn1tQdTcUB0 bCYCwDkVpALPiAw5uBZLjhrriqMMSo2mNdm1HiCPbF4i+gNFkf+1A04XSbeV9Rf1xnjA SA+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127691; x=1741732491; 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=CtiqEtuzstbJtMIqpkXLIIVivSH/DtdTgEZN65u/fk8=; b=dt5rg3/Ho7afv7GYK09MiiGeg5OeBW7QsT8hXyAO0sTT1Fnb82Ak9pdJnpvyLHu6X3 b3aXetKVKSSsoLn44ZEBf0KL6fZMhC29+xISwCvURAabOEgLhmVqfrxAsRBWHQdzc4TD ta/CYI9cyUjMS965ogOszEVdq1vt8s3IGXUHL4Hovkm4MsioVCQbgFR8+bpqWJLCnE9K EgParph88qnzQVLvam5cMAvo1oj1uqFoZFA0M98/Rmm2eHSn95uKWFU+GJzTwNbsIf3W nsg3DHPjAPY84udKXvNksvReCMnQDf03f4qrMyRFty5lCzGDzRlO0MMD7DUZNukeNHBZ GGBA== X-Gm-Message-State: AOJu0YzrnD4tf54/FNQzbXRVvOXKab1TId9l+pffh+LAwPLAZ5n+ZlDM azaZx7MJrXBOI1Ov/7b1QdUplGTl6sm93YvlEL9uNH0XbUpd3nUe6wpiWH7iM0A= X-Gm-Gg: ASbGncssTBsItipW6bLlJAHfj+5LfVmjE8D7H8L5mtBp/kfdcBzPHPQUhaMV4jk00hw LAlV6NLQaky8TigJDjCbOtXr47SBEpTtAMQC+8WOdf/e+SRwYwuP0TDX8VMkPjEc5dbrGyUQx6q gLdBj3kxyNxY1hhahvbySIQpfZVz6LSgwf7xUnWMedfD0VyMZ+WTGObiqDoyNMqkNENOt0IOecW +qLpnkWLhUxQYyx4DIr9pGd2h0GD4SDrxcmS+J0fgkD/4mUWJA7tlBU5qP7zOk413dwiktgkIfs mYU2Ep2xT2kwxCTKdSKbHmMcdz8U/gqjkkHUpGDOiTitfRg= X-Received: by 2002:a05:6402:4316:b0:5e5:437c:1daf with SMTP id 4fb4d7f45d1cf-5e59f3c85acmr705000a12.16.1741127691584; Tue, 04 Mar 2025 14:34:51 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e4c3bb5abfsm8661689a12.35.2025.03.04.14.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:34:49 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 88AAB625FD; Tue, 4 Mar 2025 22:24:42 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Markus Armbruster Subject: [PATCH v2 31/32] MAINTAINERS: remove widely sanctioned entities Date: Tue, 4 Mar 2025 22:24:38 +0000 Message-Id: <20250304222439.2035603-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52d.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 following organisations appear on the US sanctions list: Yadro: https://sanctionssearch.ofac.treas.gov/Details.aspx?id=41125 ISPRAS: https://sanctionssearch.ofac.treas.gov/Details.aspx?id=50890 As a result maintainers interacting with such entities would face legal risk in a number of jurisdictions. To reduce the risk of inadvertent non-compliance remove entries from these organisations from the MAINTAINERS file. Mark the pcf8574 system as orphaned until someone volunteers to step up as a maintainer. Add myself as a second reviewer to record/replay so I can help with what odd fixes I can. Reviewed-by: Markus Armbruster Reviewed-by: Daniel P. Berrangé Acked-by: Paolo Bonzini Signed-off-by: Alex Bennée Message-Id: <20250221161443.2321327-1-alex.bennee@linaro.org> --- MAINTAINERS | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 2e7fc6fa91..16c2cb0c3e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2542,8 +2542,7 @@ F: hw/i2c/i2c_mux_pca954x.c F: include/hw/i2c/i2c_mux_pca954x.h pcf8574 -M: Dmitrii Sharikhin -S: Maintained +S: Orphaned F: hw/gpio/pcf8574.c F: include/gpio/pcf8574.h @@ -3640,10 +3639,10 @@ F: net/filter-mirror.c F: tests/qtest/test-filter* Record/replay -M: Pavel Dovgalyuk R: Paolo Bonzini +R: Alex Bennée W: https://wiki.qemu.org/Features/record-replay -S: Supported +S: Odd Fixes F: replay/* F: block/blkreplay.c F: net/filter-replay.c From patchwork Tue Mar 4 22:24:39 2025 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: 870154 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp495766wrg; Tue, 4 Mar 2025 14:35:59 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWvpBHAxM42inFW2OxHOA5/YCscfh0Qda8G0n4Dx3Rs1mad4vBhgvZWB+AuNaMrzpdmEBgPbA==@linaro.org X-Google-Smtp-Source: AGHT+IHX9sLFdfEnWTC9X2tQGiRzAGAI2hhk/Q+YI0rTRr8hxQxwMNtdpNokonQo5eSCVpb3utyP X-Received: by 2002:a05:6214:2243:b0:6e8:8934:337b with SMTP id 6a1803df08f44-6e8e6cdaec2mr19442346d6.14.1741127759782; Tue, 04 Mar 2025 14:35:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741127759; cv=none; d=google.com; s=arc-20240605; b=Fze2S3B3TZWLyyLMXilrsWjiHaXyWWr8dnTRWQpjkirCGHoRb/zJUZbi9eMb/qi2y7 l4AekvcU6iWasoqRTylBtUvZTbTzb5v0+UMeLCqosW5deI7Rdc3gF3WxhH8ddDK19AAO D5tdAYYH5U/nQGmvuMFG8jGTNPrTE0yJiUPiNH5Uv2rSYVS6wkAUhoKIYKfstnfiByu2 FcnOCl5la2yQi9zVjsRvKqidxkBdrfgkDSm8CXqomNp/dmIQNHZO/5MAigHjWuVxMsWj mvNBR5ijAp5TBRhHJRR0uM/4BRSg8KAMNQS4mFsPwQNcO5R9rCYqfwN4HESVXOvYW8bG 7qUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=9JeQtbLiYtOLbCRF+mM5h0mscE6W4z+gp/D6Lf7IWuI=; fh=6Bzz00MUAZSz1sM9FDoE/jB6E9D8TQzH70NWpntkZX8=; b=XywaEinl1QqdYfLi0ZRJ5BA7P8WfPAp7LScNW4mLCdhQDF+Mre4wo2oj+LX5maV1Ed dn8yKw9XKZEzF+q6VHhBrgzKMEzOY2rb6bScpTC9XBNK2fO6chovGo6CJeTGyBcz+Zpz KnoJYxiSVkZ+K8+g2BRbJEmBFqmhX/uQweIOAZ7teuT7n+0NYay3hqb8FEpo2Im8crB3 2/8gSo/3eISbHw31tczSjp8ciQc17GXDjIi6+8zWFErJXEIiyeZyrm/5wGKwmpaJsGGi +QcaZ1i0i5KXfXmWNMhhLOZYcfE+698Md2M9MlUpRmf0pf5uRvqf8iASh3zyX4bCl//X JIKw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PnR7vJqE; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3c0c739d8si444227385a.359.2025.03.04.14.35.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 14:35: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=PnR7vJqE; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tparE-0000pN-0X; Tue, 04 Mar 2025 17:35:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpaqk-0000Wo-Th for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:34:55 -0500 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpaqi-0001O5-0C for qemu-devel@nongnu.org; Tue, 04 Mar 2025 17:34:54 -0500 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-ac0b6e8d96cso383500566b.0 for ; Tue, 04 Mar 2025 14:34:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741127690; x=1741732490; darn=nongnu.org; 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=9JeQtbLiYtOLbCRF+mM5h0mscE6W4z+gp/D6Lf7IWuI=; b=PnR7vJqEUUL4GwcFYUhtFBQfk+/FUQHtIrlaFAKjUnehWUu2j+apjBW4a0zPhJ4flJ 3/vcqo3N0oxMVU+vIqQ9FQAPDH/qHt82egPR6ibLc/X4+1B8S3n8HCF90+LG6Zm9xpms j/R94aA+YWgaL2wApzHpcVY0m/TqB8lUBOGrs4fKa1etH47oUpPlr0HEvkfEklbJzKbj pI5Vk0UkdytL7DUU7qZ5B6hxNj129z8EOWg5z4g+HWxuEludqvhaLkp5zt2vZ+fBr3um IKkNNMf06LfggVjwETHLbLXd4UuWcdH9Ndz7lU2bb1sfvBgxrg1DKlyzqtJvzu7mg93c QbOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741127690; x=1741732490; 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=9JeQtbLiYtOLbCRF+mM5h0mscE6W4z+gp/D6Lf7IWuI=; b=TRb6DbfO0vPyUcKZBvsL+w35s0Ip1pyxxVZu3jCcl4nDjz9oGsYxGJGGBQQt1uYAXD VdEc5fvI7xM/3/JE2SGZ9B5QS7Pc54wmScSCxIMwMgQqfY3DQcnZ32q+vxBQ/3c+cxBn qluLTg0E1oOiLXpMBUBuUnWNts0CwhcHZX8tj4uI8ZeXpo/BvzSUZkK3Q7AS06dGHtUm jXzSGhJPNkDUhEndvXlStDAnuWBBOomJr1rIX+l2qlqNMs1UGIycb/8wI6iZ4uaveNC9 REtEcRWnwUyK5XGTvFomXMnW6Yt5f0QEMJ0MmQv9QCHFPmmHW7oLhBjXFfPbI7Pzj8k7 4egg== X-Gm-Message-State: AOJu0Ywvdu0cDMMQ3rIdhwQECVnJ2Y8LHhdq061x+YfWWDlku7ubCNij CVsJGC58vW0lQ33mGFzEo1PZkncswbowytVJCpjbupMQ67dYzfHhRr64pICdvjc= X-Gm-Gg: ASbGncsSZOjOON1Qo4AB3C+yjWrxWODgghgkIsG//KAo9UCCP9xEo4HhUAwkasuQEcI fHVzpuz/xjOveTMdBhAqU2atfbx9DWB3EbzmTSNTXsK4K8fd9ujs1MFh7HrEZ3u70e9D/hDW6bM A1nZVzBiHkc2aLjwZHSXXCtrsmHWsyjBpgZH/FiHZdFUccWrwI5oBewbY19DLCadtAfAo5PQyWH D8TqpSEvwH8db/vFMgTiFhYg0IuwTGuFPaEHKvc4/UecZlgKptU34d2tHrAV9zS1G/jVMGiyOqn to/qzCRgI6VQFf7/3evMyyyyJtDwxXiz5Cy0z+mNhAolCMA= X-Received: by 2002:a17:907:94c8:b0:abf:44bd:8326 with SMTP id a640c23a62f3a-ac20d8bce29mr83331366b.17.1741127689992; Tue, 04 Mar 2025 14:34:49 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abf40a603b7sm785796566b.170.2025.03.04.14.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 14:34:49 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A13C062604; Tue, 4 Mar 2025 22:24:42 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Li-Wen Hsu , Peter Maydell , Laurent Vivier , qemu-arm@nongnu.org, Alexandre Iooss , Paolo Bonzini , Richard Henderson , Riku Voipio , Warner Losh , Brian Cain , Mahmoud Mandour , Kyle Evans , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ed Maste , Pierrick Bouvier , =?utf-8?q?Marc-Andr=C3=A9_L?= =?utf-8?q?ureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v2 32/32] meson.build: default to -gsplit-dwarf for debug info Date: Tue, 4 Mar 2025 22:24:39 +0000 Message-Id: <20250304222439.2035603-33-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304222439.2035603-1-alex.bennee@linaro.org> References: <20250304222439.2035603-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62d.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 option is supported by both gcc (since 4.7) and clang (since 7.0). Not only does this make the linkers job easier by reducing the amount of ELF it needs to parse it also reduces the total build size quite considerably. In my case a default build went from 5.8G to 3.9G. The --disable-split-debug option allows distros to keep all the info together for ease of packaging. Signed-off-by: Alex Bennée --- v1 - add --disable/enable-split-debug - move to option_cflags --- meson.build | 7 +++++-- meson_options.txt | 2 ++ scripts/meson-buildoptions.sh | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 8d0abe7f12..36ffe1b730 100644 --- a/meson.build +++ b/meson.build @@ -363,7 +363,7 @@ endforeach qemu_common_flags = [ '-D_GNU_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE_SOURCE', - '-fno-strict-aliasing', '-fno-common', '-fwrapv' ] + '-fno-strict-aliasing', '-fno-common', '-fwrapv'] qemu_cflags = [] qemu_ldflags = [] @@ -4589,7 +4589,10 @@ if have_rust summary_info += {'bindgen': bindgen.full_path()} summary_info += {'bindgen version': bindgen.version()} endif -option_cflags = (get_option('debug') ? ['-g'] : []) +option_cflags = [] +if get_option('debug') + option_cflags += [get_option('split_debug') ? ['-gsplit-dwarf'] : ['-g']] +endif if get_option('optimization') != 'plain' option_cflags += ['-O' + get_option('optimization')] endif diff --git a/meson_options.txt b/meson_options.txt index 59d973bca0..3432123fee 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -362,6 +362,8 @@ option('debug_mutex', type: 'boolean', value: false, description: 'mutex debugging support') option('debug_stack_usage', type: 'boolean', value: false, description: 'measure coroutine stack usage') +option('split_debug', type: 'boolean', value: true, + description: 'split debug info from object files') option('qom_cast_debug', type: 'boolean', value: true, description: 'cast debugging support') option('slirp_smbd', type : 'feature', value : 'auto', diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 3e8e00852b..aca6e68830 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -504,6 +504,8 @@ _meson_option_parse() { --disable-strict-rust-lints) printf "%s" -Dstrict_rust_lints=false ;; --enable-strip) printf "%s" -Dstrip=true ;; --disable-strip) printf "%s" -Dstrip=false ;; + --enable-split-debug) printf "%s" -Dsplit_debug=true ;; + --disable-split-debug) printf "%s" -Dsplit_debug=false ;; --sysconfdir=*) quote_sh "-Dsysconfdir=$2" ;; --enable-tcg) printf "%s" -Dtcg=enabled ;; --disable-tcg) printf "%s" -Dtcg=disabled ;;