From patchwork Sat Mar 8 21:52:56 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: 14007902 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 213EBC282EC for ; Sat, 8 Mar 2025 21:56:55 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr26y-0003FT-VW; Sat, 08 Mar 2025 16:53:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr26w-0003Dx-Kq for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:34 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr26u-0000uB-1Y for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:34 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43cebe06e9eso2661275e9.3 for ; Sat, 08 Mar 2025 13:53:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470810; x=1742075610; 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=L0IWx7DP2oaeVZU3zQdeb+u9JDC8B6jtkTZn3wjhUEU=; b=mYtmL9FnnU0M43spd51Xjo1kOlECf+WtdBYPwt2Pyj3vqhiej6XTprbN2kWc4ygVfl ALyD/5tMy1Hhif3vzyHIn+HoHX+u2bNCVHB19DB+/9VX0/13XYjv18/GTwleqVuhX+8x UYnr71dUQizbJbOJBAvmBJTblMSbOlRHqotbgxYjiFHb637Vrys7eDQtIq9aTaL/2ho2 vtw75qiIzIuQllkk//fO+1VUBf1MSvpZK7/QxNjyM0Idzmvbv7AZshKRBSBBvd3thVg8 JM+IH4rU4EQwV+Wd5h3qgva1RkQur0GCDRjgV0Zh0my/q1g9Q3sIcgNxtemYFLZm/Bp3 ItUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470810; x=1742075610; 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=L0IWx7DP2oaeVZU3zQdeb+u9JDC8B6jtkTZn3wjhUEU=; b=xIGUXvMxhERhiWwVP2lkixBsPe0N7fP3R9A9Smf4zWHgaTGCI0YWpm9m4DclN/EMqo 0NPWCKcpLLGF61ZW3cnr/vKGtwHh8wiYk8MnXIZ/H+xEEufnN0H4cynC3MqzAgyMJAtL EraamnTh/ZqkmJyrByvJ9I0aMEBLldnhd9z4deot/YEoEJ5ME2BQSG2UQKl2dyWvEj0v xB5PlwTqCo0xkT2edLBDx4aqW87Cy7jdLNIj7gY7zcHHFoXB0WTFdVzDLCaKNrdLNvQU BJs8kT/Hxwy7MHypI1OkRZM6ZcqN8u48zLnTmHhxZLUe97IpRti2m3DWl8cWuTHBIjap JUwA== X-Gm-Message-State: AOJu0YzKdQO15GT/6YhYQ/BQM+KF9ZMc/MXrbPWWMcwVT1EhGmyhpoG5 ZEGc1Cy+0K5LNohNRvtJE744WoykrKvPMTkjlkBYtjhDpdZgGFB+eOm96TEsgYk= X-Gm-Gg: ASbGncvGW51dUJgnrGlybTWMsxMWrAP3lVahlFYXZOz71QVeg5MbfA9XkoQFuK2crEx yG1xEN+ro31qMHc8xjJd9NPEvbuMZ+FinxfObDJlhRDkUv9zI5bRz/UMmbjcPRJhS/0qt2ZtMo8 CgtspwtRbNCt/zkP2ly47QNMd748ekHefpZFB89G2jQO0GehmokgV00uwz2/nEgL443fJVeQC7W F24YEVFdpAnPhVGxU1h4FgHeY9yZ1LKwkv8ksd8pgchi4n8HtkQaw5naj/Ir4MENYR21DQX9bjm hslj0bO97QF7+wixze/8DIAwDiHax9t2puRKMQUl6KTKYZM= X-Google-Smtp-Source: AGHT+IEwHzxm2aPr7rRfVwm/Y4qd/aXDg04sBaF7YNdN6lmHWh0Wmmkn1Yg1SO19qRiu7Cjxjqj3wg== X-Received: by 2002:a05:600c:4ec6:b0:43b:c0fa:f9c5 with SMTP id 5b1f17b1804b1-43c6024bf6bmr47735765e9.21.1741470810078; Sat, 08 Mar 2025 13:53:30 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c01952dsm9757036f8f.45.2025.03.08.13.53.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:27 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A73275FA05; Sat, 8 Mar 2025 21:53:26 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Peter Maydell , qemu-arm@nongnu.org (open list:Virt) Subject: [PULL 01/31] tests/functional: move aarch64 GPU test into own file Date: Sat, 8 Mar 2025 21:52:56 +0000 Message-Id: <20250308215326.2907828-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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. Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-2-alex.bennee@linaro.org> diff --git a/MAINTAINERS b/MAINTAINERS index 5df6020ed5..756432add4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2630,6 +2630,7 @@ F: hw/display/virtio-gpu* F: hw/display/virtio-vga.* F: include/hw/virtio/virtio-gpu.h F: docs/system/devices/virtio-gpu.rst +F: tests/functional/test_aarch64_virt_gpu.py vhost-user-blk M: Raphael Norwitz 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..32af941cd5 --- /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 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__': + LinuxKernelTest.main() From patchwork Sat Mar 8 21:52:57 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: 14007904 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3D6BFC282EC for ; Sat, 8 Mar 2025 21:58:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr26x-0003EX-K4; Sat, 08 Mar 2025 16:53: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 1tr26u-0003DJ-Q6 for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:33 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr26t-0000u1-04 for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:32 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43bb6b0b898so25414235e9.1 for ; Sat, 08 Mar 2025 13:53:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470808; x=1742075608; 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=sd1Rqb0eZxPQ/q4aV8APc+tkTpr19bp2JQoIjr8lN20=; b=DtaIKAUvHKpHRbtjsKhypSASO4Jkl7CqOVIVEbRi6ix0YPlwdc/b+RRVR/UHiZgWWN H446sFXDpSwmdFBGkq+AwAz0C1CMNIiPutFFizs5usJfr7jabwzpC3x5fetx78kbxBh6 YAweyY/+MjL8LviPjwakW+66SoVAIsnwrQI189gcYLWDfuDi38Wbl/oAF3IPmbEPw3UR t1v+U5hbSw7buFOzS8CE0LQts6uk7APMxz31I0aKjSK1oa/J/Sh44DB/4PArc3xlGz72 nL8JTtXemjv0nGn5t3kNEkryVAjR1uKCEnfJAwpttYoOUtn4iK2Ufyj/qkkk3bz2IELC AVbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470808; x=1742075608; 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=sd1Rqb0eZxPQ/q4aV8APc+tkTpr19bp2JQoIjr8lN20=; b=W+WTLniTmYr73BBGI5bJoqveeAmDmoa1pQ4qP98JkT5REnZDYUxYAjqw+NBicL2rFU 4JyIyyoWuD7sYiwC2s5DwDyH+H4YbJSFsHM4R/knIAlP7wEd5wx/MAdvnhNUB8UNBUlS Hr2YZg5Rx6DRzdyeN8yNZOboin3QTcIl8b9fGALWbJvf1kFJ/qE03N2R9Rf4j8MkigL1 7FTutzgfx/YHWjb5tLGkd5PrBOZaYRKUI/A+6cJC4r4CH5NfiOmf60Tlw3R6f600TgOj gcqyeGR4BFcLqKdiOvRSFWWWUnL+pDNqwgPEf2sRyxciU8eJzei345jpdN9y26tgYt3h gO7Q== X-Gm-Message-State: AOJu0Yx6uulzfk4jJP1B3UDSrCiR3I2ZrFC5Ts2dvTF8H+atjsqJYotB oZEXZ2eikFODRUY4uVDIsOGz+Vvf8/8d9VRlFW2uYm6UcBfD4fl/pegp8+BUhWQ= X-Gm-Gg: ASbGnctruYkWFeqCbwURilbWR+w+2dwcIIgWrrGwcCbJiaz57P7/bTpIefLgmwAh0b4 6Wa16wWyHTFRj2tRiS2WkALGAG6PEuMh/v+sjR6I7+3oi0MCgXIosPnu67zBMmgjMXqZ0Q/gTlX rCKBlrxIYYSGSoWhUt1apm0TpV0B9VimReZ/Nv4YXufvs/hCU+oWXn1n3BsUmkFsUErKZZmhCyc ir+u/oPkH89ncpeRtUxNjvbGxNKX3EvViDsahjxmymCjX7Royj29Qoslt0w8tKTh+no+xHtor7A hzEnomINR+iss5iC2NN57J1W7AbKpyJTlnxmOKMU/tN7f4s= X-Google-Smtp-Source: AGHT+IG8pWfUbwnXKzw8x2uh6wp6+LN0BR9MmyZFzeqKgxcdouPdLpUiB9Eh1f4dsL9SO/nNGI0cMQ== X-Received: by 2002:a05:600c:214d:b0:439:a139:7a19 with SMTP id 5b1f17b1804b1-43cb302205emr46732615e9.23.1741470808577; Sat, 08 Mar 2025 13:53:28 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bdd93c9b6sm95691585e9.29.2025.03.08.13.53.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:27 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id BB9595FA77; Sat, 8 Mar 2025 21:53:26 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PULL 02/31] tests/functional: factor out common code in gpu test Date: Sat, 8 Mar 2025 21:52:57 +0000 Message-Id: <20250308215326.2907828-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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. Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-3-alex.bennee@linaro.org> diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index 32af941cd5..b4679c0460 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 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__': LinuxKernelTest.main() From patchwork Sat Mar 8 21:52:58 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: 14007903 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 64460C28B2F for ; Sat, 8 Mar 2025 21:58:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr26x-0003E6-5I; Sat, 08 Mar 2025 16:53: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 1tr26u-0003DG-Gu for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:32 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr26t-0000tw-08 for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:32 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43bccfa7b89so25381925e9.2 for ; Sat, 08 Mar 2025 13:53:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470808; x=1742075608; 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=9L7HiJswE8TAfNvAWw1znjTjbMsjJ3crdXjMtFLIetE=; b=mT2Eh6ftJ1wuCQsYwAIb8dRoXLwOIstoPjBQhivzVSmBy/6pFlxSnvAZYHVjrVBX/y QO1Jgbr6H7VA5Up0JvpArrPHFJCDJK56K5kthQoH/IwYSmll7jazkx2HsdpYG8iveQOL QBIt+SQArp0dSQKfbzqvDIvX8vKS4D1GXcwvvLvWueveBffTAAX2z3BLzGnA5xYtHiCK ezcC2XefBWYZ8R+eIDpU2iBnb5ksVIfRgOkVpHxVoowjpQdDxuEUfnGdf7Bj1l70s6VL VNUKWJZJsRw/NUqQbGYteCDsFdpGacWkhZZD+pSJoV8unWn68doPtpqNNTYb0+tTvPVo 5eHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470808; x=1742075608; 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=9L7HiJswE8TAfNvAWw1znjTjbMsjJ3crdXjMtFLIetE=; b=pyy3H/Fpche4mvpPHnuvM/UnoqdccifKmTz+Ti8bDjPCK71Rd9uKnTGuZWgBNPYsH7 EOt/dU43fWcJNdbId5OV9p32RSF7nGZPWrmphRirapT6BwAfUaibY/Fb+Ynr4yvYz1El iFg76arLELvXsVDvPyrsjVcFrr3Ye3Oe7Pk4xswokUQ55YHEOPdvjGKJctU362RjENXh IBNT1MrK7PvtawNhKzcfCHnQcwWH7SypOdUK0eutTHEXvhNi/wcVfSRLfVvxK3EBv/MJ xEbyq6aloKNamBvdw6GppisRKittQy/QqVK7mfacVaQWLGgw3GyYaBqTfjB6RPPK6xI7 boTA== X-Gm-Message-State: AOJu0YwgAP2I4Pnm2zd86wrmpOCBk/EoGwNyRixAbYG3+P80vnF2voBu EGr7gfM7mJTVxYyrqblN2AcU7p5xG/ls0bEyAi6eNl1EXj2pwKrP317L70z3Dnw= X-Gm-Gg: ASbGncucgFBZ+G8vRIf//NTbEkCixdyWFvqODSHHtwEnD+eLbjItG0RJDOQ665k/3vY chKsrbliaq9X+TmkW8bUSXkVydtDnmG/Z4NNELiQcdcgYwP+n5+3ymrYE4TNKPoBEnEUl1n5+a2 aqB9G6PZsimEPauOR/AuMOimpN1s5RnurmaQW92NxBwm+77eBzaur7/xdGNwq25GM8N8nPRWok/ ufjzpO479Z+8SIIHU4v6g262DdA0vouyOnpkht001v65rdN1S34lOZgVs+abEmYSyuhC0zeGywA CFgriJGfEqeiJrM/pAtYPcQjqaRLDsQiyD/EnUkAq3pnZ6U= X-Google-Smtp-Source: AGHT+IEmiHvZWd+YCHvAf8vbmU2Gwe+dGVThJkNWTDPl8MP6ROEhvb8Akjabv82quX/LeIDPcyfc5A== X-Received: by 2002:a05:600c:5857:b0:439:9e13:2dd7 with SMTP id 5b1f17b1804b1-43c6de39734mr53164185e9.2.1741470808273; Sat, 08 Mar 2025 13:53:28 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfbab43sm10077298f8f.15.2025.03.08.13.53.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:27 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id CF9325FA87; Sat, 8 Mar 2025 21:53:26 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PULL 03/31] tests/functional: ensure we have a GPU device for tests Date: Sat, 8 Mar 2025 21:52:58 +0000 Message-Id: <20250308215326.2907828-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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. Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-4-alex.bennee@linaro.org> diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index b4679c0460..9a1ee2befc 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 Sat Mar 8 21:52:59 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: 14007899 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 93263C282EC for ; Sat, 8 Mar 2025 21:56:26 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr270-0003GP-93; Sat, 08 Mar 2025 16:53:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr26w-0003Di-1w for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:34 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr26t-0000u9-6s for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:33 -0500 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3913b539aabso409003f8f.2 for ; Sat, 08 Mar 2025 13:53:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470810; x=1742075610; 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=GpopK86QINh7V5h6ymzYJTc948St9iL142EhrxVQFuE=; b=Fe4gFkl5xhJf6QE6/0HwsDTgpHbWod7y2tguMNchoPCTmO34uv6yBvuDSLbiuc0USP cBBxMUS4JAhSXqQXXz9k8MQTHYVKthZDCXFOgS7gHTXuk9kHORrtG5pY5TBsceBkdZyT DxPg/v1L3/HWQxsuRSfqNtleEwIn4YhULGDHYOTy6x4DxSolByhGFGFcyDGzbLpVh29Y 0ICkL9eGsqucJZafLa8K1cAkSQ6x/u4tBJKhwmZG/WADgkNqzejCq5dLAc4p1Nw7WuVu YEuD8aKEm0kz3dvLOYq3dRiOtjOfR3pCH0fpgg4YRVKGQesMc59ktErID6cafQfdGvdB Wh6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470810; x=1742075610; 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=GpopK86QINh7V5h6ymzYJTc948St9iL142EhrxVQFuE=; b=d5fWGsDuJOmk29kvTHzkMk5UwPUVxRNQuMRX8+gCtxTGzLrJk56SLOyGt4H1xUhIlI Iw2iQ/6xz3rxBPw+SoIMrXQdgE5g14fHq+WzdqqLHIWMpe8Ovs97PbV/Qg0vBtJ6Qwav S/KdNOFvZCh2/ToWE/R9UqkB1gpVLM7MMdoxZ43PVBqJ0or5Pn4ajsuUOjNiAu+3EDEt mgKFNJ7KEFr7xZu0vpiv/CA0OhBB3cbzBRQXmaMvI8qZJHQE3xf4BPl+Umb7clocPnfp 6SSpYZIzxE46mv5gKI4kTIDVdNa8B90SFujQ0cSvPqPuy6ifo0bNdX2hxhlhdFZSdp8L pvPw== X-Gm-Message-State: AOJu0YyiKOLXX1eMU7WFg+CbNd4++af4gUCHYMxGfHXiDmezkSLbyZdr 2F6mSymCuLNqz7WKcAnsAH0gYX5UQo+s9+/deaZNF/BS+NXC550Qn9Vv4wr3AIY= X-Gm-Gg: ASbGncs+IbpOSYokieegUh/uWuD0k3F2ddIWvrxfnGmcfRxGfjY/QbS8SB18fN0PVNR y4ib1xa4BFkuS7LYtgLDUsCgoNveR2qhEsBg2Sb5eUNUfKz/b6OzcMnBLCLxKmj2l5XDOaJevbZ ykAI+A1l4JRKKDHVGQYBv9HrmBRiIxBDSs8f3sjXvYDDRWQtolVDGk0LDUHqqRUqug3Co7XggMt 2Xl6sGb+nolY+GszibNBX4KNT1tcVOWxTBx9CPhtmKqEIJ63DJHxSIejlHT1QUR1JBYFfv+KiMv pQqmDArFgBVf/hZLEVImy4/WkbHto3b4AP4oRfFzkdWsvUs= X-Google-Smtp-Source: AGHT+IFG3L+dyCEHi+bfCxf01T0I5x8mCkhNtDG76sNTN6hK/OyCCFaXLzB9e0HauEgr/UG+LX0X9g== X-Received: by 2002:a5d:47c1:0:b0:390:fe8b:f442 with SMTP id ffacd0b85a97d-39132dc35b2mr5398521f8f.54.1741470809696; Sat, 08 Mar 2025 13:53:29 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43cee22c13fsm17319125e9.40.2025.03.08.13.53.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:27 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id E366A5FAA0; Sat, 8 Mar 2025 21:53:26 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PULL 04/31] tests/functional: bail early if vkmark hangs Date: Sat, 8 Mar 2025 21:52:59 +0000 Message-Id: <20250308215326.2907828-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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. Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-5-alex.bennee@linaro.org> diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index 9a1ee2befc..eea1e8c973 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__': LinuxKernelTest.main() From patchwork Sat Mar 8 21:53:00 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: 14007901 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5D1C0C28B28 for ; Sat, 8 Mar 2025 21:56:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr276-0003LF-4G; Sat, 08 Mar 2025 16:53:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr26z-0003G3-N9 for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:37 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr26x-0000vS-CN for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:37 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-39130ee05b0so1667903f8f.3 for ; Sat, 08 Mar 2025 13:53:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470814; x=1742075614; 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=uP5TiKKy+g7zDm1v/BM9VjWiPBsi9a9+GYKmDxVZNDU=; b=tQLgd+dRHbreJppvVDOQZVLx+WAqVNL9RWTlcMDKi1BoMyVy2UgBDTRsUkZJ0a38xl JRTCUvEpNT9pvBr7hHr8KejcIBh+0FPoGJKtrUIwtbHnbyXBawAYqpJ1WIoCOx4lhzZ4 620UQBMdSL1mR5zXrABNN5W4zZlARXNC+zI5MluunL2YlYbgCVtazVComRrLyTZ0l3uO fACB7ZpBGIuB9syaoDhc3RZdQgaseLrDqRuRMKDG4cPoCoQ3lEuwljiOZqhvmt/cTE9y Lt8J/gTD97u/Vwd0jzCkpSOzzrpSvACI+PuTgn0RThTwkfNuke9x8Sl7lYAapRp1bS8C sE9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470814; x=1742075614; 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=uP5TiKKy+g7zDm1v/BM9VjWiPBsi9a9+GYKmDxVZNDU=; b=t/VeBNc76fFbvzQzJBszzDEsWaeaJu4JhG4Z2khwZvmTSgvMLJLZ++v8D5jllflV8R aqcgH6HJ0FWEIloM5wp0Grvct2a99vKCSVXz3v/YcJqozs6wi+rFI3G+F9ehglwSq0Vj xCdAsA33huldvvbwiITXTVLhVRvIMNx4qAnoCNBb18UDiQxl9T0Q7j7lTPQxqWX6oJof L+bT0sXUce9Dke31j4qKeXEI6VhEUhHUks4UuutyxrvoxlS42iCSODpjtlo9cJcn2H36 2TY0VkeqEPup6SECGDNns08OJFA4mKicWyYdiMogoMpGOuXL9RTzu33oPez14iwu8lRI Qu2g== X-Gm-Message-State: AOJu0Yxx7YvmeuODO19Kc5tXLdzDZDzDuWOaHxQYtKJOeFrKZzmv1iOp jHFFycXK5ROtHhT9aawnRT/gXgrrPCUtY63asaEKtr0+8GZbDba8TUbdhUFglto= X-Gm-Gg: ASbGnctdWTIREHuUuzfg+ROl8EJaoXezd117gDCspFzdw0pFLFaAF09gm3F9yJIaur6 neEKoSx71VHZzyFNcuDU7tH7igj6Y6UmszfgRowMKi1WkMzv7A6hKl4mX7ti2kUe4hKT8kaRDJj 7uteWfp6uYT35AXeWf+gMjgCePYnhkfa0SVQ9uUzJ52DcJlVf0iAsA3v+XuBO3VZdbZCvASMtky qHZpMfp3xn1/EZfDlPLbeRgH0ydXElxw9Jf49EORm0hKtkTm56oDe78wdcz++NOKu2REQE2d3OV XRgmtvDMT13d9I6Jccy42dvhqagaxfr4GFgzG1oCfU1csS5GYazoX0WPew== X-Google-Smtp-Source: AGHT+IEirWalxOVjPt/KuG1FsttI+w//qnpxKddMslJgsgbCWleV4w4nhSGhRWl0cmzudVS55qRtoQ== X-Received: by 2002:a5d:47cc:0:b0:38f:2766:759f with SMTP id ffacd0b85a97d-39132dbb069mr5450159f8f.41.1741470813805; Sat, 08 Mar 2025 13:53:33 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c0e2bacsm9933579f8f.78.2025.03.08.13.53.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:30 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 01B0760065; Sat, 8 Mar 2025 21:53:27 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Peter Maydell , Dmitry Osipenko Subject: [PULL 05/31] tests/functional: skip vulkan tests with nVidia Date: Sat, 8 Mar 2025 21:53:00 +0000 Message-Id: <20250308215326.2907828-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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. Reviewed-by: Thomas Huth Reported-by: Peter Maydell Cc: Dmitry Osipenko Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-6-alex.bennee@linaro.org> diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index eea1e8c973..32949f6a34 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 Sat Mar 8 21:53:01 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: 14007888 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5830AC28B2F for ; Sat, 8 Mar 2025 21:55:18 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr26z-0003FW-8Z; Sat, 08 Mar 2025 16:53:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr26w-0003Dl-7W for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:34 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr26u-0000uR-Bq for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:33 -0500 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3912d2c89ecso2447127f8f.2 for ; Sat, 08 Mar 2025 13:53:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470811; x=1742075611; 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=OIaKC/SjxFs9P2m9mvZW+W0xEbrgWkgnWx8O8XlDy3g=; b=QLzF8vmU8/OcBX2nE+UF3y5tHz6zPJ4vMnMRVtkvxIQVLuW/5ZXCJI2WznCf5AupfM riM6rB8FRn4AcDBVmTNZaFZXsyWkEN+aKvtD/OijmtCgvM1BZyrK98IUYgLuEETvALi1 a04OWTYpXIU8ik2xDHUHoh5HLSjwvwCFn8QEA0ZxNzb9KFuFxenZtkVO5hE+MnVd0GRV snuv+t7pM7zc3XRyOA0HpWnoSaYZZ7cXQunlWjEfM2IOke8fuVqdXwzwEtCXzg1pv8sd 08dFzgE/h/npeo2rEzXM63YzCv0ljFG5C9mjLAa/6Tnu1htZ1zpEjqOtRwyJ6lXoKM28 J3dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470811; x=1742075611; 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=OIaKC/SjxFs9P2m9mvZW+W0xEbrgWkgnWx8O8XlDy3g=; b=JTAOrVxsh58d4aA+8WeEofpMCOQJtic2FM9xIlvkWTcGevRjHpOk+7Mkd4cfxHHxaO 1qL/ZRXRz7FzI/s6fzEoOGOC7Gkeke48jWTBQhnqlhdB84qK86tcWDASq9/PPNCJmy0m JrjTdcyC/m2IWT7PrWsE/qEzK6b+L31XmLACraEcF6EH/wNMGcBCY/12qjnEvs73PKAi PipXpqp/4gA38ZEYjGxAeJ0+BVQUCSp0E+iQK7rEiDCWcoh4oW/jZZYdrZluaVRwO0WS 7GCxFlYTufT5JWm6rTlTJz9an4Aj+Te8T8/2rw0h2WIxef1n5tNJ4rPlOO+UmWivZbC+ S3og== X-Gm-Message-State: AOJu0YyA2koGLUTtMvk468FScrSpqpGAlyhv8wyXEeGq46m3C0HGhbVD MV6R6D8Xsl6Zgkueq2WcpQtXufD0SOf24K5yG8CVq/qNDb+byeSfjRBl1qV4FH8= X-Gm-Gg: ASbGncvS56mbSuZ0NkEowX2v88W6g9zHOe5Dq0VeLmLDYUzhpOHx1KtfT2t3Lw7E1ja Kg16jI1jva9YJAbLlHiGu6zATpgk2XV7m7L7T5YrJjdDpcaO2aAAqPvz7gAXMO0nGA27OLDsNOV a38Z9C6KthAYHNxzfX8eFlN4S/TXrg5mij4oldTgmGgXkX621OC+77D9PTC1jWfth6jhODY7LMi FsWQ7PZYT8UFVy5uoQnqOGVv3Bs7W71Goc7UXUMSU5guZ/Eo39Fp1mXXEcqKqWV/gq8WLjhz8SI nnRD5ECSdEStLlM8hP/FhJLTsdpCrL4Qk0NERtc2O4z7MlM= X-Google-Smtp-Source: AGHT+IGxbVfTYRdbg3IigvV9WeMY2yrQ9q0eqNLlASEuIc5m6lIkrl4swX+7Ypn3JthiCeE1Jqf0VA== X-Received: by 2002:a05:6000:2ac:b0:38d:e6b6:508b with SMTP id ffacd0b85a97d-39132d308b8mr4967926f8f.9.1741470810865; Sat, 08 Mar 2025 13:53:30 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c0e2b6asm10109790f8f.66.2025.03.08.13.53.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:30 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1725E601A1; Sat, 8 Mar 2025 21:53:27 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PULL 06/31] tests/functional: expand tests to cover virgl Date: Sat, 8 Mar 2025 21:53:01 +0000 Message-Id: <20250308215326.2907828-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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. Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-7-alex.bennee@linaro.org> diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index 32949f6a34..4a21d8c6cd 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 Sat Mar 8 21:53:02 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: 14007898 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BC62FC282EC for ; Sat, 8 Mar 2025 21:56:18 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr26z-0003G5-TL; Sat, 08 Mar 2025 16:53:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr26x-0003EF-2L for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:35 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr26u-0000ua-JN for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:34 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-390fdaf2897so2946761f8f.0 for ; Sat, 08 Mar 2025 13:53:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470811; x=1742075611; 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=VPeKq9Y1elDW4TopisjmaJUNcVaePa54zZmUT5VyNw4=; b=M7AQDsSdtHAfVgta3N+PMa2EIrKnTmeN65XzoqzbqgAlLHK4S1TUal+FI6CuMi0doL 5VfR84EIkviEk2v+xBeNdkS2n5n59M2zK4hIZEz8fl75KfbPvurdgIE1LFAmnpDClwzE 9lRaTWUlmLvByCEdENafjkCo22j7S/njf9MXkD7NRG9+LLZvv3JV6Xox8saGJLdz5pda xn2OuLmMjofccoBzP7mMlsLzsx1vs0G64dwqPwGR3jarjraql9Gdc2aQjE3b2JzQ8yo3 U5U7ocbykTLLjBXvrsnaTTJDJOBcgvs3dtY3JfIl9OpMsBv0gcAv+7+/xVGbkB38YMaX Ytww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470811; x=1742075611; 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=VPeKq9Y1elDW4TopisjmaJUNcVaePa54zZmUT5VyNw4=; b=YCystZDfavWwdNOkGWs5kbgVUlVVk2axyM75qILN2VCDMxpe2bwfR9wYqhLcON/4UZ gs/98S8VoOTh7dOdUG87NBbhdFdxwu9ZRlJvdEumdMfOMRcMc3maOzRcKrYtTrMwLz56 WxZwbGtooPgRWUhU7kT6p9Ch2h//ErZdxkUXtFUdJLaD0TTVf2vAHsOZXH7rNiyMKwzr fTH1CR8Rt4X87zZfQx/2nx+zXfguh7CoiIRX0rNuVAebRLUNQBfS5iqrF+OgOaiy4fMf mefW8SOsMWbDRdN3UpQkDQ2i2rGNxif3mKWrIAX+b0V1OnAYMCL6Fw3tK1fjRPuQzvXm 6pIg== X-Gm-Message-State: AOJu0YwS+ReJSp99pSXU/MyFBYQq/Ag4qM2uNSYpzcgvITEeX8b0Hifo C+NpxxRiZ05F3uqXwwuyUv1tR1IZUc8B05ThciHbbxWLuv/xAmYWzKc+A3U64Kg= X-Gm-Gg: ASbGncsNFPe+bWwprkK0tmDtSNfnfPVXvLDEjb3rnzIhX+MsqfY1HNcVhUJ3UNUobt/ uPdRFNjSqo5fGQTHzYMUk4TjIeqYSzkn3WkKuNNVyzhpShOvrbEL/w//Gwd7VMyN6A5tM2npk5g NvGzAAlyctjJSd8kI9d7CyCZEjWlkoeMLga8bj4XsuSCyoaGammYyuYH37dY87OVbE9NH6E/GQV lhtZ04JJTe2f+3FiFOY1x77m4izgHJgmLLBHNV+pvrUw/IeFLQ5AVffR76vzLPw7Wl67Uj0Bt0l ee2/ZkRr+ygSI2c/zDJWxq4dZC9NWaAkagAx4riV3CWLUBg= X-Google-Smtp-Source: AGHT+IEeSBEGPqofpX90PlhcsZJyG2XZz2S05cDg3P7rrBO3yIHDbYKoiOksU42JaFeTxAnc+lLhrA== X-Received: by 2002:a5d:6c63:0:b0:390:f0f3:138a with SMTP id ffacd0b85a97d-39132d5b4bfmr7387198f8f.27.1741470811166; Sat, 08 Mar 2025 13:53:31 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43cf04ae69dsm6711725e9.0.2025.03.08.13.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:30 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2F164602CF; Sat, 8 Mar 2025 21:53:27 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PULL 07/31] tests/functional: update the aarch64_virg_gpu images Date: Sat, 8 Mar 2025 21:53:02 +0000 Message-Id: <20250308215326.2907828-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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. Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-8-alex.bennee@linaro.org> diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index 4a21d8c6cd..c6f7738e93 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 Sat Mar 8 21:53:03 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: 14007892 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D252EC282EC for ; Sat, 8 Mar 2025 21:56:03 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr271-0003He-3T; Sat, 08 Mar 2025 16:53:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr26y-0003FD-CI for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:36 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr26w-0000v7-LK for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:36 -0500 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3912c09bea5so2293423f8f.1 for ; Sat, 08 Mar 2025 13:53:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470813; x=1742075613; 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=nW7/p5GqVTN8cVjBAVNZ8mhXpq1InHLulArjjxzEZbM=; b=XLQUYwQcRnye+bQGAfhXqr3j4X2X54Y1Z1SNSJwj0dVKX0bpPGbKnOXXquXhr0RAC3 yUd8bQsg02wFYAupuetmWXFhLfVpQcF+J9wyLDPR1zRq6o+jNFEUw1HU/5MmYHrQTH72 HRYQpwiJLK+Xlum7dVihIilyFiFF0lLJBCfhn/A2y9dMUtUMD9wcxEFph3Kn6IGqhAEA f5GN2QBYRCZ0xZqkUYXBrdOuN5Zfq2SIQIyNyKxBR5MsIabSKyF63j14e6SBAr37/f/z dOdgsuT4B3T/LZ834nX+U8A76pJvZM/DwNG2SRhEhqtgK+kkS2T7YZHLcvWNCluZXFOR 0JOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470813; x=1742075613; 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=nW7/p5GqVTN8cVjBAVNZ8mhXpq1InHLulArjjxzEZbM=; b=JN2h/M+yu8GT1TkJUMkAczPk9/GDqesP/FJ6N16FR32NMM3nGYiYk4fwXu3G0bzgp0 3T3yjJaHXm9rHgM39Ze7VzNdrTdYLKZ1jf/XG2vYiv1WxQ9C2bKWWA/LZOOuVtnJ6aa6 AGifTaT8eDPBbvsuA4mR8hcHmolqsplI91X1pC8NzhsnSVMxF+lzLx20iG6wvNvud82P VZy89dccKMHXr06xxcyvNH/RzBhZVtNyfBdNsM2dpsUVPmOQBxAP33ykR01Ygb8O0Vep PuUcTeePTCpTXQ3FuAk37YqoPdixP/tcegK+kjs8QnM4snp9hhamyISBRlrUCOTLcprl vz/Q== X-Gm-Message-State: AOJu0Yxn65BVjWt121oJ/twEyQXsw34GxFAkiGu6Ov7GMq4SpJYUe5or 3StyIfF2+PZGHiIdlqZ49AEyXEfqHt0fum8TDH3V+OBL0juLWhzVT/W/c/5jRic= X-Gm-Gg: ASbGnct6SlAZXPdPf9TY8NJlWDGNlFn0DpmXP6WV6lwt8rRDnKIsdjteHBzJi2pGeNZ QNNK6q483xozvUnUrJpwa0tWiET093OFg/Z+/kjKn5bJOSKyFebqZv8rFb35A8OPKJ8s8vFfWjI +yVcwOnhKshxkt5GbIP2fqdbfszRfh5AGnP/sIl6kprnjCyZiRldvn5TP4QBlTkQIN8RkTtMuV6 2iwXI/d5mfHQGL+TR+11OA0PWc8nUyATDJcOljqTW7GVer1EWsUgYaxI5mxLxxbzfVNDQja4kVF zx2zsw5cYGm2Fabnb2R+9aC1k6GB4R+VjI5Ywjbz5LfR2zA= X-Google-Smtp-Source: AGHT+IG3ze2BzghgvZv4sVwn3F+qOYJq4eLwFKqrRITHzSKX9Jfe9NBiOvGbF37KIpfCkAfVKqFacg== X-Received: by 2002:a05:6000:1a8e:b0:391:23e6:f08c with SMTP id ffacd0b85a97d-39132da91aemr4126646f8f.47.1741470813139; Sat, 08 Mar 2025 13:53:33 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c104acesm10075480f8f.98.2025.03.08.13.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:30 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 49F6760341; Sat, 8 Mar 2025 21:53:27 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Alexandre Iooss , Mahmoud Mandour , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PULL 08/31] plugins: add explicit dependency in functional tests Date: Sat, 8 Mar 2025 21:53:03 +0000 Message-Id: <20250308215326.2907828-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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é Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-9-alex.bennee@linaro.org> diff --git a/meson.build b/meson.build index 8b9fda4d95..be857cc80c 100644 --- a/meson.build +++ b/meson.build @@ -3664,6 +3664,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 Sat Mar 8 21:53:04 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: 14007885 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 32484C282EC for ; Sat, 8 Mar 2025 21:54:51 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr270-0003Gx-NC; Sat, 08 Mar 2025 16:53:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr26x-0003Eh-KV for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:35 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr26v-0000ur-RG for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:35 -0500 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-38f2f391864so1611655f8f.3 for ; Sat, 08 Mar 2025 13:53:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470812; x=1742075612; 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=y7Djw++6bd8H+I5OGX8uaoGwshCQs34Mn3t1BV9txfE=; b=gddV4xwYO0d26YaisfWACyGaJXDqG4MOur/ayBmQe++GBadacUvowAz4/mWyG7yv41 w2zb7VHiw6ien1sdXX80TVCmNJ8NmWyFIbkYB7naKQBbha3vtWufZoY5IgEl7TCvDkId WX/fkkFtaclxEDe93k1ah7va30FDW0VGCxW0+W3DsZLRURgOspSo6X4s/Rmpy6tfPJVZ /cxU8L0Bk7VKkQpmmarmeMSB9teMXfxgjHUTQF3iAG/mXEDqjDbme4uVkpc8EnPpJZcE D2Zove40Xz6oPMFNQtNCcUQtgSIXb/Q2QAkUOhQ+EMFPsKYkxBgd9Noy6LDybGn1kve/ Dm/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470812; x=1742075612; 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=y7Djw++6bd8H+I5OGX8uaoGwshCQs34Mn3t1BV9txfE=; b=xT1exdtz5lnHjSKArPv3BG9YcqkmEnINMDy8KR8e0qkXOxs7mDGsZk4kBUfIUbd98t Z5uGshB/F3vSxZzuVOc7guB2di5xRyiJgV2VaRb7LeiWVOUZLjA1xsL9NN4xPiGqU0+j Wbi9YBT/t1cOdE8rCR0LygXwikCQg3bMRvL90afwouRqF0sFwjYiKUZN39k7v4j1Grzg fF7fi0SwdujITX3VeBWVqKorc4Ewp2nus8suaq+if1VGhEVxiKITUAm5KJAH2AkL1kp1 rxPw2wQBlXj0qIrEu5dtI/9sdczUSG56UINd8J5yY0QoasPEZ6Dk8zytJkTO1WH0dq3A TnIA== X-Gm-Message-State: AOJu0YxhCP1hfY0yiI31GaBax+RnkIOw2T/eJM9mwM0+KQeZ3GNSRAPI f1Xlary8CFrpq1ylZqD67Fyw5nEkXoaL+dh+OY7/HC2KDiTAqQkxO2qV2FZ91U1FOzFHx8Fyqc3 q X-Gm-Gg: ASbGncsel+Q7YfL93ceQkjMfW4YorY9yBwU6cYEaQPEcafsTpSfkzngh6HNMN7ODIYD piPIQXouatv6p5ydt1XnxE/te6equAr6Or3oKcDDwuw/EhN2mlHjXdPZQaKbcM42wm1WYOGiVNH dnXw9JnCNetwDAE2CmanA+fHaLP/KVSd6aN/4l8TphEeDjWqMjf9LxxZ/JssO87kww3H0O9k5Nz moTrVBw5lScDo1kZQ3e6eF8Z1Yg3FXufL0JvVXGWn/iIUz9TEMborOr/fPmSDVRHbf0zBTfLT24 L+35hjdfOl07MVpr87FmQx9yOmF0UydIn3soNbH0m5mz8lk= X-Google-Smtp-Source: AGHT+IGF76jmOqzOFP094Xg5IDWuxR/XFMMbUElZmXI6vO7Z5tMN4rciOlV4+KqS9K/dsXdjzJ+huw== X-Received: by 2002:a5d:6d09:0:b0:391:34:4fa9 with SMTP id ffacd0b85a97d-39132b56eccmr6458941f8f.0.1741470812144; Sat, 08 Mar 2025 13:53:32 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c103aa5sm10054993f8f.94.2025.03.08.13.53.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:31 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 6102A60347; Sat, 8 Mar 2025 21:53:27 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P?= =?utf-8?q?=2E_Berrang=C3=A9?= Subject: [PULL 09/31] tests/functional: Introduce the dso_suffix() helper Date: Sat, 8 Mar 2025 21:53:04 +0000 Message-Id: <20250308215326.2907828-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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: <20250220080215.49165-3-philmd@linaro.org> [AJB: dropped whitespace cmd.py damage] Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-10-alex.bennee@linaro.org> 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 Sat Mar 8 21:53:05 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: 14007895 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7C2F7C282EC for ; Sat, 8 Mar 2025 21:56:08 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr274-0003JD-6R; Sat, 08 Mar 2025 16:53:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr270-0003GN-5A for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:38 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr26y-0000vj-2H for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:37 -0500 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3912e96c8e8so1581303f8f.2 for ; Sat, 08 Mar 2025 13:53:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470814; x=1742075614; 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=bx+oIRZTzQSfOA5NYqkM6PIAwaVGgxdotXJe0o6oYIE=; b=gSCYxwhDzn/LapZFii909z48hl3XdqxVvSBhZarbaEYj7qM1EZNNlUN+M5qp4Ee2Th gvetwp34HerhD27wFb0PHxcWXsy/I8myVnDFYlwTlHvrFTBCCkSwwAkU9EBrAoz0eh2v 0mFJ8TDqD1uKahg8bIxO0iA3K2/fmhSKh+0WOpCnfan6e7NXM2T8cRcWyAV8JdhaxwDC k+RDi+su2ZsbCodI0oY/zk7DW9oRzK8gGufm9GjDYiUscv9puCJVdanPo0AJ1e94MSan 8sJh8axWOyrExJx2dXPXB0nJbgiGSO4odr8IzJFDwx989bsBk3ZdsHoq8GhfriLvTILx FpXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470814; x=1742075614; 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=bx+oIRZTzQSfOA5NYqkM6PIAwaVGgxdotXJe0o6oYIE=; b=ZlaxgmvquO8yfgZsERcpwjGHfS8Dhx2Y4CA3V10sYX0wWF4pp2e503I0dLGa2Q8fo3 SdvWyOnxW2tn62a+I69Ot67BnVcT+ygpnAmC+AUbywV96TIFtFdaZZa5+L/BOqPqImVp E/S/xFe4X+5Jdq+zGlpVcK9ttBgyGJglaW8ly8DTfOmRg5q/nSK1sZCzVeiNbvvOnp90 6PBPm+S4qucl1EcMy4nm3o826sMB2Op3aXtVEYkjsOlbItvsJT/D8IDlLIQo+syssW9s 6la1Ye9N4GQm5q8Nyq4qLKM7jXjrSEgt95CL7BTBeEpZpFGa1Jv2hoEjg6MFjmGYOjJX JPZw== X-Gm-Message-State: AOJu0YzseRrdOMEswiaQcd5dW87mFtovekAvuMsd4LSztUPANJxtNpJN /L5bEwNkMItAxzojgleYIMJMWNBnsQDawWx1GeX/D511tW9Bq849GvcKiPxa7Ns= X-Gm-Gg: ASbGnct2jXk6LE2m0DCCAk+kUWSYD+pUETnSADpCalXGIesT8cRqVFqMTbqy7+PHRsV UJw3jhr0zrZHsh5VM66x2jQAGe7XSUa9Nk8Y42C2MBrjH5Y24fJEK6NIa7aJsOFZkpAUUBZYNmJ a8UAyMb5EquffykaXia8EB4hnGYTEtgcl5N7m4YegHjbaYt3P6tIm7tOlzjwDPht03R50ZNzqTY PulPYwd4ihSO3+3KrUf+yrjw2TRodMNt2aoqZoUEd7TJUqZhM6pH1E0S/WhG0yTtVE8bi9OxFLX 29ti6TNEDKLZji8nrEbEkj6isn0KwhAlRCRytcRIxkh+/a0= X-Google-Smtp-Source: AGHT+IHfCo2He5JEAGesCW01Dx4OtdGKnW0hvnnB8y5WkHGKMfOOdyLaeTpLmvKy8ZmQehcDCvp+og== X-Received: by 2002:a05:6000:1545:b0:390:f9d0:5e4 with SMTP id ffacd0b85a97d-39132d513c9mr7170501f8f.21.1741470814355; Sat, 08 Mar 2025 13:53:34 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd42b7245sm125155525e9.17.2025.03.08.13.53.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:31 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 77E18603EA; Sat, 8 Mar 2025 21:53:27 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Pierrick Bouvier , =?utf-8?q?Daniel_P_=2E_Berr?= =?utf-8?q?ang=C3=A9?= , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Alexandre Iooss , Mahmoud Mandour Subject: [PULL 10/31] tests/functional: Allow running TCG plugins tests on non-Linux/BSD hosts Date: Sat, 8 Mar 2025 21:53:05 +0000 Message-Id: <20250308215326.2907828-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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 Message-Id: <20250304222439.2035603-11-alex.bennee@linaro.org> 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 Sat Mar 8 21:53:06 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: 14007884 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 43CA2C28B2F for ; Sat, 8 Mar 2025 21:54:48 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr27B-0003NU-LR; Sat, 08 Mar 2025 16:53:49 -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 1tr26z-0003GA-Su for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:37 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr26x-0000vN-1p for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:37 -0500 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-391342fc1f6so1964227f8f.1 for ; Sat, 08 Mar 2025 13:53:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470813; x=1742075613; 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=JRhq9HDN5aPAtnciNO8EZEnQ3WXcANYypKioGpCvDcM=; b=bLekSaJmj1bJbjF7K2S44EUPInglPveSV3Ul1AJYjZjWJBjTWcIkO7EsfFpXIVwgeP dLxiYXteNHPSpVNALC09xJMUnjldyw/4+vIkGnXpGs1hOMtuKeIp6E4gg0GgDQxaM081 PizV4r4bw5qi8KgKH54M9DzLob43xE8yqONzgYyhPEry+gOaEbjFiCW9ZPJLhkxw/mhD VpIGIfip7ec2G6/S28SijQs5oe7TvDhUMA2yLqwfkisn6mKsEYTGXfJXnydPr/Fi0eVz dQZOjUbNuCxxmgzuXkvkQGMhQvWsq4suA+DHG63GwpFLSaTP/96pDd2cwxMQxuMD7mzs 8Mpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470813; x=1742075613; 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=JRhq9HDN5aPAtnciNO8EZEnQ3WXcANYypKioGpCvDcM=; b=J9ZRr6IDuKmzhwwwexDmOeEdqXuL399hzq61XMPUI/WrIUyQcuW3fsbdGIvscJA+SZ t4VG1qWy4J/QTF2mtfEcklW1DKlV9okcYPqybgmL/htt94IWpmVH9w5AKvBwV7AJwZml RkBL0AgWQLltAT1N+QlKu3K375TD12dGV98E7iDIE8ZRFTDzQCww8CxCRUpa8ecRup7b WZmYXSOkgI03ZVi/EQCzht02vKtLFLUBiBZjuaIAcGrKZ3azdlw5BcYhn/SrwP1yTstB MIsWwDN7nPqDCIpamMYvzq1v01eYH7TrHbH7Nt02fIZatRTm0FxI41QjwKvusOOQ5mfV 3ywA== X-Gm-Message-State: AOJu0YwQFPcev6jtsARGTcJ9AVObLI8baV4F2FKW6xS8GCdA2+qBcWrk 8Tv4DxuKYh1P1mvzS0hMku5DfdsgyDvQE1Dzmz+mlPCPxgFhwUs/OzWCzXr+M4Q= X-Gm-Gg: ASbGncu7enmw/xFGmVQ9Nw3HPvqMz7y0KLUDH77BcJqOnbzdxDSzx0q32kEiXWqYBeL 8r5Njs8UncehuCqvHW1GCa+wC3RbonhcpMN1dcnp1q0WfWW4Un8YxTXAmBWAyc7sYk/v/deQ5Yr S6NIv47aX3eDYcz/omtpAxCUyHY5d/WKYhsnqdvNiLRjQEAFXd6vQWzPUQk52IyW/nGie4EjW+V QRtmFC3JqNSUBtYiV37XLrwUfub77e5KNR3fLtk1ufFjRo6t1Q85icycJZL0rUQ9/gp7IqWUTot bGn8VkWN7sTCm/gPx63zTIJ3OgkKakbiTWzqZaYFDGc4ZdL6mn+mcQjPdg== X-Google-Smtp-Source: AGHT+IFS08LDtBj8OX+acbHhy8mYxw655IaEuJ/BXAxOc5c9EJIyKblUjKs3VOyuDrUOhVfIg5rWFg== X-Received: by 2002:a05:6000:2108:b0:390:f1c1:d399 with SMTP id ffacd0b85a97d-39132dad25bmr4373070f8f.41.1741470813561; Sat, 08 Mar 2025 13:53:33 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c0e34fasm10021426f8f.75.2025.03.08.13.53.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:32 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A889D60439; Sat, 8 Mar 2025 21:53:27 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Ed Maste , Li-Wen Hsu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 11/31] libvirt-ci: bump to latest for vulkan-tools Date: Sat, 8 Mar 2025 21:53:06 +0000 Message-Id: <20250308215326.2907828-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The alpine baseline has also been updated in the meantime so we need to address that while we are at it. Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-12-alex.bennee@linaro.org> 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 Sat Mar 8 21:53:07 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: 14007889 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E5460C282EC for ; Sat, 8 Mar 2025 21:55:35 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr275-0003L8-T7; Sat, 08 Mar 2025 16:53:43 -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 1tr273-0003J2-K1 for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:41 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr271-0000xD-QN for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:41 -0500 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3913d45a148so594003f8f.3 for ; Sat, 08 Mar 2025 13:53:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470818; x=1742075618; 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=/rFt/QJLuWh25zQpEuk3M1G9rXxDyCO7fkiaWwlgSTQ=; b=mUoJ3EBOZzMFLrJEF6terg6MsJmZCXKoIE3DXgJQ4ZC3BfHryUtVkbQmyg0B6qaLp7 VboFx0ZqIPUls3OvVaHrC3PQeWMDUytkGGU1ysu8uaSsCZRbEXdArjebTSUSJg+OIUf7 kwSSfFhe878B5HmRUAUIP8iKC1KUC/ScqQbjcPX7sTA2tzTVr4nGDibvmdHUpLJQN3tx gjAaNVUOkTdqaSoULw4BzqgTZ9G6BkwqpisTI8leKSAJTdGc/Az8jLjNpcWIj+0VcD19 7Jehab/nhwsAHSvNW2hCTMs7U4eEekh/fn0n32KkXGBjDOxIwVYcoti53ihaqPJ14Pbr C5LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470818; x=1742075618; 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=/rFt/QJLuWh25zQpEuk3M1G9rXxDyCO7fkiaWwlgSTQ=; b=l6pZwnT+NDLjFw263TXf2XB6nChL4h7UMj1VRA9ivZp10qb3PRNmiR2U8Sa0ypdVWy BkhVOr9B0XJIfsYhJQYMHMg232eWxlLHofXBFyGXp1HlaYaKOUEu0wq2enTtj16+8tgA zszNecY6rE1H1Ls39RY06bwdS7uFK2ShaX7DJkmMDMnCkZ3ziBrdS4YOyhgjNySLYi1P 0aDXj1XdN1GFbzI5d1aaRr+LFnV+Ct47EICvLekNbIYDSn9otGgrDzUaBwDPDKvCoHR/ l2VhbNf9jfGQYH5VwuPobal3KEi2OLVMEe8VH0Gu66hJ1gJzcO7+ZGhvWr771txtNN1D +wMg== X-Gm-Message-State: AOJu0YwuEM9jJMSAx7OiVDdUe2T3WO5tcYtVMn9ih3AhFrnNCaDI/2nU X+eyPl8NUNIKK9rotacrlNNHd6sxyQeWt4f1DVmY/wmQrFbiCGPw8oTtC+lospllKg6JXyOxIPD e X-Gm-Gg: ASbGncuNgyUuF+QsHtJ2/ufu3mM2kEIqhgp//IGvjzam2tNHjPlMtSQMiZSoYmBrE9L +H4ZC5vMARAV2rrFEIsSUiJZeMXmSg+AKvzFS2oRD0kV9oQ+xPa47ZysrygN0Kv0tgh1QeSw53D wSw1LYA720iZ+ANjBeEX5orZNQ4AKaR8JV8EzGkPbB1VDDYcwfRdAok6lOkmEB4x0BOqQoNv/2B ONlou5kZO4e/1j0ioK9ABW77Vn3xd0rqg7j1nCMbHXb0LHVfymo2W9UGZlxamv712Zishp9woLc b7qbK/tA9beoPhprMNXK47YNxvgyUiKYYh6qYZyviF13xc8= X-Google-Smtp-Source: AGHT+IFEbvTgwTc8kjJFnGTDvulUcsSzcX5WaEtnaXlMw8BXIxY+qkZPbR8FIPv2ZEGhZ5fLArb84Q== X-Received: by 2002:a5d:47c1:0:b0:391:2bcc:11f2 with SMTP id ffacd0b85a97d-39132d2ac45mr4864532f8f.1.1741470818313; Sat, 08 Mar 2025 13:53:38 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c01de21sm10077662f8f.59.2025.03.08.13.53.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id C137C6047E; Sat, 8 Mar 2025 21:53:27 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 12/31] tests/vm: bump timeout for shutdown Date: Sat, 8 Mar 2025 21:53:07 +0000 Message-Id: <20250308215326.2907828-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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. Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-13-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007900 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D7E5CC28B28 for ; Sat, 8 Mar 2025 21:56:31 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr271-0003IK-N3; Sat, 08 Mar 2025 16:53:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr271-0003HZ-05 for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:39 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr26z-0000w5-08 for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:38 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-438a39e659cso17090525e9.2 for ; Sat, 08 Mar 2025 13:53:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470815; x=1742075615; 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=bYdAFb3oBG7virE8Cpyn2nDjunons5iAGCOvHRbnYbk=; b=FaoMS/3Oti2cpOdA1UO1jWZcenJODHr9pxR6CnAlbued7b/CswKFDmmr8ED11YvJtQ 6YKB9JzFOPGK1kigoVQKZfw5kKpMM1LBeoIka5sfbQ/AGsZUFsYMgmPcLNcHz2k1d97M DTv7NkG+KJKhgybAGnVa8GZ0lynttlft1KFbEn6oTo3x6zTWYFnRZd3To+yyvn69G4XT YGzqDKKP9RjWHl5zw9SG0uOk2SPMdZkpmxmztrYa2IHANSd8JizlCQoMPOO5xp1KG+XQ FKrytDQGiiU+Hk+48vW345UJftSys66cniA2fW/sG3aXfDAfvNzZoUNiMrrPjoKRK/rZ 82cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470815; x=1742075615; 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=bYdAFb3oBG7virE8Cpyn2nDjunons5iAGCOvHRbnYbk=; b=fkoRVXSImjPwQsxAJouctZYrv9mVyO1M4swV4brC1b4kggHhsCycbKX4BJdMk9obJk I4XKZLHIfS9AJQewVriRfVmht9CVRjGoP5FHEY3BPGxOcCBV2Ykok8k85FBpukV9cNNm cBoR35bvK+5WM2kYN34VsuONya49zfBPCvwVmxa5hNx8qnp5qFbm0ehYi5y2SMs+TRKp YGlDjCIxQnRpfKuqLRghgy2Dp9e4QawtERqRLJcoSmigeWtH7E8S9Mblq63d6096UA9i 4cZkx64z++BeagfrOXe9Ve1XW/anWNOfJIjVgIeeLM0Z81Dzs66ZlzxShBXbW5p6k4NO B9Ew== X-Gm-Message-State: AOJu0YxTrrfefKwRtW2kKSwZ7UEEn3Q/sfA4dHZIyLNm0tXVdBoRAIk8 bYd0AcPyBgs1d63/epvoGmB0BccOxep+/L36asPPd//ZGAEQqZzsSIbRxptj4pAO7/thxsYczSJ f X-Gm-Gg: ASbGnctHKdcmUE5uDeOWZPEyp6TCEKoE4a/NbOKoP6DLk7IYRV5GqxGs/OZyCAxQwTU 9i02mOFPAwzsUQ1JVLR6f3TBdTID5/tKClKfl0P39mjfrHrj/Dq2HfII7KwgsyxCOGVPuufDU79 xiTH0zQCNusyWvBKR5vJMjymc0dLMQBeKYmsx4D9nawV6f6e7ctsOJrte9HKR1n/8Xe9jnP0PZB Beu2nT0pp7nsPu/9t00gA5OvjRMpWxOFXs3v7vsqEXlIf/0s1EbAwbEXqb3I4hcgaUL3pj2txQ/ wSNvO67ptSKs5YbwG0nwWPXxz5NCHMS4aUd6V4pUdtRhxcuQpaY3jY8nsg== X-Google-Smtp-Source: AGHT+IFa70Hc6xpg//9nyqzQicUcQ3XVqlcrBYnrhsxxYYrmN/ej7dBx+uC/ns+6az0DfunmnRkRCw== X-Received: by 2002:a05:600c:3545:b0:43b:c5a3:2e1a with SMTP id 5b1f17b1804b1-43c601cdb15mr55280295e9.2.1741470815480; Sat, 08 Mar 2025 13:53:35 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bdd8b03cesm95263825e9.7.2025.03.08.13.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D2DF3604B6; Sat, 8 Mar 2025 21:53:27 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Richard Henderson Subject: [PULL 13/31] tests/tcg: mark test-vma as a linux-only test Date: Sat, 8 Mar 2025 21:53:08 +0000 Message-Id: <20250308215326.2907828-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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. Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-14-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007887 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B8F79C282EC for ; Sat, 8 Mar 2025 21:55:16 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr273-0003Iv-Kh; Sat, 08 Mar 2025 16:53:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr270-0003GO-5Q for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:38 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr26y-0000vw-Ku for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:37 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4394345e4d5so17137425e9.0 for ; Sat, 08 Mar 2025 13:53:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470815; x=1742075615; 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=twLgsdoYXw0iYp9SZBJQQb16zThCNIayzujKHpj3usY=; b=guiBvZtigzrJKJEfRsGXmSfkyS/g/8LrBr9aUhWdlz4pRpbp3F5FVFWPoLd2jpyZEM wX0Vct2qr9tXJxLBfDq1W3ne7yUuUOQDcDIxv2Kzpdr3tjSiA359sWm0wPVydqBzAgSX L+kj2/3VPLM6LN24zrxI8YiaORlLecrws/E8lskWTtzRD8M6r3j/WBRTcfUgUCGamZBP Fdej7qxcBOSgb2/qlq2wfcXucoQhy/cVc+nLdn0AWUUDN6vYe3SQ/mc2SZXMpd5bL9+E r4DJT6hxaxuv7azrbBS6HMuYCL5V79rEKr23RmMUEtBuU9lOJHGw6rbuI3xNmiVqEx3C XtjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470815; x=1742075615; 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=twLgsdoYXw0iYp9SZBJQQb16zThCNIayzujKHpj3usY=; b=ZM8kJp6ql2MlO/8HAxinpj03qZaFQzGfh4R/1KM6JbqIoZyKtngAjxOzrDGYzl0pFA FL59phg+6EMlfrQQECfUffSaTt0AtUOZWuZzycVfrTnmio1IBwmvn6KPKZ1FYqaQVUch abOZguCnOHfIC0yvFo4qRuYOVOx2kuocNi0erjkKbdepiEYvDrkolbfXfe7P4qghOHdy VinD8LADZiyHbmqgXyn/VNi7rO5VxglNRoUDMu76kilLStEVXcAJI8ca2psS7/LzZJ5X fq46In+bfOV/FFAj2zUneMZEBTP3JJpH1Xfes2faZKTLUsFsOTE8lUkwJOwxKVDq1RQA GNsw== X-Gm-Message-State: AOJu0Yz+h9hTwIeXzrvAZO9VmB/bXsiyWPAaxw1BuQiEDq0aNjkUufy7 lYlFsn9Mq7sSHrSQC/rKIHehCxkIG+ygMsFjThvxdt2z71FHyMrueZM9gS0FhAcJE7bSqwsHW87 R X-Gm-Gg: ASbGncvY+U5ZXiU/NULIzroA7s6/UAnqa6ABrfcWv3AqAJ3xnHftDofhyDDx9npgkCY Igc6JCe+UchINqE0ILg9Err2LS1z/FG2wxika/X3v8AOHzD6Kixjf+UI6TiWkto1stsrkL+s4sv lgXrMxQJBxxF8KPVXxwcE9TMatkyFQgSkNBXDLpv8j/OkeX2yMjCyvP9m49r6GduvFuRoEiqxOZ IWAtQxLAutpFB1fUarJbL4bt0GJC6MFvO+QikFtd4VVgdIEDdPntVumUGkZZoDfiGtn9MAYjonO FZOzClp5omfggGccB8nHRVT5fDYZa798QWc668bgrA/BSkc= X-Google-Smtp-Source: AGHT+IFmEyHDFPYJXxoMSWSSFKMgLBM45GJeF7ra7IRdLDN35hQOrcwQPs52jzXoQUr8Q9OQELBI1w== X-Received: by 2002:a05:6000:1f8f:b0:390:f6aa:4e80 with SMTP id ffacd0b85a97d-39132de2a58mr6030732f8f.53.1741470814894; Sat, 08 Mar 2025 13:53:34 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfdfcfbsm9693452f8f.28.2025.03.08.13.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id E8696604F0; Sat, 8 Mar 2025 21:53:27 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Richard Henderson , Paolo Bonzini , Eduardo Habkost Subject: [PULL 14/31] tests/tcg: add message to _Static_assert in test-avx Date: Sat, 8 Mar 2025 21:53:09 +0000 Message-Id: <20250308215326.2907828-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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. Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-15-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007891 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 75ABDC28B28 for ; Sat, 8 Mar 2025 21:55:40 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr274-0003Jf-M1; Sat, 08 Mar 2025 16:53:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr273-0003Io-A4 for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:41 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr271-0000x2-9w for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:40 -0500 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-39129fc51f8so2554226f8f.0 for ; Sat, 08 Mar 2025 13:53:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470818; x=1742075618; 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=kS62xgfs4yo8HShma26k5M+Ftf9GvqKCsRAE0pxnfGo=; b=KpKO5ub92GLK3qYbm2zNLeCITmh/a5c+7gB8er488gP+pwVZFkyCUTOYa2s78BfHSV FAnWGGTgIeS6or6KYhertnRS4Amox3hfVEmuxB3/lGlCgn6fkR9RL3vS/IB7QwQyapIJ OgvTDLvI6sIacpPkPj9K8JGheQvb6MQ2UiG1BG2jLpa+i1Cvo3ha4lxtdhNeRmPUgpgT RN2Q1zl8Rfv/3WQf+mlRpGHXkJXzR3mi7X2C41ZSszW8L6HyCPt08xMgLYS+cO2VfXA7 8Ko8U6gOvgTCpJEN9mf+0+P1O0gzqk24JsUBsH9UogmCz4JviCQMEq8yi7KXII4fd90p YboA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470818; x=1742075618; 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=kS62xgfs4yo8HShma26k5M+Ftf9GvqKCsRAE0pxnfGo=; b=djGe3jj60xCtxru7XjSf3zJuQ7G0zRq+58bynmHwea1qZ7K8zKL2PTm0rJQYR0Nqfl CGi8Np/4evurp+V8OAOB5ft/6fgziMFt2MBhsvGRkcWRmm1njhcX2LqHUC/aOCN1xkvB aHUv+OS1IwVdRQG+2liAZ1ykohm7FsY0ZkZoWnDWe5Lrh/nB8HDUWJlFMf4DLDQ+eB/0 XIreXSc69TcM++2/eoOwi3IFle1ZROKOqyEezUX5Wl4yXbZ5IZbC1hou+B4jyr5lVA7S OT8DPx2h6kNBCBPbN/n4yRSvzSL+McPfXuAkXv8DcyxxuCfPzikxD7pO0KSOlBxTV/EL vPnA== X-Gm-Message-State: AOJu0YwYoKCauZKSKwxv3U434vdKPxr6gC14b86IezDuc/Fn9XfWykBc 5PzBpoloUJmYtz6udWPAyemRzSLntu8ErVTr7d5/A5GVAUokL4esUQSZ2DBJi7oDlnRwjs3h6PU N X-Gm-Gg: ASbGncu8eBO/+CYM4OicLzXb+P9VE41uCaUOVQ5idGJa+rF6CZsWVq3DTs1/aXt0R5u fvzufZrsGponYqtzmuwB/o4S5Pd7cJ0nPGXTKYiFAxKy8ZEILcQk9f3eQe7DbnqsFmt3YfH5Eou A0szr/YbkF7KvQsbjrhY1VkF8AC60lSNUjcOPyqdtpoeIEt1g7ON0XWNACRUSULlLOFR3uxaaCw 6oDFDoW7pZeJRXrl3CLat7lH7xr/9QMCcILFsFHmJaa6baiKff0d5aUFBQck+pxGEU+aquLjUJ/ YPyHNYwCM0yoNJDb3rveRU4McOM6tKACc86W68cI8PH1ezY= X-Google-Smtp-Source: AGHT+IGQfDphKx/UKpRAuwBvv68Y9Jm2s/k5IWmNxN2exjzPvWjmtnz7v+vrmevbqiEhB/RF0WOS7Q== X-Received: by 2002:a5d:584a:0:b0:390:d990:823 with SMTP id ffacd0b85a97d-39132d4783fmr4395281f8f.13.1741470817657; Sat, 08 Mar 2025 13:53:37 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c103290sm9740850f8f.87.2025.03.08.13.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 0975760507; Sat, 8 Mar 2025 21:53:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_?= =?utf-8?q?P_=2E_Berrang=C3=A9?= , Richard Henderson , Paolo Bonzini , Eduardo Habkost Subject: [PULL 15/31] tests/tcg: fix constraints in test-i386-adcox Date: Sat, 8 Mar 2025 21:53:10 +0000 Message-Id: <20250308215326.2907828-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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 Suggested-by: Daniel P. Berrangé Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-16-alex.bennee@linaro.org> diff --git a/tests/tcg/i386/test-i386-adcox.c b/tests/tcg/i386/test-i386-adcox.c index 16169efff8..a717064adb 100644 --- a/tests/tcg/i386/test-i386-adcox.c +++ b/tests/tcg/i386/test-i386-adcox.c @@ -29,7 +29,7 @@ void test_adox_adcx(uint32_t in_c, uint32_t in_o, REG adcx_operand, REG adox_ope "adcx %3, %1;" "pushf; pop %0" : "+r" (flags), "+r" (out_adcx), "+r" (out_adox) - : "r" ((REG)-1), "0" (flags), "1" (out_adcx), "2" (out_adox)); + : "r" ((REG) - 1), "0" (flags), "1" (out_adcx), "2" (out_adox)); assert(out_adcx == in_c + adcx_operand - 1); assert(out_adox == in_o + adox_operand - 1); @@ -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 Sat Mar 8 21:53: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: 14007896 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7E85FC282EC for ; Sat, 8 Mar 2025 21:56:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr27C-0003OX-AQ; Sat, 08 Mar 2025 16:53:50 -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 1tr270-0003Ha-W9 for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:39 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr26z-0000wJ-Cr for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:38 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43cebe06e9eso2661455e9.3 for ; Sat, 08 Mar 2025 13:53:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470816; x=1742075616; 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=KC+aAUPu9a4BdYI7vGXvf2NZEQGI2J1QgDqj2UoWXTA=; b=TxpDV40Ih5wbYmOHSKZAYhToU+WCHgMELBjf46krSODamIeaCHAfdTOy2z+9b32sWm uVxuZnfH6ZmZe+MKIUpEB789HwT1RM3uL/y4p1DJxs3Y0owsCQFu0bSeixfzKMESwow2 txTmnKyAbSFcDDd/lpMAeo7a/B8+xL14t/UKUFSQJYwEd54ZMaWmmcFmKdB8z1ATO2fM ijwlEVpwAUsRc6H29/3W6d3PCpgM3odKlqBreB7folf2ePq9qRJqBqekE95poZvKfT1r MMex4M4rDbByoYzl2KQKIbCqFxgBsEAHCdeGBVhz5vQgxFOHiewC2h9v1i4u7jOrz37v g5OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470816; x=1742075616; 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=KC+aAUPu9a4BdYI7vGXvf2NZEQGI2J1QgDqj2UoWXTA=; b=NHrQg6V0X2eCziRvmvyHOWhzcJ6sQ9spcn8m8c8UkDqFeo6AJiHTTszerYQ9DAuZ1j +uSeUaWw5XpGsN/1rHkDozR0kkX2Lby3AmohCQpD9PVlj5YxjC+9wxTVLxaOSATOEkLp /0kbBdn2BJbi9/qWIAh/uCZB96yqDppQG69i+ITDZ8be+5Fn1fuphDkgVZio6DmU/ZYs oyChTVutvN+wmDYplZ7k6FNqhpM0dPOdmuy1B0h/KPMPmc+KiK8kTBU0UkvFlTL1SeKD JFUJ5OVQNUyRP0BvLmFTiJ3jeCMkXMwMjjxDymke+YVUkbc6QNWoFJEZkcBKjp2MU3X5 UVfA== X-Gm-Message-State: AOJu0YxpsdPbZgp09/CoS+fF+RgjOqgj0zHR4YcI5ZPFxpRnoQcf2KUd czFwMAQXSiBOffHBjMSdBTsRycP6og/Uoubmhf+PiP4sDa6nMyc7vyw+bCxfoFg= X-Gm-Gg: ASbGncvvLE0QprekxBsI/ddCFPK0KX+zPzkKUvbWsaoTk55aRMIQeVn56DvUpFQXIjJ SVP70To0owv+7ROFfJk4h3kfmUUGMJXkpEq6+bW47Q/67omx1Grg0MpcgPzhMVAhdTGZo9rCmSV NlMG0QZxCcBx2884T4lIVG33O+CplR8bf29YJpMpakpZvjMiPQ2ksfDUKoFPknCByr1T+Vc23xi ptLgWEy3f34ZsYrjGNUb90E0ZOEGHWKsN/g0m21SaIbp7lsxDK9IWDCpbqpjIgo/cNYPTWYrksc BFICPB/BdW/TMTdI5/JqBvH64dvHkYWdEzSr/mOKjirh1YY= X-Google-Smtp-Source: AGHT+IGRKLvxAZwc9J3YJpjIH3DiI/aPhD5ZC+tqNruyN6NXORVQ++DmxiYEBuIjXcKc1xl+nVrYlA== X-Received: by 2002:a05:600c:4999:b0:43b:cb0c:3542 with SMTP id 5b1f17b1804b1-43c6b80c724mr52489925e9.15.1741470815940; Sat, 08 Mar 2025 13:53:35 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bdd8c314asm96314315e9.10.2025.03.08.13.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1E0ED60533; Sat, 8 Mar 2025 21:53:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Paolo Bonzini , Eduardo Habkost Subject: [PULL 16/31] tests/tcg: enable -fwrapv for test-i386-bmi Date: Sat, 8 Mar 2025 21:53:11 +0000 Message-Id: <20250308215326.2907828-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-17-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007894 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 46086C28B2F for ; Sat, 8 Mar 2025 21:56:04 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr27C-0003OB-24; Sat, 08 Mar 2025 16:53:50 -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 1tr273-0003Ip-9d for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:41 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr270-0000wf-Pg for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:40 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43bc638686eso25129535e9.1 for ; Sat, 08 Mar 2025 13:53:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470817; x=1742075617; 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=lRYf8YYeSE9eCvOULdmo+k8kd7hCBr9xRw5oUZbhPJE=; b=AM17UxRrDVk4wpASsYVdOi5xEqkoqukmKFUbGhvcPEgKm/oot1bkChCSLhG72F8Hsp r5Q2Cqi47ffcyEmlTy9GgeybojQok4Ti1u2GBpuyyAaXLH4PIq6ol329W7qJkt569g+i KOQZA00bxPpGWOYRsdXLiQ8oFcmfJJPTB4FFA0I6QUIWaKnmX3JkU/3kf45StcmZSthf LmClPHI7qEtQAkJI36yB6XRD7XEYAxRx3qJ/6DdWCuwJqtCBSFj3Bj2WU7mX553byWdD EFvnOqAQpuxTXEL/Qu1frf9U10wfBF4DlNGyoAbcGI29ZSRN82DgATuBhccpcm7+oss8 M61w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470817; x=1742075617; 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=lRYf8YYeSE9eCvOULdmo+k8kd7hCBr9xRw5oUZbhPJE=; b=aiLrLA9dSjjdx/J5JQVMuFjb86R/bp1wlfZ3F5KrpyJdBFRtamYI2utJwlY+XP5UPu oISfrfshWbiFlGS5Nv0kHO8SNPjmZIDZMTxTzQn8OfSW62dXrvyiZNySYMg0f4AAPSSp VBQBMkJD1Z314W7dOmmLvCmg3T50ufO04Rf9M/oZ/oCetHgSmXvM44LShrzMHq0wyjtd IE1QWNQUncp36q9tsItiF/s+UznvE26pFpWEUx1276/3iL1VLtP2qaY6bhAZH5nJO3zx j+rCPIfuutJerRrt7WX6tFisgb8ZQXctm8BK/r9cR9d6/1yuEckVh+9UGhfjp7O9rbQR aN3w== X-Gm-Message-State: AOJu0YyXDS3N8NEPHNLwj7WSdDBxDj+DzBvJG1YPKgsfNekCE6Qi2hE4 PUmg7aW+T8NvtSjwX4va+w0oSbkfPSIv0LvE9Sd/b52b34n/K/TCFK3Kau0zQYY= X-Gm-Gg: ASbGncvHixbfeqRLqsQVb30HRM0OPulPnGEQqPjqzgqKPnP5JLLrmMOlmLZ59DhZXGD pxK6zFpkcsTGCrAOtX3+Wy54gMV/RlIVG1ou3M89ZvzgKsPz/athub9eZkgWCwEn26ldheTL44N pO16GoFaEsaZLf0TmdxDVBza5uyWmIO3uZ5NFna7aB2wDvb90VIScfmki5iDAND1cogW1T8/dQD j4HKLEOrBwcW9apt535W4f2EJ0neLT3Mu+GF40X3RsmzXycT4an2HS/wWjMrJIm2m9SG1kFb7DZ nbyS2vuyHKs9efgCGU8zSXO0dBWfyDZqtG+blEMHeGcD6s8= X-Google-Smtp-Source: AGHT+IGe/EYAehbFZW1N5uJzxV51jiw9QnByjdeY4XcatuqrWKvTSI8sQE9tVva1XKKXYVI0WPGTRQ== X-Received: by 2002:a5d:6d84:0:b0:391:65c:1b05 with SMTP id ffacd0b85a97d-3913aef5f15mr2387373f8f.11.1741470817143; Sat, 08 Mar 2025 13:53:37 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c0195bfsm9841620f8f.48.2025.03.08.13.53.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 38DEF6056D; Sat, 8 Mar 2025 21:53:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Brian Cain , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PULL 17/31] tests/tcg: Suppress compiler false-positive warning on sha1.c Date: Sat, 8 Mar 2025 21:53:12 +0000 Message-Id: <20250308215326.2907828-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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 Message-Id: <20250304222439.2035603-18-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007908 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 17509C28B2F for ; Sat, 8 Mar 2025 22:00:46 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr2Dk-00026V-Gx; Sat, 08 Mar 2025 17:00:36 -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 1tr2DX-0001rX-EL for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:26 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr2DS-0001w1-Nm for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:21 -0500 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-390f5f48eafso1532645f8f.0 for ; Sat, 08 Mar 2025 14:00:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741471216; x=1742076016; 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=XTSEMACn/0c5V64g3syCaGORLmqpk06iMyajsjrmkkM=; b=lDfIzRwgFb6wEVHFhPzssMJk6moPZsFF3BzBQLLXqolmIBrjSksfMJW5Awd0JU5HVl nKCm+fxd95qh01aorjAb2fWSyMRBC4aSw7K0tjcY5LvObNv6u0uWQZK48hFUTqhTKRIO 2yNFSyi371DshywSwu4T3+0XrswGZp1T4xDHAOb/KDSulr2qm+n655Gy4cpeYm8YfqXJ iR3vOm/liQkuQUsZX2yCeUoDYtMYLlXXK1widWgUhgh/BSbdaZwEewq6UVh7uZIVLdYt 5hHDr3t3avEGisu9nZE63D8oLUqGREkyXE0tMzudRKO7EMLo5uHClRcYAw8q2fVaNmTM wg+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741471216; x=1742076016; 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=XTSEMACn/0c5V64g3syCaGORLmqpk06iMyajsjrmkkM=; b=uwjz3SuYZaI1oF7JYT3f8WJaQW654fUT3tmrNGo4RozAaBlTtK3bep5zozIwuZMpKq /uPoGIF4CPjPcBBCNX9XeCIYDEddWnGYdJU9Pmzu4f1c22iqqN0+X65VVDHxdznZoAMq YjcpyQN+BvYv4z2XKY4/ehH8+dxOxeYGcrOMS0/yT5Wf5r5MaJHCQRhgUtpurPV/6rtS ngDVH1z/jQOPhNtKR+4HW6I6P69Gk0YfpbQku7LaaxmbTVIYefPfgJjaXFSUGXWOBPT2 BD/Sd27SZuDjkwxVSsUzRn2nGTJJxTzskW2YnuYAkbH+cP1O5SOiktNsEFHvmA+LfYVy KhOw== X-Gm-Message-State: AOJu0YyLxjTKkT0TNzSdQWf7xxYZDemOu+zuXpMZnkQiVfvhaOiwhAXQ 0JZTOyEjinHPXvLnMoLjLx5CWq2XUBFWayaBDRNJRubnaRxBIQnuVyfs2/QsqNQ= X-Gm-Gg: ASbGncuI9kO1zEZLGVfSMfVFVZHy2xi+DEfejgVIxKK/DN65WaJ6upAvLF6D7J3Jclr 1mFl09LGO+HOOryaWzaYtx92YVDDdcC8lj8+K3sYAOeRxadIPmdHcjW1laJqmzBhY61ws2UsZwH m/U+nB5zH3t5f7BnFFly4VBrxycqA7RTHsyOmQyMob1qfJGalgLm/ZmPNKF/kvyXJC6tAP/xe80 O7TPUwl+e3jSDmCXPhivYN4t6NQBVlDwub29Swz6kD+LO9JvMeSYDS2IaUEJHTDgSjsjo6Ldt9M S4JmP8rmmNOnfiD3AXlyibQWvIF6gKuRsHo8v1H0cXqtcmw= X-Google-Smtp-Source: AGHT+IHYfYjxPrkXuOnOq+vY62bioRZRXxmlVPlDwKoY7XYC+i/711BHt+GUhOYmZzGc9U1Um8XFEg== X-Received: by 2002:a5d:588f:0:b0:391:1806:e23d with SMTP id ffacd0b85a97d-39132d7a3b6mr4613227f8f.6.1741471216368; Sat, 08 Mar 2025 14:00:16 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c0e2bacsm9947154f8f.78.2025.03.08.14.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 14:00:13 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 4FA65606CF; Sat, 8 Mar 2025 21:53:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Richard Henderson , Thomas Huth Subject: [PULL 18/31] gitlab: add a new build_unit job to track build size Date: Sat, 8 Mar 2025 21:53:13 +0000 Message-Id: <20250308215326.2907828-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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. Cc: Pierrick Bouvier Cc: Philippe Mathieu-Daudé Cc: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-19-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007890 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EA6ADC28B28 for ; Sat, 8 Mar 2025 21:55:37 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr27D-0003P5-9h; Sat, 08 Mar 2025 16:53: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 1tr274-0003Jp-MW for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:42 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr272-0000xQ-Tr for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:42 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-438a39e659cso17090645e9.2 for ; Sat, 08 Mar 2025 13:53:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470819; x=1742075619; 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=sIOKeEXB9jLSbKJZtM3r/78Jta+lLdKfVVnoz+aUVcI=; b=vJHzynM4Wt9mz09CIhjpyEGVF3PY7nJ8OMHJMPeoWqxn30wyrZOUf1Gr4gsEy7Kd2r c7RSrhzeSMDD2SBdSdeeWoLnGVTq0WONhKT8c50LEEctdJTMuP+gzXfNsOGYuZhEahqa zoVGEKiyjz9hjr99ELS95KQVqLNwwkr85e1RmBqq0q1R2yGLA+qcMtHGlmx0zP/k+CAF Toi13CU1F3Eg38WACuxQXxFVbYJs5yWO/ACYJsSsvsJu9ElZ7W6mxwnW5BjwSLP+EpKh ygOsp6ko/MEFF8C5v7TPjv0/BgHExYoV1ocf0fjZrd3vh/sajsMoLVghqhACNmClARn2 bZsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470819; x=1742075619; 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=sIOKeEXB9jLSbKJZtM3r/78Jta+lLdKfVVnoz+aUVcI=; b=nO4AeHqiI3swuB/iKJ/yhO+PwJkHxgegnamkf6ksJgU/tl+I77decmxtTdivNefoMW AAdOtcwFGHxkOhg+0V9Ig1cOWqc5qGo0EFsHy3aW9ERhrV1h6bugMRa2RAAH3xAQOcgL 7sT2E8NBrbBnXtE8isRH9wQq+b+Lh2kOhm2aJNqlRnXYe3HdPSHvG0SKrJSvXJG3vI1N SXQKcjtKZFyqLS5sfGbiKRaW+cQGZOvOfIcFggD6JKsDv/emZFhj6hOs65I6Fn1F8m+6 G1clSq+1uZojUZntqHVuRaARP1AypeQrWdSAXxntdg0YTScAZPKEEIFhnMRDd7dSuDlg JRiQ== X-Gm-Message-State: AOJu0YwWRbHxZfZn0W6LuFm3DIwE8Hw9I42YryiG32uqZYo85coL1FMR PKvj9l9TfuvwFPmmN2+XU9t7rtM8Owb6mgiSKFzooAE6SY/4Q7Wnqkv5erUfpDE= X-Gm-Gg: ASbGncuHtsnYWr9TX+pTieP73KgatayYEDnXmMGDv6x/U+IC2eE7//6CwmHBbW7kY4O a88uZqL+6hCuLAN9ls+biy5epswWC4EboDM+xRYRRfJrRiclTIqPl7Q0Nbtw1H1bX9nTlSQj4HM LB4M3GmRNFX8ClIbmNfLvCZnwDzJsChSlH9Z4TZjm9tv4dTGPlLYcXEcWHB13Fgk2Ro6nF43sTK /As5OvLGKwE3g4Z+FLXbawK2JCaKZ2Oh/uvUG3AyjgINJqH8JufHSGsrwwJbiZt88uWPaDpHMOZ SzGe7LZWNyiYun6BkjJCoDYKJuqZpEXdKna7MD4ypvsc81A= X-Google-Smtp-Source: AGHT+IHlw+3j03s6tCmHUCGygGSDUHvowGx/md8cQs48415TYtZmNj5ic6TBpxr0kT1/ooyeejq5mQ== X-Received: by 2002:a05:600c:4ece:b0:43b:c962:ad09 with SMTP id 5b1f17b1804b1-43ce246ffe1mr28775105e9.1.1741470818908; Sat, 08 Mar 2025 13:53:38 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd42c55f2sm125755895e9.20.2025.03.08.13.53.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 678585FA87; Sat, 8 Mar 2025 21:53:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 19/31] tests/functional: add boot error detection for RME tests Date: Sat, 8 Mar 2025 21:53:14 +0000 Message-Id: <20250308215326.2907828-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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 Message-Id: <20250304222439.2035603-20-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007912 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 30871C28B28 for ; Sat, 8 Mar 2025 22:01:00 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr2Dg-0001yi-PR; Sat, 08 Mar 2025 17:00:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr2DX-0001r6-3x for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:23 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr2DR-0001vq-Fc for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:20 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-39140bd6317so250954f8f.1 for ; Sat, 08 Mar 2025 14:00:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741471216; x=1742076016; 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=x+gu5ogQAWZshVelvD/gHWlmrGalgc39BzbRjaxXUb0=; b=P1x2MFOyZHITd0VCFyOsO9hvXA9/PyN/+0E5YwiyEYg0Ha+PwAxDqE4IcaqWrP7yCh Xv7Si4VSIByDM4lGu5nbRCBRB8+97OMXBBSAJvE/+icFMsgB4H1FG1Z6rqGwXOrk1+na cM8Y9k8Lt3UW3YI9Eo31n23JoUWOpP1jshr6aCmu1+FaDbVWD+8lDeiZUXlshE6QQksD o2jGPtMWapuZVOBRtp8YjKAuQLBWlZ//bhc1MB3196HlvGXuQcxAKYr0a4SU/gdk21tL GCRicVLBrbG7SxeKBzjqoV5XX+ISGerFX9YbCbxSUnJjeygkseqcJeHnMblMteSZzC15 sgDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741471216; x=1742076016; 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=x+gu5ogQAWZshVelvD/gHWlmrGalgc39BzbRjaxXUb0=; b=sMUwHNJ/rxwiU9mp4AXfHDLeMyCO1wKpmD/zuSwKKFnn30GQwgVyFcTA9VHzgqUAeY yKwKVXG7m4FTyeOVnLKqVUVg5sr2Gk0Fi19R9fheGmiERErExIjOpVeJoxXMyXMOzn2y SIG+vJFUBsrgOYNcySNL3SAZd3HysiVD3MX1neGbbNegRU+Bzm3+WR4KbOavmUUxiSY8 sFSpH/LG2Vpp2gTwAqk9OGPvXeGCZ/f1E+6I2WYS8A1FwExlWfa00hOp3ZhfuHiRluyM eUl+q8czjhoaANxEXR/1+9veN46OmYGZ8oWu9+4Uw+ZE8UNnrxdlrLC4MpOhkcnE/m+S X23A== X-Gm-Message-State: AOJu0YxKVPXLjqnhfBY67F0pcPyFjcLJL6yYIVNv1FrlO9Xvlm18f4dT qLcIQD8ACwCE7wTJGZpgy3SXnEu9Y0Jo4gQ0n4A88+Kj4qNWp4QvL8Ngph7GiqqVPw2y+zu9CL6 A X-Gm-Gg: ASbGnct8L+4ph2e02V8kcgb2NWqs2Y75X0+jnwW6NyW65MFSNR1txNke3K+RwDG/0CC OBp01KDML6SAC0Oa+Y4fO+k4B4l6GzS4X9k0LiRVtS7mehBzM1ODTDfKkP0GkVaQ42EFm1R7JG8 4cvplbBsOtSlKT2kdjWcrHyVQYbCwR6Z0vWg6Emg2W6hB5+DG74p5NXL1Pi4PWTAUnGJZcrn3T2 jgaRs5QbrzS/ivSJck8BTtsBrVAEf8lBVxKlzj0t3/Zx0wjWBcwuTxZokzCWGiqKnCf0Mcva0lP 7q0xqeQGAB3ZhH1Yfwdl8xm/Q4BJgiUgjmbeeILj71VeUJjxIKkcivHjLA== X-Google-Smtp-Source: AGHT+IG2jiOEDPTqG92RfaD0GuU7iKgu8zQm+OOJ06p9UHWth5XrxWcyckO/i/rKBwPKPjw4f8WiPA== X-Received: by 2002:a5d:6d8c:0:b0:390:e48a:3869 with SMTP id ffacd0b85a97d-39132d774a1mr5083686f8f.11.1741471215662; Sat, 08 Mar 2025 14:00:15 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c01de21sm10091320f8f.59.2025.03.08.14.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 14:00:13 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 7ED3A606D9; Sat, 8 Mar 2025 21:53:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , Richard Henderson , Alexandre Iooss , Mahmoud Mandour , Pierrick Bouvier , Brian Cain Subject: [PULL 20/31] plugins/api: use qemu_target_page_mask() to get value Date: Sat, 8 Mar 2025 21:53:15 +0000 Message-Id: <20250308215326.2907828-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-21-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007929 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 83609C282EC for ; Sat, 8 Mar 2025 22:01:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr2Dm-00029g-5K; Sat, 08 Mar 2025 17:00:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr2DT-0001hW-61 for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:23 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr2DQ-0001vi-1G for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:17 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4394036c0efso16795995e9.2 for ; Sat, 08 Mar 2025 14:00:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741471214; x=1742076014; 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=b27xhBD0ksksCzDRiT3v7v4kY1rR1YfNmNHzo2TcGOY=; b=dkuSGDekNQe3NdGCIhoIQ6bRS4vVNmEo2bBKYl1H91cUNZN5lOKJxnLX/bAnNvh7bW kEUZZP0vuPui3DoNkFGo9WVa8dGDyxMB59mANkVu16QAj5yKj9M/CE47vHk9Or3UKwd4 lLQy9WW8kEOnQLMFvvGUHUdcEWC6kzs20sHafn5qt+lUnRYvadbQS4hGF8bLEOZNUfRc 18BG5EHDwf46W2a5eb/ak6l5VnhZX+3oitB44xs3bDprjLoNGErN4BudnyJVuwYSR8L4 4Lb/vd/EJsl8iqN/Q3gn8+XUiC7EYNOCoOZTYNIhnmY7rzLfGMA0UBRwZRGTAwFT71RE lYZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741471214; x=1742076014; 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=b27xhBD0ksksCzDRiT3v7v4kY1rR1YfNmNHzo2TcGOY=; b=i3W+K/LR0/KiGWo0Zo7Xm06kWgj2t38HNVXXXV0W0jGx6ZS7MQzeEILo2ATum1X9oh 3y0o2tf2uwCbanxgLEYkvAXqCVaiQzgBtpooRXMSJG3HOkAimry1PyXzhE1qLuE9Sjco bbsle7L2g8ITt14a/kzaVRJMcJG0+olvS6WxoMNNALkMJEi/JrJ+5YVX1rdGatz3UIaA LGvROphdh5GtK3SK4WzJVlhySmauDG9x2GO0juOT0p5CYF+fJK+0lOg27DUxP5uOKesG 21xWYxATHHmRRFss4thOWdM+aWwjQaV9g3G9xxPGf/rZzsa/QvBvgGR6r0RANEpIv7K3 UmQA== X-Gm-Message-State: AOJu0YwOG0Bfq8OeavcYhppcpK11L7br4K45nX1ne9DOUoXwE12jAJhD ed+vbYAMwazRXMKH8ePIPbo5ccsqHuTNVE1WUQHJAFL+gY27z288L/FbJMu2yxw= X-Gm-Gg: ASbGnctHIEN7uKAM4SonIq9D2UnZe0RX1NzIW7NkTe48b/k4bDqUzEaiFiQuMtT4qN+ BDZySpfGc6MO5TomvwmQpfXKCeUGJ/vpzUbR0hA9Hx+ZiZsyvmwdoLlcPztp0d9YeYrgtlc93L0 vU9+UzR2+abLrvI52xuTfT9oGd7OnxntqPW8QnGQjVS1z/crfa8DEZ1SInRRn1iUAuC+ujw6jDJ 9LEKyjj6xoz+8UYMxMwUnO5mgtVG5qN+x/VPo+3bZrDNN4hcGCrno3hRJDA//p9enjhzXlSFPB6 8X+QqY2cYuyuuRuy/Zvf8sU/f4nvFOZwfVpRAxiOnbsrIwU= X-Google-Smtp-Source: AGHT+IGMAcPkKhISvEWjOOWBNpMuBc/yEBkdF+cEJsJ2YvwTWCOQlk2uDA7ZXUtWyE0XHoDHKvHIlQ== X-Received: by 2002:a7b:ca4c:0:b0:43c:eb00:50eb with SMTP id 5b1f17b1804b1-43ceb0054a9mr19550155e9.5.1741471214460; Sat, 08 Mar 2025 14:00:14 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfb79b9sm9804987f8f.3.2025.03.08.14.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 14:00:13 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 931D460794; Sat, 8 Mar 2025 21:53:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Alexandre Iooss , Mahmoud Mandour , Pierrick Bouvier Subject: [PULL 21/31] plugins/loader: populate target_name with target_name() Date: Sat, 8 Mar 2025 21:53:16 +0000 Message-Id: <20250308215326.2907828-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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: <20250304222439.2035603-22-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007930 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CAD2EC28B28 for ; Sat, 8 Mar 2025 22:02:09 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr2Di-000239-Dp; Sat, 08 Mar 2025 17:00:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr2DX-0001rW-9S for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:24 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr2DT-0001wD-M3 for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:21 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-43bdf0cbb6bso16879845e9.1 for ; Sat, 08 Mar 2025 14:00:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741471218; x=1742076018; 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=d1ycO4lAb6M0knljUEP2EqCvsgM+Qn8R4EP0BEZ8fo0=; b=fn7gWa2J8hKJ7AqNjvx9IvfBT6PQJPf1ZmQpGj9t0S9+RkvcZp6OrpVBpDsY55Pj3Y gnzQhP/2AosQrPH4FjHED7fmOXRhc7auFZowkwoo51DisXQWk4Oggq52EMqJYHP54fMc rYvH0cEILnrZmzrKRwVwC31gj1qQv4dlsV1hlDlwcxu0hKlNxlKHW0Bb73IpFWFmLlqh lgSYM8BnrwFoEVS57+QUUpVazpPEe+wJa/d7hfaJgRk2QP2oIBCPDuNitQD/q+o0TAIm fGOgBznLeB+Q679UyqhkdLin+E/XFH5CB52kDiN7/8pDs3flNVvbx2QTuzUXjxaWCaro ABZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741471218; x=1742076018; 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=d1ycO4lAb6M0knljUEP2EqCvsgM+Qn8R4EP0BEZ8fo0=; b=hCKXjIhqC6AICKW8PNakbt6VbjLpkbhb0eesTXtrq5VjuyD4WMP8M3bXHL5CfTwsSs dCrbtqcyJ9UShOAlu64QXFujZ0RgIudw/JFhQTjX7qI0FurKNgneP9xriQRJQlV0zp0v oC7uqwoXx3I+Xx3Rpid5Uj8EAIxd9DL9uksTUEGEcaaUUBdUY5JB7WDhlq63i0OS+Qqc P4D+hvqax77HUSRKeSR6gt8aMnaPG4YmfX/8SxD6w9Mb//xXw4zaWIaVzc+WwWKScSuw hH4epdh7FQ7pS9LPgeV9Nz/kRIockGT4hRUSvA1zBJyV7mDupmlotmt/hVOZSkldh77J 4Bvg== X-Gm-Message-State: AOJu0YygZAAbmzJpGAhThWVvnxBcIRlZ3hx2i2nPTY2Prng5Ahd6EN4O XSAYpBQAWz3Mndc5LUtnzInzjgHYC07fC7rEOUGF+qDH0UMuDpbPwChuASsLdTpRQyeq4ZlLXTO P X-Gm-Gg: ASbGnctbg5yghEFz3/FaCW1oiVGSmBx932EoJoSnql58HGUrb99WEoj4XLAbixgNf/3 hpfmSv8Ick7VobYdl4spK8QjLuQNh4q+WHeuOH+ctVAQaO+VQLc+4GvQllLlUhiXlwz/NxY5NMr NLNgdQDe/PDZdFo73E6mPqw/APCUUM85SieuzeYZmRnZR9P69KP2b+R8qi97q3oxOcj+WgDxasu d38wgSyN9ZMtCYu8sBs1YgG29DoJ8EDofjz0V8n44Je4ZE04l3JujHp4GOHWe4PPrzLbu7eh3su lnhhqDxcnN01y7kh0KLwnEo5tUvbY9rWDFszr5zsdM4hjQM= X-Google-Smtp-Source: AGHT+IEWGbSKTyr4nGf6rtYMK/Q5/btvlXaBvHneeJwVhrVkz9W5md5HIuUas+gcUv+7nogeh2DroQ== X-Received: by 2002:a5d:5f93:0:b0:38f:37f3:5ca9 with SMTP id ffacd0b85a97d-39132dd9435mr5547955f8f.50.1741471217944; Sat, 08 Mar 2025 14:00:17 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bdd8c3d61sm93478095e9.15.2025.03.08.14.00.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 14:00:16 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A71585FA77; Sat, 8 Mar 2025 21:53:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Subject: [PULL 22/31] include/qemu: plugin-memory.h doesn't need cpu-defs.h Date: Sat, 8 Mar 2025 21:53:17 +0000 Message-Id: <20250308215326.2907828-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org hwaddr is a fixed size on all builds. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-23-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007909 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 749FAC28B28 for ; Sat, 8 Mar 2025 22:00:46 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr2Dk-00027H-Pd; Sat, 08 Mar 2025 17:00:36 -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 1tr2DW-0001qk-Ut for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:23 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr2DS-0001w4-ON for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:20 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43ce71582e9so3960925e9.1 for ; Sat, 08 Mar 2025 14:00:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741471217; x=1742076017; 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=44/LDZlqaEganREVnKWvgKaapu9QDS5IWFeFvuBpP6I=; b=OCacKSfw+iX5Zm6aXTnQopxPEKVdTqXPdL8hyhNAJUQVDsuvxeLNjjzfDMcR9Zn20y uEzyJ6ziLytDWaWODL4ObGC6rPQ6PoFSrOQLZYG/BUPlD/aZ7xtkgp6bYpLyy8u0ZUS+ kkUL32pCW18pT4ykeajqSNZbCI/m5QAuCkaKZgNAvVrWXe6HZkRZ8WXdfdHda7kXMvaN ggSA8HnYqZO/IiW+Xe6hH1OLGTMpxv0x3BYs6YtMva02I2RlCoHl8l8BGrBBaGrrgEbe cvG0Y+O4Ac6UsaKIIXxeeoajOjgfFxyksmSsIHSbkkLG1YR0lzJsRGGz5Lt8++SKUwhy bJVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741471217; x=1742076017; 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=44/LDZlqaEganREVnKWvgKaapu9QDS5IWFeFvuBpP6I=; b=E0CnJpkd6yjq8eu4dM4xAsuAT/zz7BjK5osgP4TtjI896cRQfHVYqUdFwv6vicJ1yo vICz/c5N161PCCJ0XUBznOntuiAyxcffY5zgcuVdQiMwxL9CNFADOV9FP/Cbrq5ajEwK JlZrzHot47ro6RkMwfr5d6RipAUWAv+hGu3NOMsMl35FOvj9EMWP76KBT0CUlIVBkrci UaEpco5QpDMK2t2y3Hdn8QqqdOTomS3rUwXtAm/JIl0mHc8S1FcWC12h7dUnWdUz2lXf LjZGUrjq97s9XlZ1TEDpCTNB/FjvfKgQy8KE7IR0zpuQL0O7JJnLBncuH1+Iya9LpK6V jVKg== X-Gm-Message-State: AOJu0YyPgd4/6pc4uxijU8U/hTDa4QR1q/KN3uZdYwLlUgmvFy4Rqlwj VPLfVNgPIFiGBOgaoOBczivf7GS61vrakty2FLhDr54yx+Q8ctdiq/CouLMLW7U= X-Gm-Gg: ASbGncutT78yJUAm+dCXYqlXhqt1zJcieEVu6fdWdh+6Q02lJbQybBu4xDxICh83txU 9HQPj8WWgE0m7BRGccNTdXuOwiAY7VoihtubA68+9oExjlqW4SU0zpxl0W1AxwfLkGwTVaRZpgG uJsS3vfeoy9KRwIcaGJ6G6l+xqPPp4N5drAU/DnvrMzh0fJlaJIeaLd6M+XOCFbUTRKF3VDeggv R4pgq8gPN72wG9jzc1QYVBGpZNdAFCA08L6g+HWATynHJvRADzy7SSu60XwdKO2cmr89mNHiGsn YWMXJcVsMaCHIZFVseAL16L22iA+UPh/HuCONjP14v+M0Ok= X-Google-Smtp-Source: AGHT+IHY4KbNV0oWN4QAmmwZKzkLvv50s2QVCLl2fmGRRAUVFBZfHnpWdd2obinCEp/mrLqC/haKAQ== X-Received: by 2002:a5d:588f:0:b0:390:f394:6274 with SMTP id ffacd0b85a97d-39132da9214mr5278193f8f.52.1741471216842; Sat, 08 Mar 2025 14:00:16 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfb7928sm9907940f8f.1.2025.03.08.14.00.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 14:00:14 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id BC0D86086F; Sat, 8 Mar 2025 21:53:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Alexandre Iooss , Mahmoud Mandour , Pierrick Bouvier Subject: [PULL 23/31] plugins/api: clean-up the includes Date: Sat, 8 Mar 2025 21:53:18 +0000 Message-Id: <20250308215326.2907828-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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: <20250304222439.2035603-24-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007931 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DE404C282EC for ; Sat, 8 Mar 2025 22:02:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr2Di-00023B-Cy; Sat, 08 Mar 2025 17:00:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr2DY-0001sR-OI for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:27 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr2DV-0001wL-HW for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:24 -0500 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-391342fc148so1067856f8f.2 for ; Sat, 08 Mar 2025 14:00:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741471218; x=1742076018; 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=FqDlQYCqhupxKJJPtcmqNG7tXptPuoxq/pLFDrIkSjc=; b=l/ST9DRuVinHqEM8YlAXpndo0+z4kzxiBICn6LvwuXFZ/6DiFS66NknhHbroqB1342 7yMpt7A3xpRj9A7zqRdvi0Vwik7h8yzaHKS5h210fbeOQkZttSVtT0Cp3NSr/SusOJsB kzqu7MxFZJcTwtA6xRYb5w5rQWhA7ysDn03UUSBPcVDJudaNzq8+XCO9DLjTV671lElZ +YX/h8Sh6t+KpoJFGh3J8XhNXTyzIsuJM6cj6Es6AiUIA53n/3GMFGoD7aQJvzk3NNHg rrAUiR2w4aLix6Mvn1m9GOhwe4nYDJObDYAQWWysA+8lWNskzm/rucYPZRU3v8YrBEKL Z3Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741471218; x=1742076018; 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=FqDlQYCqhupxKJJPtcmqNG7tXptPuoxq/pLFDrIkSjc=; b=B+elSzM60gTN3SW3gqvJQepHV6Ey6eaWi4X6tqhPanc2GNhNtUd6cTny0Er/jk5pl+ FJrysKerGz8mkZXbZ12NCAsri8FM5FxujyGng92KAJnDSsY1PDt/x+F207IzARGA84rl SILQZMIgzrrtlyv0mSz0qN0lI4TH3I225ktC0pd9BlPgxq+lh5BQCdFz0DzAMLrCgCXM KeO6gYI0QbN1zRZb1Ye6C3xbnSwlOhygW8PQQGAONdL88EVe7OJppxjW9qjyFlV7ntI7 XRV/FJpT9UilwoK2ggPXfyVkIhPMXWT/z33F3+VKk5vDF3ZpK1qpTdchxkDpXPHU00DB tZnA== X-Gm-Message-State: AOJu0YzZ+7g9IGUcuyBUcdJGbtn+MzSBlqcOFT8GFrLpd9tXr59PlNT0 45inG7vzlNpJfsqkwt7rhERcrPhd8KfZobmnS4Q/5Uqr98/7uqpOkMHoQ/slnsc= X-Gm-Gg: ASbGnctv+6bZzBQXQoyexgu5vXKEMBRhp/GThDK+WEw8rHPUetE24XVEpUnZvcMIM32 I1OkCBxa1OuLX1nDuFS0dnySX6EVX54AmFcyCimQ7Xm8lfksrAXfgPpRjEHgXgsLzj7dIGg6Y79 0aJEvo8lWlQvNuknz5go7USI99NCAMV9xQbWbP6o3Rln61XJXaueo0cU6Q37dLvBzih6NW2WTGe qP6hq5yNrsIvh/VzaxG+BIyMhHWq4lz2lvcRhtea/8O8+fPqEoaS6UKG6vp1bb+95R6n5ojGSoJ /qldIwUDUemb9w1RUujRtV2aaDCGiGvlHcTVHig5m5+xvu0= X-Google-Smtp-Source: AGHT+IE70r5QY9IFyqqk61IGscweum2nEyZO7A5L9TobNUdGg0aI6AE6Pu2EUwh/xg3F4acLeo+LzQ== X-Received: by 2002:a5d:5f89:0:b0:390:f9d0:5e3 with SMTP id ffacd0b85a97d-39132d671b9mr4912145f8f.1.1741471218410; Sat, 08 Mar 2025 14:00:18 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfdfbb4sm10130791f8f.30.2025.03.08.14.00.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 14:00:16 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D0B6F60925; Sat, 8 Mar 2025 21:53:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Alexandre Iooss , Mahmoud Mandour , Pierrick Bouvier Subject: [PULL 24/31] plugins/plugin.h: include queue.h Date: Sat, 8 Mar 2025 21:53:19 +0000 Message-Id: <20250308215326.2907828-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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: <20250304222439.2035603-25-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007907 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5382FC282EC for ; Sat, 8 Mar 2025 22:00:45 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr2Dh-00021Q-Mo; Sat, 08 Mar 2025 17:00:33 -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 1tr2DX-0001rZ-GZ for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:26 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr2DT-0001w9-LV for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:21 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43cef0f03cfso1458115e9.3 for ; Sat, 08 Mar 2025 14:00:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741471217; x=1742076017; 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=kHPgkE2VKXbWtAo5xz8P5MmrKJsVMZHVheDnuaENWnM=; b=dwLvrLRskLN8WDa6M/mroDakCXr+g4XTcZmNHtHLDkRpt9UlpaQ0HskQ04F4oXVLly E6PsB2ggcbSgmdlGnumS+FTBYzb6/elWxTkTmBfnsegCwUmeQ2NkYefbxeGRr1WHz3HR L7YxxwtLDDZsHk1fseS38e5MWE+HBhKoPkQj9KNYeDB2pbIOqLNlNeScvPp1VT7dYPer tYAXPb0TtdVjsQR1Nuowb7p4tghIJ6efeycGPNzc3bhRKtiaB49VziG/7QgbXschdD4D Yl5ptPsCCE7Vff0GU7Weaiovp5++LTn/WVFN2ncbukAcdlUX8J498GdW8MvimumTRcZB +SZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741471217; x=1742076017; 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=kHPgkE2VKXbWtAo5xz8P5MmrKJsVMZHVheDnuaENWnM=; b=gA1RQmLqFh/tBqJF0I9LL99Z1qMLpWKRiTXjAy6YvNzEG3A2M1OxoFojHoqtGlaBKk W1uW29yYnJb4ApKSbhG7Sqe9noC/T5GmvSTPnUfpnQjKy2pbZgu9gbSTZL+IIMYCJUw+ zpKEb+RCYfrX111vI8SQs7rxftTBKLucl9Oij1S8xO3IJ5I6AawQWeYqvSBjubr3eurE fcDYLNTEYC2lt2LD9gSdFeOFmf1qyABjvreEr34Rd9Hj07Gquog7Z3PIw3ia1gnyKOC9 c0vUhLImzDdoZ/qpi9DXwS61MjGfCyR9/7WHBlcIJmUc53hr8/8QjymfTe6IiAIZlxiA F9jQ== X-Gm-Message-State: AOJu0Yz/I212uFxHTdp6WT/nqEGtnIw18fqVEn5oNsqDsyMinpEcQH0m jhdvcxJgruxMTlc+wskhNE2WCUUS+Mxq0XjcLCrddI2FNJkPYSxiAR7B6CKXsVI9ZW2kcb6+Qky K X-Gm-Gg: ASbGncsIz7dCd3HF+H7FtJiJxROFSknrjrU8vrX/vyWmyNS9x9HCO7+2bQ+8iYvUYvm HTi2vMSLMWrwvnrCbvZMaUSeGqFnYK3YqrNiUN/llUJj8gAS/EhQ5Hu1yzPcinNYW90f2r9C5lp 0rMXtkVcDI3TJFyPA++dTCNt8mVwVvXVHNdkBMsNh1I2jqfHRbfJ33bi+/ag/5hGE8ACse1dTCn b1Xjk0yOsTvvrPYu6yElWPj6Q7I0JnsLo7siIAuzYTbyF4ExdKvKvIsp5tumbOLJEMJVep7cwWS TJdqBeLG6S/f8Sy8UyqBEinI8of1CU7eI8nqum3I1fdKlDw= X-Google-Smtp-Source: AGHT+IH2QYaq1dOEcUUCD645qS8VQpK3XpFcTekjvlXghjqqhWQxYwuF7K/nQlZ+3hggOuyvnqEV0g== X-Received: by 2002:a05:600c:3b92:b0:43b:c7ad:55c2 with SMTP id 5b1f17b1804b1-43c5a5e9853mr49580275e9.6.1741471217377; Sat, 08 Mar 2025 14:00:17 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bdd948c1bsm94024045e9.36.2025.03.08.14.00.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 14:00:16 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id EA2D560B06; Sat, 8 Mar 2025 21:53:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Alexandre Iooss , Mahmoud Mandour , Pierrick Bouvier Subject: [PULL 25/31] plugins/loader: compile loader only once Date: Sat, 8 Mar 2025 21:53:20 +0000 Message-Id: <20250308215326.2907828-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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: <20250304222439.2035603-26-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007893 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E1745C28B28 for ; Sat, 8 Mar 2025 21:56:03 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr276-0003LN-Fj; Sat, 08 Mar 2025 16:53:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr275-0003KV-EL for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:43 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr273-0000xb-7z for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:43 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4394036c0efso16783935e9.2 for ; Sat, 08 Mar 2025 13:53:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470819; x=1742075619; 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=AgXwB/ncZFy5BnYBAj8eMjbITTEJZxceGTFwM5B/TMg=; b=g029L4d+2UZY9KtAaMV8W7d/EDjyk7kbcKnzuJ4tknl/gSJcXmLLdykcC0fsMI5kls uxg3+A5zNwM+i4gXH5qgXfbwBCgrLwKE9mqZZ6MrSVU4XeO0WQa+L3ce31IbuYJqgFj/ 2+1UA0ijaGAnR4+vb8lFbtqB5yY14x26cAIFYKyCM1SlXqH5dZG77glJAr8M6RxIl2y0 zhhRBTXG8rEOF6ez1cp/5n58/2BDyDVleTuYMu+PneUI5usBFZV5SS7cmZhVnsg3kDfJ Xt/r4CFlrRmqRTv1MF5BXt0dDYhFRHNZFH+eFh2OG2hxS7OzzLN7KRODsefhRrTH0eLq 2g+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470819; x=1742075619; 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=AgXwB/ncZFy5BnYBAj8eMjbITTEJZxceGTFwM5B/TMg=; b=biAx7PGcwy39zfF0xO5EOePcD9b/guXqOJpthmxm23OSVvYGMy15IbjDOLwJlovSIN aoI6mv5fI2zkERJgBfLZ54hHQN291k+tU2kMT+ViTzHfdAWNbn95jD69Ji8B66W9i5LZ VQcr/NGYa/hy6bkusPBRNaOlOmUxMqoi3ZEG/9BXgGSxALspBJGj6wlBXmmsI+XwJffz lanctCnVNXcjIMFcybRiE1unEGHoezIYCyjCxNFMoHxfZKEq3HECsb8/BH6+RuvQBE5c v3GADvYMqX0gCEiuiVuPyMtU9ZViMbIrtS0KQRa1oQdjW4xVWoVymFIbT/1BraIAR850 L1aA== X-Gm-Message-State: AOJu0YzcP8X0cu67MacEJTWF+0xt/20VSVUfjb7mW2q1gpYnSXJIpdPC BwpME22v1/lsYDvHUMyxgJuCV+1kxM1sSSeR634gFctJqjoOFjx1j6e/OOIPv38= X-Gm-Gg: ASbGncvDmmT35Q5M23kYUpFV/+Eup60oP+aNIYGz5pScV3/9smueAa33jyeyVedK0wj OKGMDppHTbTs9E3RUeVrfInD9NPPh8KURD5avLlqX8Bt6/5zVWyaYCLnKRr6iU08BL7y0FX/lOJ IWpIrwyTONHt5FsPo5whtUPP0nWlLPoCbDkbf2v3RWPUkMARwN6UoI1emsNa1gas/r1s//ZkMV2 tkmDeszqfQ55rUqyq+3V5ARnnuYhE4nGx3OiH6+eqOaGxHn558Njn+yhspNU30imZkgim6kLQxw 4Lkp0IbwGMP0VBfqnbgilcTlrISlL2TDCjPqnMdzMBVb+lkVJe3gAMUn3g== X-Google-Smtp-Source: AGHT+IGsUgTZxJk4dzlNb6PlVZeRP0MST9oIxmEaajIFgEALrxCI10EXzFuJiqwK7C5+mfmHoDP1zQ== X-Received: by 2002:a05:600c:470c:b0:43c:f050:fed3 with SMTP id 5b1f17b1804b1-43cf051022dmr4181225e9.11.1741470819381; Sat, 08 Mar 2025 13:53:39 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bdd8da097sm97965175e9.17.2025.03.08.13.53.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:35 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1725C60B0B; Sat, 8 Mar 2025 21:53:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Warner Losh , Kyle Evans , Riku Voipio , Laurent Vivier , Alexandre Iooss , Mahmoud Mandour , Pierrick Bouvier Subject: [PULL 26/31] plugins/api: split out binary path/start/end/entry code Date: Sat, 8 Mar 2025 21:53:21 +0000 Message-Id: <20250308215326.2907828-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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. Reviewed-by: Richard Henderson Reviewed-by: Warner Losh Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-27-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007910 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BDBBFC282EC for ; Sat, 8 Mar 2025 22:00:54 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr2Dd-0001uW-V2; Sat, 08 Mar 2025 17:00:30 -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 1tr2DT-0001hN-17 for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:22 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr2DP-0001vg-I7 for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:17 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-43cf034d4abso1478695e9.3 for ; Sat, 08 Mar 2025 14:00:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741471214; x=1742076014; 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=n+NSju37Mir16Ju7IGTAiExpj2eXU+4Tqger0eVMhLE=; b=YnrZpC72XCJ9LMNV6NQGzTwt+z/nne6m35Gv9FZB8WJtf4xKs8kAcKDfHE/SJn+elO J/FMam6FFdGCWxlIsHfa9B7FH0sOHvAbmqBLzy7pdwQIjs/TfZh/4rBVqsnIQoL86RRx vBQKGU26exN3YQesnfc1JAmbuLzWzka2Pt7g9EjUaWUp4UP97bbwi8QoV8FHx3o5v+R3 /ueXX/Li+U6gR7eOWv16Xl1nKd0AMKohGsHazXVULaiwlpUfJqrmI1Dp3ZDN+rcQNAuB RZDp82Md/IW/C2RvvQIT4c6AwmvArGp0AFVqhhz/ThEw7obRa8ORJ2/JKldeR6gf/v1D Fi7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741471214; x=1742076014; 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=n+NSju37Mir16Ju7IGTAiExpj2eXU+4Tqger0eVMhLE=; b=vtagZavzjDnUcl9G9UKLNLO/UtzcFs+7Emv0Og2ZYFXNDi6ePRC2G41BFIbhZ83Dhm N1ppcgTi2o8fh2eL0ZPjrnNUsXY4vTHcWlkOp3XxqBY+b+sx++ZLacqWDI/6tC3Pzu4J Y1jaaZXXjD4s12AE1FRuGumzOcOgPbquqRKnrw0jE6vdrepNf67IYdAr3XtKopl27VOE 3LTSSKo1Ipp7YMJCR3+Wf8p5R8eCzkG0pcY50SuwBWl//gHLXDxruf8y8IWAvzR1GcMB VNlAXG2la9RELd95fmReTfR8poUuQcGr11zCRLrpSWsllXdbF8+PaPDiW2aRBFuPvec9 WlyA== X-Gm-Message-State: AOJu0YyS4AzB97qIvbVSXipKjlVYHbA0tH2V50wZ/uizyfg6DaWakfaf +u/NM9Kd+rH+38dXCQG0D3MD2GLrdotO3RDYBUcTvNmFsrpqH6fp2Ga54rRB6jU= X-Gm-Gg: ASbGncu3AAkSX1//pYx/Ffx2rpE71gXhB+HtDxjSJfudlGdURhoTwikI3oQ3SFMdG2B 1KGYO0m71USng5U48O5iJgtYTwKsyXmi75f18gEZUD4inTJZcdGf8pD5icSCEEOtIKz59bRmIWd OOcym8vHMTnfJ0aehENd6cPrKc0OJBb4fxyRNle5R6uayzgTt+RjDQQ2mLK7C1hj6CpCS/VuXnp oGgoZG7WLD0xXlmS8OFWTew9qr/QyPYNsA3bUWO6dT2ZyP4LaTuvFlXvdiZcEGPNg4Ju0EKGRh5 xLcnkowtDgg4v0FNi0hHjRoCvwC+0TwtL6/DkeA2mknpxj8= X-Google-Smtp-Source: AGHT+IG/mrJ3oy7fK0fRnl3vIQ1QHj3IKbtEApNguGBupGuN+f1J3bZwZyPvm1gRYAM4hHJ1+VeO2A== X-Received: by 2002:a05:600c:4f91:b0:439:a1b8:a246 with SMTP id 5b1f17b1804b1-43c5cb68df2mr51710725e9.8.1741471213670; Sat, 08 Mar 2025 14:00:13 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bcc13b23asm98962325e9.1.2025.03.08.14.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 14:00:13 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 3472B60B21; Sat, 8 Mar 2025 21:53:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Alexandre Iooss , Mahmoud Mandour , Pierrick Bouvier Subject: [PULL 27/31] plugins/api: split out the vaddr/hwaddr helpers Date: Sat, 8 Mar 2025 21:53:22 +0000 Message-Id: <20250308215326.2907828-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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: <20250304222439.2035603-28-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007911 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 393E7C282EC for ; Sat, 8 Mar 2025 22:00:57 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr2Dg-0001yV-PX; Sat, 08 Mar 2025 17:00:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tr2DT-0001iW-VD for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:23 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr2DQ-0001vm-T6 for qemu-devel@nongnu.org; Sat, 08 Mar 2025 17:00:18 -0500 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-39143200ddaso58247f8f.1 for ; Sat, 08 Mar 2025 14:00:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741471215; x=1742076015; 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=XfKDPE2ADf1xfgVapevP6D/Chiq1U5Ky1BisB2XM/tE=; b=OQSnbxpaNo6dRTk/d+HMm0GFcFPi+2ETWDCXKoUNhpVjVrfK3tMCMi1pMsCmXqfSiz AIJsGIpy9rEiQwziJzNF9DYBwL1X9nE0ourrmE3x80vn2ynfVQPWZHGJFSBs2No9EwYB UcB3xtsDhZh0jBdpRb+obVFxlytORzGQaZiAIrdXIwP9fxt/jPhJD4doDyfIvdFUemsj D+zwd+Ts5uepzVKx0VfycgzJTF8p61Y4l1chgsDcDgny7DDkN0tyMC5lOyDyyQfIsPjS +M+v4EAfrFnWcyOX8H2SY9oc43tlGqJwKL8gaRJCRtQ4g6BLubX63TA4ok9sJoBLYkFZ P7zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741471215; x=1742076015; 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=XfKDPE2ADf1xfgVapevP6D/Chiq1U5Ky1BisB2XM/tE=; b=sBrrU2ZXAzn/XoKS5GM6EnaXKvqfOZU7acE1tRlhi6U0viPYHZkANBkEXZKyzYReXI Z5EKDgleu+7bxRCknuoNLo3S/6iNkFwUlE00kKbItJpU0LsFhoLidb6g4FV14oufNxec mix+Lgvw4HyzhLGGnwuD6EZhNK92cfcIdOB/U7CBOnAHURkAakm6tW84gA5WImLMg5KR LTQIEbVO/Ya3tPUffj5h9jO6/vqXE+Q5rRVs5MEvV9dh4XN1zdD3nORx/im80HXDqILX k53NRonkzj9rJZUDqhshfpMiiT3/96xuCpoVt8bcYu5tPTRhieFJm4TYupMV5q9zWWgT gBGQ== X-Gm-Message-State: AOJu0YxDW4YYCpy/ct5MhBJhortJhq4RUosG0RDoLP9NZlCDMSpKsmmD v2F2iADzd7wahXGW7qGJR5iOqQNnwgTSdHZyZ8Rg4dkX2onZL2xnXQAcno7Td2Y= X-Gm-Gg: ASbGncvTFEfgjHCfPBk5G+UCnvWe28CHD+HfnUtkhegnzPJxceP72rY7VfxbkIut8TO 7xwNY1rRvPGFj0mfT6zEvAD0Fiv5RdA1YSK8zS/dQcOzbiGRxPGgggn5bZQHX0LfnI6Syp7L8eM uaNZq7GLqvuHJpnaOtEfpn1kOke3D7BMF0TXrvXkC+Pn+pR8fhvAJqq8JnsDqQvB0ugG9OAAPLJ uHoWcMoF0Kaa7cEhBD6AdT/2qhrITtTw/dVD0QLxzTQtSxDde37lKFcOFYgchXBXuM1pQQ8EFSm nbXqIPYgixxJFL93AEfkzG9/WB4/dAhZJ8DFswCNdQUimyQ= X-Google-Smtp-Source: AGHT+IHWkz7SEfH+Q+bKlg0z7yiokxqXA5kHU8rbQSlKK8AYa1t+TyZUSaCixmJc5apsW592t06OMA== X-Received: by 2002:a05:6000:18a3:b0:391:2d8f:dd56 with SMTP id ffacd0b85a97d-39132d98ea9mr5175331f8f.29.1741471215104; Sat, 08 Mar 2025 14:00:15 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bee262esm9950035f8f.0.2025.03.08.14.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 14:00:13 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 4E3D760B5A; Sat, 8 Mar 2025 21:53:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Alexandre Iooss , Mahmoud Mandour , Pierrick Bouvier Subject: [PULL 28/31] plugins/api: split out time control helpers Date: Sat, 8 Mar 2025 21:53:23 +0000 Message-Id: <20250308215326.2907828-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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: <20250304222439.2035603-29-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007883 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8CC18C282EC for ; Sat, 8 Mar 2025 21:54:46 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr278-0003Ly-6F; Sat, 08 Mar 2025 16:53:46 -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 1tr276-0003LE-1x for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:44 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr274-0000y4-HS for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:43 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-43690d4605dso17848885e9.0 for ; Sat, 08 Mar 2025 13:53:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470821; x=1742075621; 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=aDELaWcH8onO5ZCoyKehfG8N5YiojTrTBD0BN28Mrdw=; b=uPmpxX3h/1LJX9yjLeHzFrhEAIch4XnXVEW3QMcKq8GPJaxp0MmdW3kEDAtGEKjVjZ wSRvnlr1UHP92imriJfZ7Zs/sIX2WOw1LUiaMiIL/YSXzXgrgSpH/fjf/x5A3SWRVIHX YBCSfXqYzfxXaTiiJb2Rr56/3doj8amFa3brCF0gYg7PfN2unQF+uAdhBuwm2osZRKsd ubvJTMaSQctFpH3b5j+kM9E80K3BFgHmbEMlFmD9lNoJgg+I0/PpFaEZ3rg8svzbqWl8 GY/WYTvVL4xE6rJeisheL7HoqnfP5BnNNU3p9NobVWIDApu8V6i+uq9DKuhPTC0BVHqb FPyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470821; x=1742075621; 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=aDELaWcH8onO5ZCoyKehfG8N5YiojTrTBD0BN28Mrdw=; b=eVtRDQ6eaYNfpWI9JF7gDDb7QpuM3VMxk5cK5dqpzsJMizNcYIOfbva/Si3kyCUZrA sk7DQxd9x1l/UEAiHHu56lMq0BfEzGUdnUmhwGPlwnlYY0nw+nMuRxv7cpWXVDnfGEot nfolTkrdjsCPvS6n1h5Cg89ghklUpYhqfKIPJg/05Yl+CICgaklN+lldTNzQNGxGLXat Wh7fF2us9C9giCYVk9T0XosSzFwAj6ponQTQJQ9RVxO6yWmzKNojTQl4cNtl/1zZF17x 3RiRfKxJqRR7xi4KYBgjWOtYj8M0aLNCG4UM1Ar8Y1dfIPp9uJ0URgYDndLdWwf9EjA3 ybxw== X-Gm-Message-State: AOJu0YxeWzqWVK+FoGqhpIJo1MZFjFDbuqtYZ7oEtYjxmFmTydrPKTns RKKFwJTQ/wT+rkTu+1HK8p1QkCAOj8g1CM9bTnIX3Mo/EMgl/COpPLDWyIWrnyk= X-Gm-Gg: ASbGncuunOJ3r7MpdAGzkkvg/N/7jnwK5A2kYv03RqhvTocmpsanHBKIxrOzA36+lH3 HTeoeAGKvH9k80d5it0+1QwG+F892LIJH95Dv1eef2B6jj6E63oo7hqkPZ2OjZFw5oGed4+OVSI YfH1heE6si938T6LWtgjxLGMpJ3tIFMvy8jyxyDbO3Q2U4qIp079A5uoXCEd/ddCzfTo5Kxm53Z H3aBbEqrSckdU+Lold25cGyjMMUzN6na8f+gnR8RFWtubQ5BwsmyS7aHNPnzHPnJZ7ZN7mgpkqt 0/aI0j/wj3Xzg7tMS1f2JzLQRg8jyzNObAdoWZ+K+Qf+dIw= X-Google-Smtp-Source: AGHT+IHhM1MQeRc3LrbQe4KWHWDmWeGlEKP/XxxIRUjTcGQ+evfdJgy6gQIJrdGU9Bosg9fqEbFYGw== X-Received: by 2002:a05:600c:5112:b0:43b:daa3:33df with SMTP id 5b1f17b1804b1-43c68702810mr59128835e9.30.1741470820909; Sat, 08 Mar 2025 13:53:40 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfdfcdasm9756081f8f.23.2025.03.08.13.53.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:36 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 675B860DA5; Sat, 8 Mar 2025 21:53:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Alexandre Iooss , Mahmoud Mandour , Pierrick Bouvier Subject: [PULL 29/31] plugins/api: build only once Date: Sat, 8 Mar 2025 21:53:24 +0000 Message-Id: <20250308215326.2907828-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Now all the softmmu/user-mode stuff has been split out we can build this compilation unit only once. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-30-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007905 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AD47DC28B28 for ; Sat, 8 Mar 2025 21:58:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr275-0003K8-4j; Sat, 08 Mar 2025 16:53:43 -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 1tr271-0003IJ-Ky for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:39 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr270-0000wS-4Q for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:39 -0500 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-38f406e9f80so2265273f8f.2 for ; Sat, 08 Mar 2025 13:53:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470816; x=1742075616; 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=bfHWVPwLX0M3htfvlA6ICcgJ+5w8LQYjiCmFTnr8X+A=; b=zSQmffyYijWtaJfGGjc9VtBAsagKTViDvmvlcXqk1NqNHy6Grz8x8aJOMXkLLayNFL K6rfdJJvtRdpILEj6aiQws3k34CK/WWj9HhrSPDIn/rV8RiXZ/adBYgGnE3MpnmrlMTT bHU5KfPP1xLvYIrJYwoZgWIulrtgRJT6xpM76vDlu+XIY5jBPFzQ5zwg/OevsH+Z3Tri 3OQ7SSVQh+viTKj0sExHi94q39X81cp98Ey8qtHwWwDmAoC2CpMDd7DM4SZFATIS3AOo sMlSTHKwFF4X6wl8NXJ3/tUiNlTcQVxg9HRpXTgHXpLwksU7L8J9XdPh3FR/VpkgHwRl 6hiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470816; x=1742075616; 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=bfHWVPwLX0M3htfvlA6ICcgJ+5w8LQYjiCmFTnr8X+A=; b=XRtpaLbHg4ZKnUlNheCeEUYDotq1TTsD/x6zk5aXukBfsXth9mx74ip2+NNmz5Acz6 cxk48tObwZQu+HuKLl616hpm5R/NmSCzJLaISRdecfUzC4hZ6COBAIbK/PpziG9RJSDb mEM8yOjg3LfSnVeS3f8AValq942WbxtjuiSTC8ypmKPwqeg2UAzDraZu1PUD0C0D75W+ 4CXg7lhy0U5/t1xiz49EX8EOJDGVFqpM7lnxh2fVkDILIi3VBqqZfBYlJ1jCj4F5+e5U ywHgTtn/3Pv4467rweQWKy4AedEpIE56PMqgSi/HXySw5zJPzhT0hoAJpLr6petW7+dB RzIQ== X-Gm-Message-State: AOJu0YyKRvDEA9wz/O3IXcBbsJ5KPQnx5HMHOugjt8FMlhhkgh/v5qnV qGx7tcCdxD5SPcFrQNyxMdtQjAG6ozqKP8LqbU5U5zFUNhexTsun0lfeFbODYG8= X-Gm-Gg: ASbGncvghDHDz4Kx2BhhF7n4/Vu5d0ehdfinBKjqmvVQ4UKHkGKqJuBjZgrZQFhRKQT zY63vQH0OyQ4Q2xgGP+gbha3uKdSdoTdmSLmuI54+vlaAvua5rLzdGlFCNx0OKZ5yl3BvjrWWzk ONtjA/I8MyT1dq6G8JTZRieEccEfiQJpngrQbIXFppFLFGUkE4O8WF29wW3j7O+EWV7mS42l30M aroGwUOSZoJrHdjmfx2VpEDXnMAClKkQ9UHJ53wPlEpyNZTnOUVTu0qneSatfuCTfIowBBFFhrj Oh++QLPBAU5R49hgaFb9JVjiqytFJc3RCM+16FeTZO7mAqc= X-Google-Smtp-Source: AGHT+IHBbsBk8/zPJQt1yPcMKKU/lz6KhJrt7yaxyAsZ8x/0kPK2iE8NcRBoTSVVjgGOIRLnECEb7w== X-Received: by 2002:a05:6000:18a3:b0:391:ccf:2d17 with SMTP id ffacd0b85a97d-39132b75751mr6149456f8f.0.1741470816516; Sat, 08 Mar 2025 13:53:36 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c103aa5sm10055169f8f.94.2025.03.08.13.53.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 805A2611EA; Sat, 8 Mar 2025 21:53:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Alexandre Iooss , Mahmoud Mandour , Pierrick Bouvier Subject: [PULL 30/31] plugins/core: make a single build unit Date: Sat, 8 Mar 2025 21:53:25 +0000 Message-Id: <20250308215326.2907828-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20250304222439.2035603-31-alex.bennee@linaro.org> 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 Sat Mar 8 21:53: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: 14007886 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0D886C282EC for ; Sat, 8 Mar 2025 21:55:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tr277-0003Lh-75; Sat, 08 Mar 2025 16:53: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 1tr275-0003KP-BD for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:43 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tr273-0000xf-D3 for qemu-devel@nongnu.org; Sat, 08 Mar 2025 16:53:43 -0500 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-39129fc51f8so2554240f8f.0 for ; Sat, 08 Mar 2025 13:53:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741470820; x=1742075620; 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=9+USVfbqbvkxo8yt5Lac5ZRGOWAYMoefLOeZ1OEowSg=; b=l5l3baq4ovIEU+hRhKAbKGHUBJaOEZSEx3kXewXLV3TXxn0xN06rz9LJ39kYbKugmy 2vXFO9gwN/D+dq8CnI3+Euc+wtCfGvgnDmSP5lsrdRCdDB95RXmkDcNJxBEUrKcGvGxH WlUkNKclmf2LwK+t9uEiXgv5TbqY9Km7uuRwEeKsdf6ExSMxACKHO6M+k+TKRYFu45Js wH+nWRb1bwL59F01rrA2bFBg9q8aKmIiSTF12MOOhdxK0puhnHVrvOGY1r/fvsJGkNAi Xs20p3WFn1Ava4tD4EXD6ea6GGcGz02OuUbJYv8lVyc7xzWakjq+s3DssfEuDabi/AMx 4N6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741470820; x=1742075620; 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=9+USVfbqbvkxo8yt5Lac5ZRGOWAYMoefLOeZ1OEowSg=; b=wR5IJG45FTFuVBQM3n+Q1/dZMtttSDNPqekI506kTPcFcmZnFjWyYbNWPyTvIS5VDS XSk98/hGljpPVbYPKUGVfCbLBhlVxfEG32CMD41nNG5E6H64CyX7Qiutx51/Bqt9u/in HveMtUu6HTYmCuJUJA2KR6yiML+7CiX37eA2PCsOpomXHhnAzaGfYaCu73ZZRO4pnQZi tANs57NtQXf2CeH1R/nrU4XKJT5qUoaHGC89T6l1JmotgiRjSkNgl/A5Vb6HpJsL/sfd OnbOG4z18E3R1bNoZhwF0rBLORXFy97uvfr7GIruh3YMSrbn5N+LIzVSW4UVMHBJMrfO oWqw== X-Gm-Message-State: AOJu0YyTMhVWq2a7LckwO5sFJfM2FIp8a5XHi09FG4m2TRzDR+VwIzRp QnYyM2GKDXtcCTglIO9nYYvIE7uUKyDBeD9q3Y6obYwUXwJ2VfTgsQAjb21qHeW+38KuIBs1FEw 9 X-Gm-Gg: ASbGnct/OmGFF+CfszC0DbsS9RK1iQeG0JZtMONUIHPcFn0xb3QVX6DZkbxbwTo5PSf ZRGdmG5tUrVgkpQ/BZZrlI0mV+lU2OUr+oNfX8KaaYDqSyocelWs1KXGf7rAJ/i3prSDKCnZfiO O8/uTRNYS5qHCFWWjlxKf0m3SbpND2OObMsA+uuHbQtYa7O+vvB779/jEIqk7ezyoQdwScbQ9A8 tM3wqlIoKakT3l5t2YtxFfH8q5L1HPY6nzP6AvoQtj6EJRx/7m013V8rNgTxSet3qUwkpB0gWFe jFls25JlPwVuJU41X92R5sE+cX5mDaOY0GtFJ4R+SPZxVtI= X-Google-Smtp-Source: AGHT+IFFmEi2/mv2d0F+zM2LgcBkryGZf/wxb5vRykCsNmntVoKvhdH+gSpWFOrB35NusKOCDAs+tg== X-Received: by 2002:a5d:47cc:0:b0:38d:bccf:f342 with SMTP id ffacd0b85a97d-39132db8b3cmr6610895f8f.43.1741470819840; Sat, 08 Mar 2025 13:53:39 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c01cb82sm10210678f8f.51.2025.03.08.13.53.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Mar 2025 13:53:35 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 955E8611FD; Sat, 8 Mar 2025 21:53:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Markus Armbruster , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Paolo Bonzini Subject: [PULL 31/31] MAINTAINERS: remove widely sanctioned entities Date: Sat, 8 Mar 2025 21:53:26 +0000 Message-Id: <20250308215326.2907828-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250308215326.2907828-1-alex.bennee@linaro.org> References: <20250308215326.2907828-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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: <20250304222439.2035603-32-alex.bennee@linaro.org> diff --git a/MAINTAINERS b/MAINTAINERS index 756432add4..70510a7952 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2546,8 +2546,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 @@ -3659,10 +3658,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