From patchwork Wed Feb 26 14:03: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: 13992492 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 F16E5C021B8 for ; Wed, 26 Feb 2025 14:08:31 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI14-00018O-1v; Wed, 26 Feb 2025 09:04:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnI0x-0000xT-1r for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:55 -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 1tnI0t-0005f3-Fm for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:54 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43984e9cc90so5747355e9.1 for ; Wed, 26 Feb 2025 06:03:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578628; x=1741183428; 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=D2cgi/gDJAyPqliWmZWtNiNSMuYoxc6Sw7E/720Aads=; b=qhhsqelbsQ7vgFQJf4tBGoRydRj3X3WiCAiMW1dfd8cDkQqkFQNzWfm6HtdmniF18G 47KCIdxIBURyOfBHbasvKWqn74U3IAVoHTNOxX4JWR5+42p/XY0b4svBagwtiQXZWut3 h3DVoIXiiJWKrctN8oN5ouBXm6TQFAvc/sMEJVoCoHDYDggKrTofHOmmMSSvDs8wT9TV T06K2K8tnBl4xiymZcIZ0aBlYNGOBdwBZSNQdKKiDdl60oEuJEBTECEQU3IFv3LiAoMe 4E7vFQfrxzHag65HSy4GAjhAIjjamrVstRasDDGR6A/OSeE3VCMIgpWrybDX6E+ogCee 2/lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578628; x=1741183428; 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=D2cgi/gDJAyPqliWmZWtNiNSMuYoxc6Sw7E/720Aads=; b=NViFffUm/eAk5J/EvE1W8UzTkLjh87UIWOjkIQW8xMIoVvZabODH5xARmSLLHbcpwa EmhtqdgSYf0EnyrmLXuj6/+lUois3L9Fb1ymShypuLLY8hNa+jcGOEPFzX5jR5CbDtrH 59N0Bkkxc58DaIAbjfFSMC7QFYdPkEzwDv4+NxSrMLcnXcAPiqLUqPukLdtS9e6Wfk90 61Nbhg4o1KAR1Tb/r78NtdGJTtBew49GZPht32xlQuJ5V3qKlzRQN5nN4Io8u5CuOOcv DZlSW0pIer6/BeUEh5zCVRPsW/vjJcn4QrAMfwnQ/NICQrZxGKQNdDjt4fx5S6YtgXYF //RA== X-Gm-Message-State: AOJu0YzmyMKlTQLQP0WOOCKYSUBrx3SrbJeCa30jDjMUqo0mM/0wNW2l mhMvIaFS7HnEdQlyBhaD1KsguycxxTdwU8I8FSzs0n3eL7yU6PfgWkSedDaUa8I= X-Gm-Gg: ASbGncvHla3APvcQ4VUt50wGP74D6NPckQDVSofl4f1IDA9I5GPzLPcjXpGJYpX9x8d 9btphPe1E3aJkZTlaEtvziEtSxyYyg6FLZWdu8A/Tg5S8No06Bj8s4eeuzy48kw0mqp2QLugV3P jk1KDWdt8xoaozgBoInxOvJR9gq3tWJ60k+n+prRWTeUHsNQ3zwkLy1mii9IYsrhfNLe3RZ0jxs IKM2cxwr3UbOaURHU91hN0jognVAKuyJSe1JbhD9eABQ0ps8xUHaVfajnstjMUpFPHc5JazYJrJ ME4Ow/VotBHBM3CyrbUS8I4bxwnt X-Google-Smtp-Source: AGHT+IGFsLK/hFAPn1zqwr4ISTdZRk3h18q0YpTJjvHty+enDz8zcVwgpCGzsMqcJMwRgyHwfNDR+Q== X-Received: by 2002:a5d:6486:0:b0:38d:dffc:c14f with SMTP id ffacd0b85a97d-38f6149915fmr19889328f8f.1.1740578627978; Wed, 26 Feb 2025 06:03:47 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba543f21sm22895015e9.28.2025.02.26.06.03.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:44 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 039B05F949; Wed, 26 Feb 2025 14:03:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 01/25] tests/functional: move aarch64 GPU test into own file Date: Wed, 26 Feb 2025 14:03:19 +0000 Message-Id: <20250226140343.3907080-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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. Signed-off-by: Alex Bennée Message-Id: <20250219150009.1662688-2-alex.bennee@linaro.org> Reviewed-by: Thomas Huth --- tests/functional/meson.build | 2 + tests/functional/test_aarch64_virt.py | 71 --------------- tests/functional/test_aarch64_virt_gpu.py | 102 ++++++++++++++++++++++ 3 files changed, 104 insertions(+), 71 deletions(-) create mode 100755 tests/functional/test_aarch64_virt_gpu.py diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 111d8bab26..c12ee1ce41 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -19,6 +19,7 @@ test_timeouts = { 'aarch64_sbsaref_freebsd' : 720, 'aarch64_tuxrun' : 240, 'aarch64_virt' : 720, + 'aarch64_virt_gpu' : 720, 'acpi_bits' : 420, 'arm_aspeed_palmetto' : 120, 'arm_aspeed_romulus' : 120, @@ -78,6 +79,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..f21ae18392 --- /dev/null +++ b/tests/functional/test_aarch64_virt_gpu.py @@ -0,0 +1,102 @@ +#!/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 + +import logging + +from qemu.machine.machine import VMLaunchFailure + +from qemu_test import QemuSystemTest, Asset +from qemu_test import exec_command, exec_command_and_wait_for_pattern +from qemu_test import wait_for_console_pattern +from qemu_test import skipIfMissingCommands + +class Aarch64VirtGPUMachine(QemuSystemTest): + KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' + timeout = 360 + + def wait_for_console_pattern(self, success_message, vm=None): + wait_for_console_pattern(self, success_message, + failure_message='Kernel panic - not syncing', + vm=vm) + + ASSET_VIRT_GPU_KERNEL = Asset( + 'https://fileserver.linaro.org/s/ce5jXBFinPxtEdx/' + 'download?path=%2F&files=' + 'Image', + '89e5099d26166204cc5ca4bb6d1a11b92c217e1f82ec67e3ba363d09157462f6') + + ASSET_VIRT_GPU_ROOTFS = Asset( + 'https://fileserver.linaro.org/s/ce5jXBFinPxtEdx/' + 'download?path=%2F&files=' + 'rootfs.ext4.zstd', + '792da7573f5dc2913ddb7c638151d4a6b2d028a4cb2afb38add513c1924bdad4') + + @skipIfMissingCommands('zstd') + def test_aarch64_virt_with_vulkan_gpu(self): + # This tests boots with a buildroot test image that contains + # vkmark and other GPU exercising tools. We run a headless + # weston that nevertheless still exercises the virtio-gpu + # backend. + + self.set_machine('virt') + self.require_accelerator("tcg") + + kernel_path = self.ASSET_VIRT_GPU_KERNEL.fetch() + image_path = self.uncompress(self.ASSET_VIRT_GPU_ROOTFS, format="zstd") + + self.vm.set_console() + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + + 'console=ttyAMA0 root=/dev/vda') + + self.vm.add_args("-accel", "tcg") + self.vm.add_args("-cpu", "neoverse-v1,pauth-impdef=on") + self.vm.add_args("-machine", "virt,gic-version=max", + '-kernel', kernel_path, + '-append', kernel_command_line) + self.vm.add_args("-smp", "2", "-m", "2048") + self.vm.add_args("-device", + "virtio-gpu-gl-pci,hostmem=4G,blob=on,venus=on") + self.vm.add_args("-display", "egl-headless") + self.vm.add_args("-display", "dbus,gl=on") + self.vm.add_args("-device", "virtio-blk-device,drive=hd0") + self.vm.add_args("-blockdev", + "driver=raw,file.driver=file," + "node-name=hd0,read-only=on," + f"file.filename={image_path}") + self.vm.add_args("-snapshot") + + try: + self.vm.launch() + except VMLaunchFailure as excp: + if "old virglrenderer, blob resources unsupported" in excp.output: + self.skipTest("No blob support for virtio-gpu") + elif "old virglrenderer, venus unsupported" in excp.output: + self.skipTest("No venus support for virtio-gpu") + elif "egl: no drm render node available" in excp.output: + self.skipTest("Can't access host DRM render node") + elif "'type' does not accept value 'egl-headless'" in excp.output: + self.skipTest("egl-headless support is not available") + else: + self.log.info(f"unhandled launch failure: {excp.output}") + raise excp + + self.wait_for_console_pattern('buildroot login:') + exec_command(self, 'root') + exec_command(self, 'export XDG_RUNTIME_DIR=/tmp') + exec_command_and_wait_for_pattern(self, + "weston -B headless " + "--renderer gl " + "--shell kiosk " + "-- vkmark -b:duration=1.0", + "vkmark Score") + +if __name__ == '__main__': + QemuSystemTest.main() From patchwork Wed Feb 26 14:03: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: 13992488 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 D6995C021B8 for ; Wed, 26 Feb 2025 14:07:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI11-000148-OD; Wed, 26 Feb 2025 09:03:59 -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 1tnI0v-0000wF-KH for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:54 -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 1tnI0r-0005f0-Dt for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:52 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-38f6475f747so3272353f8f.3 for ; Wed, 26 Feb 2025 06:03:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578628; x=1741183428; 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=tUhUbtMcQJqw0qeJKuxjiQtAZ+OPms82YWwNVqH6kds=; b=Dp8VN2Fa8gmm9MP4uyh3b3dQVwnjWLbpGpOj/7HGgWjk/Dm9k535UL2JEjipmMDeXK +RytYEZ/CHKKGafBTppr3LTE/1IkbqQvbH5dhQV6K0MvxujJ+eB0xRrPW4+LqBHI1Pg0 3EjcF6za0+Ft/sTnP0+j3GAbuHQzuspy40kqigdiBK0uDhUlQEsIFrt2blxHqWkGd+M6 p/Xw4i8fZkK5pjslCxb8xKX7jOQLjHDqMn/GkfQwjJDASiI+KqCzXI+5kCTVoX3q4IQf 6PfvGvanQgFIbQuB2dTSamrG7Sj5XX94zrHexorKlvnKtN6UaRuOtG3DfUHGXbl6d0fW emRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578628; x=1741183428; 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=tUhUbtMcQJqw0qeJKuxjiQtAZ+OPms82YWwNVqH6kds=; b=WYmutlTMkKTswOFxqf9p2uTYwUNMUZx+HV7FzX6aPAC4kl3a9ufCTHI+4n0gdJkeTE ulhO1V0O4WkWTvjAFUai8DxzrW/g6TMx82gG/Gh5wzNwlWwbLjRSjmKH9iz3EGAuatm9 kcXK2rFnbdx/O29/ov6LQcVD52S1hm0IZASz5PnBgAdAoVssyzq/NZDlRMHDbw9Yw/Jk NfU1iByZ+jD8CLhcpw8nondRgEtD66D/JQzg3zhTjpsCNPGRTRp85bNmzvzd7puG1XkU AkHcg/ZTz9LLHhFsXaHIdzMLEaGb4ejJ9F04eySnJjNJX33tT1IDo7b5eidFlgn1F+A3 5W/Q== X-Gm-Message-State: AOJu0Yz1OgaDOQuTYS3BChOqDJMw1luAJpv8pOw5Fl7hk+xkdPMlk5zu Qb299Tnd/Ngs6xXbNFWa+A9XpQC0zDousO8gzwuCD/0QPmjwb3EPGmx5OYHg3wU= X-Gm-Gg: ASbGncu7MbX15eYVvie2xkdwu0dI97YoRBr3Diw/iTjjldyVc0XHsFc2/7Sc8C885mH N7ZxQeSreQXDgwGs7nVNDe1bmcvyqWAjFvx4QlL/s0+u4qC4QjYS3ByyCFNTr6bsxc1rzm78vMn 7ivnlENCqVvJGYDCcocxHcZ0EsCS3LJCReRudHoJ4ct87Nvob60Dq5dImDV4V8uNo36M3sCU9dh bwNQSEEm/lKwfsCWyMZEBPMgQRftweSWXqAeZJzoeB5JTBBdgHhhpSiYhdO0a254AXb48fN+PQ9 TuczLVfNyV7CuufGX9PLO5MjSejh X-Google-Smtp-Source: AGHT+IHoS4tSPp+i6qS/7to7tqxCd/HEXqRftOyybB0zjpC5f8Xunz69CNK0iFeMOlDSF1N9Fnyl3g== X-Received: by 2002:a5d:47ac:0:b0:38f:516b:5429 with SMTP id ffacd0b85a97d-38f6e96738amr22428153f8f.25.1740578627605; Wed, 26 Feb 2025 06:03:47 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390cd8fc9b3sm5710878f8f.97.2025.02.26.06.03.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:44 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 196F15FC78; Wed, 26 Feb 2025 14:03:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 02/25] tests/functional: factor out common code in gpu test Date: Wed, 26 Feb 2025 14:03:20 +0000 Message-Id: <20250226140343.3907080-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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. Signed-off-by: Alex Bennée Message-Id: <20250219150009.1662688-3-alex.bennee@linaro.org> Reviewed-by: Thomas Huth --- tests/functional/test_aarch64_virt_gpu.py | 30 +++++++++++------------ 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index f21ae18392..06093c6b60 100755 --- a/tests/functional/test_aarch64_virt_gpu.py +++ b/tests/functional/test_aarch64_virt_gpu.py @@ -39,12 +39,7 @@ def wait_for_console_pattern(self, success_message, vm=None): '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 _run_virt_gpu_test(self, gpu_device, weston_cmd, weston_pattern): self.set_machine('virt') self.require_accelerator("tcg") @@ -62,10 +57,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("-display", "egl-headless") - self.vm.add_args("-display", "dbus,gl=on") + self.vm.add_args("-device", gpu_device) + for opt in ["egl-headless", "dbus,gl=on"]: + self.vm.add_args("-display", opt) + self.vm.add_args("-device", "virtio-blk-device,drive=hd0") self.vm.add_args("-blockdev", "driver=raw,file.driver=file," @@ -91,12 +86,15 @@ def test_aarch64_virt_with_vulkan_gpu(self): 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") + full_cmd = f"weston -B headless --renderer gl --shell kiosk -- {weston_cmd}" + exec_command_and_wait_for_pattern(self, full_cmd, weston_pattern) + + @skipIfMissingCommands('zstd') + def test_aarch64_virt_with_vulkan_gpu(self): + gpu_device = "virtio-gpu-gl-pci,hostmem=4G,blob=on,venus=on" + weston_cmd = "vkmark -b:duration=1.0" + weston_pattern = "vkmark Score" + self._run_virt_gpu_test(gpu_device, weston_cmd, weston_pattern) if __name__ == '__main__': QemuSystemTest.main() From patchwork Wed Feb 26 14:03: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: 13992478 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 8A756C021BF for ; Wed, 26 Feb 2025 14:05:20 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI0x-0000wi-0z; Wed, 26 Feb 2025 09:03:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnI0u-0000ub-I5 for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:52 -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 1tnI0q-0005e3-6J for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:52 -0500 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-390d98ae34dso486555f8f.3 for ; Wed, 26 Feb 2025 06:03:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578626; x=1741183426; 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=JZQvLPaKDF+dbYM2+HplYNybWE3eRF4fezEpNY1mdZs=; b=a8NcifKhEvXPfotSQLAwq96/ouBJH3ZrYxrnKTmd3WrhxdAZexGuGT5LRH+OTCf/vW uMysj2oX/8AF7LG/CnrTN092Gs9O8BYsRuvnMWmfokYu86w/RB8iJrXjtmA4CwHdbSuZ sMDeY3vCqFyXsXtKr7Fm0qS7G9yGl+CtQ1irs/oQbr8uKH98wG4X9eoPx2kFUC6ECQFe jNa6zleVVAUxZXsyM0Jvie6YqL7nnNcdMDLUru4xEWJFPHi/1CGRLZsAccYjRqoVIJmc Z4tLhIjWjNo2fxmNXepqIn7tPNQNkajMYV3tuN8bxgy5uM1EaPizKcZ4/aeMXAESQ5Bh 4dmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578626; x=1741183426; 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=JZQvLPaKDF+dbYM2+HplYNybWE3eRF4fezEpNY1mdZs=; b=wvXC5KVog5S8fGDx7ksHBk/SknWzz3RChhHydgqSRnk599Ow0OqFneZuagnVv3x7rK GoVyaIccFHnaQLdblbX2+3pZt7kQiFI9RVWZ5wnfqoySM8ISxk/Ew2dlZH6IFnvauyHZ VzKsJfebZVcK66WpDX8rIGPOLsbNftF2FKlzAxM4JM1YH5q3dAjiyAgZBQupqO2KSjOb xg8QzJIqaxpGtAzh5kO4MhDlnNhh9tt0ZGbXXKPYoXW181nOqu8M3R2IX5j+x1Wixwqi iEMqmJwoCAkUN+h9OAT3kkNS87KwsHCorsJ+rOjBlOOfST3RDuK3ZqhNunWb0mLqHNvw ZRgA== X-Gm-Message-State: AOJu0YxeMPnMU5tGzatbTfWMx3bDU+r4pCM4AgzbBN4nO1kUd2E60JYj I4CuP5b+p63HNbfcaAPOf5q3u6gQGGwyG5PXf/DKMICc89aQtctPLIghf+wzBQI= X-Gm-Gg: ASbGncuysvtwTrwB9WDV0+enQJqkYYd7uTvJgbI83YGo2jyfkF7xpEwKj08pUPIueg2 jeRU2Zyjf+cYOy5AIj3CflTQbGKPMLxP2JE6S0grriolGDNSBzpQQFbODr+13qq2WwCtJyGSS5m iOJCd1yhXhNZUGZMSvkqqTEspbX13T03qmo3TRvFNcOcUbMJruQuPM5XK16lxQYmcBL/RMASP9L Eno3Pag9PtfdEwp5DYV1OYFbmgAcvcYKhOjwereL784n4St75AZc6eGAcWR9kpoHQ3DsJdVGp2h RK9OCslIwLArG9YZKlqr4U0ro/L8 X-Google-Smtp-Source: AGHT+IGHwhlbmcmrE4h+SUKRL/ImN7OqEb2rJwVxkeGY6jcKuQKVV1fJVvlJczgkEESuQL8KSu5vTQ== X-Received: by 2002:a5d:6483:0:b0:38f:465d:fdf5 with SMTP id ffacd0b85a97d-390d4f4310emr2644631f8f.26.1740578626364; Wed, 26 Feb 2025 06:03:46 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390cd88295dsm5655252f8f.45.2025.02.26.06.03.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:44 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2F0DD600A1; Wed, 26 Feb 2025 14:03:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 03/25] tests/functional: ensure we have a GPU device for tests Date: Wed, 26 Feb 2025 14:03:21 +0000 Message-Id: <20250226140343.3907080-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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. Signed-off-by: Alex Bennée Message-Id: <20250219150009.1662688-4-alex.bennee@linaro.org> Reviewed-by: Thomas Huth --- tests/functional/test_aarch64_virt_gpu.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index 06093c6b60..c9463d7285 100755 --- a/tests/functional/test_aarch64_virt_gpu.py +++ b/tests/functional/test_aarch64_virt_gpu.py @@ -91,6 +91,9 @@ def _run_virt_gpu_test(self, gpu_device, weston_cmd, weston_pattern): @skipIfMissingCommands('zstd') def test_aarch64_virt_with_vulkan_gpu(self): + + self.require_device('virtio-gpu-gl-pci') + gpu_device = "virtio-gpu-gl-pci,hostmem=4G,blob=on,venus=on" weston_cmd = "vkmark -b:duration=1.0" weston_pattern = "vkmark Score" From patchwork Wed Feb 26 14:03: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: 13992473 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 E50FCC021BF for ; Wed, 26 Feb 2025 14:04:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI11-000149-O8; Wed, 26 Feb 2025 09:03:59 -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 1tnI0u-0000ud-Ie for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:52 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tnI0q-0005dh-5s for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:52 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4399deda4bfso47176285e9.0 for ; Wed, 26 Feb 2025 06:03:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578626; x=1741183426; 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=oTNw3ExiwY0hSDPVxjA6iIZ/5nHNcZO4ZN/EW3ctQwU=; b=J1eYwTVNkQ+Bs1+KhF6zD7l0aYhjYQ8+j01yurLbXDxUBe+KrpCXy7fiNd0xdv1m48 aHUw7HbqB3PqwEAEBpJwNTyMdrh/T67JIq1t+laof/Fju1bySUM/6AOU5+1tNeeVS7vQ XNHLLWjWA+Xxxf7kccSO4net8R/p7GmpLZ4A05ntbts7TYbn6UZfpMTfZ0OI7+PUISN8 iCbCrZ50fXBzs1TJxIgTMOEVk4jG9tklfCqYgaK6OClSLV6nT566chr21GkzTG0oWs3R cvpRK6Xy8NdFUlXFUgwWqPbYx6HhCgfuSQrT5rVGHgXT4tsrMYSwUk3ypxnK13FxSz3P TSqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578626; x=1741183426; 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=oTNw3ExiwY0hSDPVxjA6iIZ/5nHNcZO4ZN/EW3ctQwU=; b=rKcEzTf/5U7Pn1Gm2YHNbHnL6hJ+FCI+9BYWPGbAkRza8oBPxQmAoydiQFR+MCN/Ne gNlwsBC5iMIIenXmIhEvukcKX4lHkaKdlKLDzlW54eNEHqvM4pO1cubOk0kNf9AXHVLX WIffN8XlmEYrs3Jzip6klBe4YCXpnjnxV7UtApPEQQAy9k6XxSfpgQm9l5HIL7YVxKxQ AfxKJahCk1X92E9dXQXaqpHo0N/6iTRm1gD+veRbo3NrBxb7KBFJ6J4SFDJvq3hoIUA0 OpiHs4E4OLimt53yw3qHcgb0VpT2u1bR+6T89+ddQVY2Hk63/D/5L8Gz19PAL2pT7cw2 tN8w== X-Gm-Message-State: AOJu0YwSl9bLMlRGjwBWencpPa09+nZ7wsdwdzXeeEb3gxnL1eg+ZmdM BLnxlo5ebtpiIeCsQ6nmzlx8ldjOOr/aQScYvfvScDeXoI41f6VUbgMLcObaWGs= X-Gm-Gg: ASbGncti1fsSD7rBnRm0gsuSAM5N8G6lF570XcGOrexqzhzFXXk+Si7qGlJ6pAQkBKn Ts3E4gzltkgf8JgaYpjA9CWPnuOuvAJmuYZ4Q6WXTSAzd9HuCxRtYOvvEyHFCemdRixij1rrb/P NScIObDrgY4eeonPiVSUxvujldEEadby3Nyvb//DgSgago43k9SaBZMwmBO4sTO62SyOjScqBBH /VGIXm9a2z7epllroBupksL/NCfwLwp0+NgHh6mGMPWZvgzfh2AJ2r0Z0d8ANBSIqDhdknuIMSM jr+Qec7Xa1WigLpKIflJPyu5p9VF X-Google-Smtp-Source: AGHT+IEBR736tL0k56kxlAJdUfHuO/VhLL9clFzLSzVVTRtzuy8oeMiNoaWkGELR+RPqWMw6+qLBIg== X-Received: by 2002:a05:600c:3b91:b0:439:9a40:aa16 with SMTP id 5b1f17b1804b1-43aafab917fmr102350055e9.16.1740578626025; Wed, 26 Feb 2025 06:03:46 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba549be9sm22704255e9.34.2025.02.26.06.03.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:44 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 446A5601A1; Wed, 26 Feb 2025 14:03:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 04/25] tests/functional: expand tests to cover virgl Date: Wed, 26 Feb 2025 14:03:22 +0000 Message-Id: <20250226140343.3907080-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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. We might want to eventually add more directed tests and individual features later on but the glmark/vkmark tests are a good general smoke test for accelerated 3D. Signed-off-by: Alex Bennée Message-Id: <20250219150009.1662688-5-alex.bennee@linaro.org> Reviewed-by: Thomas Huth --- tests/functional/test_aarch64_virt_gpu.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index c9463d7285..7a8471d1ca 100755 --- a/tests/functional/test_aarch64_virt_gpu.py +++ b/tests/functional/test_aarch64_virt_gpu.py @@ -89,6 +89,26 @@ def _run_virt_gpu_test(self, gpu_device, weston_cmd, weston_pattern): full_cmd = f"weston -B headless --renderer gl --shell kiosk -- {weston_cmd}" exec_command_and_wait_for_pattern(self, full_cmd, weston_pattern) + @skipIfMissingCommands('zstd') + def test_aarch64_virt_with_virgl_gpu(self): + + self.require_device('virtio-gpu-gl-pci') + + gpu_device = "virtio-gpu-gl-pci" + weston_cmd = "glmark2-wayland -b:duration=1.0" + weston_pattern = "glmark2 Score" + self._run_virt_gpu_test(gpu_device, weston_cmd, weston_pattern) + + @skipIfMissingCommands('zstd') + def test_aarch64_virt_with_virgl_blobs_gpu(self): + + self.require_device('virtio-gpu-gl-pci') + + gpu_device = "virtio-gpu-gl-pci,hostmem=4G,blob=on" + weston_cmd = "glmark2-wayland -b:duration=1.0" + weston_pattern = "glmark2 Score" + self._run_virt_gpu_test(gpu_device, weston_cmd, weston_pattern) + @skipIfMissingCommands('zstd') def test_aarch64_virt_with_vulkan_gpu(self): From patchwork Wed Feb 26 14:03: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: 13992475 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 A54B6C021B8 for ; Wed, 26 Feb 2025 14:04:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI13-00017P-Hc; Wed, 26 Feb 2025 09:04:01 -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 1tnI0w-0000wP-61 for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:54 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tnI0s-0005fF-TS for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:53 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4399d14334aso60065595e9.0 for ; Wed, 26 Feb 2025 06:03:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578629; x=1741183429; 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=hVUFpp6Y2+qzYjm8DoMOY8I59cSTCLj9YwKdTZJDgXc=; b=JexMdG+Q1vUM7Mq8iUHS3Yxy9ymB3nJwY0bVeSbZIYHtroIgd4T/YkRG2hthZDTh7x UeXch/IybmctMTDU+80zfny0NlXr1W6/TkygfChF7cRWuR7/4ngDRPk9JlwZlsPyZKRR PKdzrFsdFP87i/YlkrZiRpDFPjbdVsa+ZTNeoufo2OC3osBcc09M5YGAYPCoo/9Gzu3H jpP0kWAcU4guPUKDnNzSsZnseV2eA47UH/tD4W7q2JDPq3Md3aijK5anPNkjF+faQjHI tGM8dx1IrX3Cpj4zWQfAnv136tyKxIkRAl1TbfN1Xo/AppFNV9T7i5Pw/NsIuPyr1z2u 7w6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578629; x=1741183429; 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=hVUFpp6Y2+qzYjm8DoMOY8I59cSTCLj9YwKdTZJDgXc=; b=NSfTDM5yEYk7mvqHy4qagGfMkskZSVUvHfsUNmWh70zXQGK67fiE1SMe4OE5NmKbu1 l4DmqGAhCuOyInGKEU6vZfDk9Ezi3QxK0WMgIuuX0m8u3yN0T0MpbZDc/tcA5crQtuEw e6/mIWXA6E2ttMg58h9M/K0D8Ve7RfTrFF8xnC+dSya9HXHDeZq6K60M+ppXRxTPzJI8 JsbfHqj4u+ZRppIhSa3YPEp782snHnMgytdCuzuFmKWYQ5H7O2RbpOn8mO0sENwtelyY UW324sj8Qy8gJgjA4BtIHV0CB2NN61Pq2bQyX9fNl0YnYY+2XgLbLCSG35ywaIdZAcZi zO3Q== X-Gm-Message-State: AOJu0YzU9aJ1587DTVBh0EYnzoCxFO2eZqwkVgtMhI01KlJIQw01BQZv kWGoslUgxFRds84Ux/x0FdXL08edGiOco1tMlmYTFum1r6HdwS59JDtoXg9V96I= X-Gm-Gg: ASbGncv2/eFxYXu80hNkkWZiK7CInPMkH/U6c5sx4ivfVBafV/IYVH1vpJJarE/RI+l +/8AptGC67aJ5PJ6LxeRWyjIXli0aMR71iH/P5fRYqVR7P/UcGhkaSepNOeS6e5uPy0EraB5QJB fI8JovPKDyhLXZ7pbjgfw/+qj0E7vOnhiglpi5bBDStdgl1bUS2viuOt+jBnQrelxzxb6QTUcae t3GwMU8muc8QJK9X7PM6mEmRttfBPLqwJ0X+iovVqxAola3NLRnWmI2591bflwP9/BMyenKdSwA 1mZRucsWeyyRbfy2yH4DKILGpNEO X-Google-Smtp-Source: AGHT+IFVErBnm9FRGRKA4Z1dBQjzfhU7Mn+MllgMsR80wC2lyGJwjjCr18CWnGyRUj+e62qm+t8Xww== X-Received: by 2002:a05:600c:3ca3:b0:439:6a7b:7697 with SMTP id 5b1f17b1804b1-43ab8fe183fmr36056185e9.14.1740578628511; Wed, 26 Feb 2025 06:03:48 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390cd882bf7sm5792382f8f.52.2025.02.26.06.03.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:47 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 5E6786030F; Wed, 26 Feb 2025 14:03:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 05/25] plugins: add explicit dependency in functional tests Date: Wed, 26 Feb 2025 14:03:23 +0000 Message-Id: <20250226140343.3907080-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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é Message-Id: <20250220080215.49165-2-philmd@linaro.org> Signed-off-by: Alex Bennée --- meson.build | 1 + contrib/plugins/meson.build | 2 ++ tests/functional/meson.build | 2 +- tests/tcg/plugins/meson.build | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 0ee79c664d..4588bfd864 100644 --- a/meson.build +++ b/meson.build @@ -3657,6 +3657,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 c12ee1ce41..ea4b12c054 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -366,7 +366,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 Wed Feb 26 14:03: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: 13992502 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 A8793C021B8 for ; Wed, 26 Feb 2025 14:11:22 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI17-0001C7-Be; Wed, 26 Feb 2025 09:04:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnI0z-000114-8G for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:57 -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 1tnI0w-0005hC-3g for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:56 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-439946a49e1so44146835e9.0 for ; Wed, 26 Feb 2025 06:03:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578632; x=1741183432; 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=8OLAEfb1TFH74FrITh5hY7sd4JTAq5WSAJV1LNPh/Qg=; b=mXRhvDKMmie0mgnG8hhjmuU9NiYBKMcnNxiWUyqRLd4C1RvmSpkBVUqcewUxOy8oZ6 5WOkDMZ1lL0fK3iguzEnOQb887i95ge1XZXosmxyjDxjAD88bqASadZSgsHkjvmFvlY6 rLUiX4oqwIMsPIAxvdoJ7E01o+FzFT+0219Xb84pLUK0iWnMINJOHP+8/VzBxPeHJEUi 63ipbmRi/ah7wdmuGn69HdWlhPKsZ55KsTbxHNrqxRb39Q6gm/8j6XPr4CO2l4k0AUhM 6MyMIEd9muidsGNe9QIGzoq5Uo9Al0nLDozJdRCBgoPoNnbPLII5gD5VqbEA9IpRkRPR AKoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578632; x=1741183432; 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=8OLAEfb1TFH74FrITh5hY7sd4JTAq5WSAJV1LNPh/Qg=; b=q3MRZv27Ti/1faRTxIjvxzPEn6g3zvw0z5qiY7sHnYAM8HGPZTGxokhEGaMhiD6qYF 3kpJVlikCJV1m41mvBClLzXsH/6/THwVGWTCDYrBQHXfeGf8gabLcIST0B7y3FzSzNVJ e40kZYE5eyzCyL1+y45ezuC+Nkc+VnK3KtP+d5W6IGCY7IAhU4I85OthiPom4aZr0Zxe rOP2HnH7sRnYGFLo3X8sV72XufFpd4dRKzJkfgs6fXCwTEOcknU21eldvdL4wjvmK4ju 8Y3LQyx9WpqdUZ1Q7KdWDRWKbhI+EUjnSCQ8RJW+QOS4u3H566wv1ygZ2A+Tx/lLpSnc in4Q== X-Gm-Message-State: AOJu0Yzc2JObbnN/IvyCVCYVtT49AZX0A5PV1xq+3EC+yv6tXLs0284E x2QW4DnA2rfzXKLxMB3w+U3sbyWPwTmwhMItNTXXHAE7JnX5+JiTrrIr4x+cnVg= X-Gm-Gg: ASbGncvjG7KbpFhNJ5s9CLRHPPEItTKAoWGmcSAtidMl+LGIGqLjgkj/GtvP8YU1qQR Rm1TXK3p1VIS0r+T6fIsk28BCt+hpGXZ/Kj8owH1iZRECPMPBdlyEztd44gD0+YUtnSvFwxnJXX EFIWaJ9xtxVQ/UbrB9jHpaee2krEMKrF91MKT6iSMtjAQDlXtCj75RRHmz70irKfpbN++f07V6z xYTDJc9dRlNBrNTcZsYZLxWTiLRgmTyKiOn36+GbToNxnHOlQcQ1KN+iSI6Xfu9NAhjwDPMkG9s +Q0gEB0GS8huRwXcu22inmR/+k4v X-Google-Smtp-Source: AGHT+IE6AOHiFi8UETxjRSZnfI+8EyG7zhsKlcDWkooHEp9HVjJN5cw2ndmcfJu+OezpPsDJqiwCpw== X-Received: by 2002:a05:6000:1fa5:b0:38f:3015:b9f4 with SMTP id ffacd0b85a97d-390d4f42947mr2619273f8f.27.1740578632136; Wed, 26 Feb 2025 06:03:52 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390df959306sm470978f8f.58.2025.02.26.06.03.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:47 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 77BEE60339; Wed, 26 Feb 2025 14:03:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 06/25] tests/functional: Introduce the dso_suffix() helper Date: Wed, 26 Feb 2025 14:03:24 +0000 Message-Id: <20250226140343.3907080-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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 --- tests/functional/qemu_test/__init__.py | 2 +- tests/functional/qemu_test/config.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/functional/qemu_test/__init__.py b/tests/functional/qemu_test/__init__.py index 5c972843a6..45f7befa37 100644 --- a/tests/functional/qemu_test/__init__.py +++ b/tests/functional/qemu_test/__init__.py @@ -7,7 +7,7 @@ from .asset import Asset -from .config import BUILD_DIR +from .config import BUILD_DIR, dso_suffix from .cmd import is_readable_executable_file, \ interrupt_interactive_console_until_pattern, wait_for_console_pattern, \ exec_command, exec_command_and_wait_for_pattern, get_qemu_img, which diff --git a/tests/functional/qemu_test/config.py b/tests/functional/qemu_test/config.py index edd75b7fd0..0eab1baa54 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,8 @@ 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''' + DSO_SUFFIXES = { 'Linux': 'so', 'Darwin': 'dylib', 'Windows': 'dll' } + return DSO_SUFFIXES[platform.system()] From patchwork Wed Feb 26 14:03: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: 13992490 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 50757C021B8 for ; Wed, 26 Feb 2025 14:08:16 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI16-0001Ab-Dv; Wed, 26 Feb 2025 09:04:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnI0y-0000yc-Ek for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:56 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tnI0u-0005g0-9q for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:55 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-390d6426f1bso445167f8f.2 for ; Wed, 26 Feb 2025 06:03:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578630; x=1741183430; 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=4T7qADBX2s2Fmrza40t6zH7uyjAjt7nMEfkiyQvl/EM=; b=jiIuGRQUdwjvryEmr4ySts6LfmGPW+bnZasa90VZ4zRXSwLanBNy4eM4JW0By3XK5b lKTyJnjFf2WsZujGweuDmgc0emxN2s6TJYJfrwRV/mSJgPffxPjYEQIOIQQ6oRPNcJhg AcGFb6m7Xf4rFYREDoTd8H81d5eB1ehSXvQRnQJTdL6i9tnQdJDy5bCaUlqWWM87yIpF YG+cJXodxWqLQYgBwjdJygjDQ5BxLBYz4DHKF7GA554LFYG7np0oMh5w8MUVPfaynG4b F0mb3IBwK+tEJaJsdXQWCMr+ms/wtN9+OQ1WYVJFqNB7OMZvadIl8ibHPb9krnvE9cls 7DJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578630; x=1741183430; 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=4T7qADBX2s2Fmrza40t6zH7uyjAjt7nMEfkiyQvl/EM=; b=IbtYyrUOrnXH5ixVgo1RW+5I1vMbPWYnuZfrY4mTIsB0ete7REa++4+7zV9PXOUSL1 3uB1J3E11eCk/icumgw+Cw6GEjsHZMW2z+RJ3VEOpFm36QFy8NIsnxNH4Jnavhu5rLGw iF/1BstpxHXP0ZF5WSZnVt82bbYsCgIvNYoQnwMLVQz2zA8rAJALgr4+QSz0CtpRRytt i7xoQcb6bqDRc7a1IjY15i2e7Iyr4DaNC4uw8bfOIetbCw+EAybBjlYUz6qp17UiElgx yt5T10IDj/xn77ZqufIOJWWs4HSehBE+UhiaaaKqM4wCzbzZm0jdYi8IP0aG7/K3u3ml nZjw== X-Gm-Message-State: AOJu0Yx4g8BytfU+cwHftbU9ElYqAWHRG1oM271GRsoulwVRRhLdI5M+ E96Dg5YATg5HIy5GfA91y41Gnu5dCbsaDp+AbDH7pOi7Al1ThBnB+IwW1SLVQWw= X-Gm-Gg: ASbGnct9WBmgueyNRPzz2KNixEtB9BNNUU8+/nh8okipoRHXei1j4ucvhvXBd/D/hMh 5AwIhFjxktqRHmq5f8ZUFU8mtR1xaA6MQhhax/1iAFsQpiog1MVsJVi8krTJ9GOvzlApdxcxuah fQwiAH04MPCIicZ84zpJesDIM3IEgD2O2rDc/MCo6z7hwCtr6RQoS1kJ/kTXXHabVixiHBcRx9t My+hpYO5wQ+9rtm9cL0yAOmScG25UxbsCEKZm7YM5hqaMMhq0f57rqpoci0r+mgEW4S4MbOFX/Z eaE1qsnH/9w9xI3oUNKF9EYJ2DJ2 X-Google-Smtp-Source: AGHT+IFFq+LDR3XWqvLyK0Evpdgpb9outaHj8uJEofpK5TlLiFPf6u5Lnu3bfO5KEcvXCmqaFV1OGg== X-Received: by 2002:a5d:6d0a:0:b0:38d:dd70:d70d with SMTP id ffacd0b85a97d-38f6e947399mr19918943f8f.18.1740578630071; Wed, 26 Feb 2025 06:03:50 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390cd8fbcabsm5610553f8f.86.2025.02.26.06.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:47 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 8C5AB60342; Wed, 26 Feb 2025 14:03:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 07/25] tests/functional: Allow running TCG plugins tests on non-Linux/BSD hosts Date: Wed, 26 Feb 2025 14:03:25 +0000 Message-Id: <20250226140343.3907080-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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> Signed-off-by: Alex Bennée --- tests/functional/test_aarch64_tcg_plugins.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/functional/test_aarch64_tcg_plugins.py b/tests/functional/test_aarch64_tcg_plugins.py index 7e8beacc83..5736b60545 100755 --- a/tests/functional/test_aarch64_tcg_plugins.py +++ b/tests/functional/test_aarch64_tcg_plugins.py @@ -13,10 +13,11 @@ import tempfile import mmap +import os import re from qemu.machine.machine import VMLaunchFailure -from qemu_test import LinuxKernelTest, Asset +from qemu_test import LinuxKernelTest, Asset, dso_suffix class PluginKernelBase(LinuxKernelTest): @@ -62,6 +63,10 @@ class PluginKernelNormal(PluginKernelBase): ('https://storage.tuxboot.com/20230331/arm64/Image'), 'ce95a7101a5fecebe0fe630deee6bd97b32ba41bc8754090e9ad8961ea8674c7') + def plugin_file(self, plugin_name): + sfx = dso_suffix() + return os.path.join('tests', 'tcg', 'plugins', f'{plugin_name}.{sfx}') + def test_aarch64_virt_insn(self): self.set_machine('virt') self.cpu='cortex-a53' @@ -74,7 +79,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 +105,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 Wed Feb 26 14:03: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: 13992474 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 53668C021B8 for ; Wed, 26 Feb 2025 14:04:22 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI15-00019f-To; Wed, 26 Feb 2025 09:04:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnI0x-0000yF-SA for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:56 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tnI0u-0005g7-7g for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:55 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-439a4fc2d65so67384735e9.3 for ; Wed, 26 Feb 2025 06:03:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578630; x=1741183430; 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=f2xRkDDnfQohyxAsgCKQln4PNyvpl97r1V0oBiZCInQ=; b=AQypDvfkyZFm8SBemBEM4MYU/uYBzmHUwLLmzTgvah9XPvz8CUOS6Fh6RnrAdELFO/ g3+A4dmlwrMBw//3LJBshhuP5kqb2YKqEk227njxnXNLJLyG/JWYuAdth9NxbbLRv+m5 mNGR7qLt9WRR+gEbSfxbek8aLO0XsOtndnTvjeVpnXw1nGcAppCed4mJuu3RkkYezKub x/yiZ0qkOpFvifB2j3SNDoodfGQ3yglOPbMMsFaOh+9IR1TZR761uudUe1UzHM7aFzJ4 +G8rkAFb9+zvEE2LDTaI1Iy/YvaoeXhuU+ZIxIRQj6oy0AliSsU2bFCFKSxa+0atTKKJ 9bUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578630; x=1741183430; 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=f2xRkDDnfQohyxAsgCKQln4PNyvpl97r1V0oBiZCInQ=; b=Je/09McEA5DSyUQUm8VPTGJnJ8q2Xhiqv6XmSWFCP/ZtUoakLSPW3la36QZNpFczWd CI5QKJHbePug1+O39wm9yDDYyPl5DMDrot1b69WSz4LgbZasKj18tflc3bSfk3/FhpDq EXvGLBhNKjHPQQPW1+aP2T8qHmkOH9g7WYoWjGbUDpZ47S6p3h11Lh0cHLPbdhjEjjhu o7ys6I+JRlaAzCMNZMyGOApNLtZCdcJJFwnmHMXWguoxs0OAepy1rbyr2mVm0W7pbW+I UJyJ8CneMfN5lfJkBZPmoag3RVaBUkKpGIapvsw8gmrUIfPv71uByOQnX6luN8gU3+MB Lfeg== X-Gm-Message-State: AOJu0YxLquju8swqKIGL9jjyzvpsIzoZ/tKqg603aLbFoAqDHMKpd+TT DQKxhRuYfdFWrGrUN9cSCrQEHk34GihbPAzLYYC3vu9M2syOICfkmYiLEKu09Hc= X-Gm-Gg: ASbGncuqwQNXnUbllM0Us5QYIJumjIB+3UTyCeWycv5nv+kmwT7e3Wg0rnWJbzzGkA3 LoXm7Krn/fR/oENb5d41Efksecv0vQ/6OOEIjqSTyWUqA75alqu8KDzLpXEbDMAh5ZhA1JT2xsF KLOLqaHuofarP3TcaefNJNoV6Ejw3y86rdc8fgwOi1zqlwtt+eyKJHU5VEBT0yDnZ7KefrAru7e oSifgC7f0ZwbWJsBP/hMrGKaA09P32vnFLQm5EWhTlOW1tuP9cZx3uy3WxvMf/A+SD1v77pBwju HNbArd0guSi7RBhYKOzdtEuSoRS8 X-Google-Smtp-Source: AGHT+IGByyGMb/XmFI+zsx74dS+z083dE0NDwFvwEVRfRLW7t4mCyQje2PF4g0yOygQG4y+8giLLjA== X-Received: by 2002:a05:600c:468b:b0:439:9eba:93bb with SMTP id 5b1f17b1804b1-43ab0f42a24mr80584445e9.18.1740578630475; Wed, 26 Feb 2025 06:03:50 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390cd882a64sm5537849f8f.46.2025.02.26.06.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:47 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A46516034D; Wed, 26 Feb 2025 14:03:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth , Dmitry Osipenko Subject: [PATCH 08/25] tests/functional: skip vulkan tests with nVidia Date: Wed, 26 Feb 2025 14:03:26 +0000 Message-Id: <20250226140343.3907080-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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. Reported-by: Peter Maydell Signed-off-by: Alex Bennée Cc: Dmitry Osipenko Reviewed-by: Thomas Huth --- v2 - implement block at the test level --- tests/functional/test_aarch64_virt_gpu.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/functional/test_aarch64_virt_gpu.py b/tests/functional/test_aarch64_virt_gpu.py index 7a8471d1ca..a4ae5777e6 100755 --- a/tests/functional/test_aarch64_virt_gpu.py +++ b/tests/functional/test_aarch64_virt_gpu.py @@ -9,8 +9,6 @@ # # SPDX-License-Identifier: GPL-2.0-or-later -import logging - from qemu.machine.machine import VMLaunchFailure from qemu_test import QemuSystemTest, Asset @@ -18,6 +16,10 @@ from qemu_test import wait_for_console_pattern from qemu_test import skipIfMissingCommands +from re import search +from subprocess import check_output + + class Aarch64VirtGPUMachine(QemuSystemTest): KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' timeout = 360 @@ -110,10 +112,16 @@ def test_aarch64_virt_with_virgl_blobs_gpu(self): self._run_virt_gpu_test(gpu_device, weston_cmd, weston_pattern) @skipIfMissingCommands('zstd') + @skipIfMissingCommands('vulkaninfo') 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") + gpu_device = "virtio-gpu-gl-pci,hostmem=4G,blob=on,venus=on" weston_cmd = "vkmark -b:duration=1.0" weston_pattern = "vkmark Score" From patchwork Wed Feb 26 14:03:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13992487 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 87B56C021B8 for ; Wed, 26 Feb 2025 14:07:18 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI1Y-0001Kg-ED; Wed, 26 Feb 2025 09:04: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 1tnI11-00014G-Je for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:59 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tnI0x-0005i7-Nn for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:59 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4397e5d5d99so43436515e9.1 for ; Wed, 26 Feb 2025 06:03:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578634; x=1741183434; 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=IDLyudi3+640ZQ27IJ0M4Zn6FgkrKumyqduUtKFDbuA=; b=o7eUxCDwYAOkFqZGhEQM7vYzFH1OS3kjrPeryLFUI2tQHtaS/qtvLWuriSELGUHLOc 5I0zU56Bu/sU9matAl+LAfiHIj0pvca8bN4Z2HGg+gxls+/Fa9RxnFwOuBfw7zM2oqz9 qguD9TOghOk4YRdTIfppxE5PAkQpxQL7w5swLohISrl7lrfRgE2lKLxbFQaVUrbf2wA0 hYWBhUVIKc3GheeT23K80abdgvSB+BjZSL5GzwywE1f57zx+enNiBYs1bXrZJmD6n2RX fmljVwd6bOuccm/f6eJ2ErXce/cOywkGv1W/vvSj8I0s6gqMgvohC3al+jfZHtVM0Zwi S5FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578634; x=1741183434; 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=IDLyudi3+640ZQ27IJ0M4Zn6FgkrKumyqduUtKFDbuA=; b=q+D2FXU9MQ3vi75bbg4EEtyzKhs+nHfMqq8ExMvGuDdZQSxlSAv+y4BWhBNpsVgGQh mG20TkS/D3uLAmA40vSzglk3lF25pphupelNY5KTgw6psY8TfMbpTUSH3+hHY54UvjVH jVuO+3io4ZjuO59tvXPPY9LEKoqd9z7HZgT+hrnkFXhvjK80/DHtksK5xOfVPDi1jw6u ATzLJN1HEn50jGCo1zGmH/tfprKabfMKCToT3AmK0MxrenWoZL9gWxz8xLNBzmZ5XjUQ jiGvborMDwdtKszKs/pEky7qDcn1uqjglzz86EE0hli5KbCjDUx7GoN5WwM5Sjm5dxdK DxuQ== X-Gm-Message-State: AOJu0YwGkg/SaOmPyxEirwqfwznL+cSkTEQi0EP1q8QtUaV8HRQbL6a7 CuZEP8fTKfCGNq5601Rb2l/mCd09n/3z6I6TKAAPo10hVhvyMdLW4w3fABlA18k= X-Gm-Gg: ASbGncsi+qj+F1tLpHXG64J7PuZfgmDAiOKnU8BJHA0lmFzVeu7lhZo/FrNr9aH/pnU WYvf2ndDNJBqI1laDUWCn1lWWiDJkiPlNmn/e/DkABTX3mPdAgADgbDKpMZipFj8+aUP0JIcqlO tU36EiYRJU974CjfUEYy/TkIWzTY/iI9yX4plf86m7dLJBi8j5dWG4CnmXP0g22tHaKeSM2wUwM pSXV8M5UoTyS4Q4eLtGOuULpbvAZQJNE5sScWsKwzRZjgciJL+8RDkMpT1CLbRT1C7ZtkWRLKOO FEwVR3S7QQKEFqtwg8Dz9yGFBuAW X-Google-Smtp-Source: AGHT+IElI6K7n4ytq16EbPhewDJArfCdhSGtKYaaY4/b3ql0joxoOKIP0aGjmqeZy3jMVQcEwx2aZg== X-Received: by 2002:a05:600c:3b0c:b0:439:99d1:d4a4 with SMTP id 5b1f17b1804b1-43ab0f42a0dmr65121775e9.18.1740578632530; Wed, 26 Feb 2025 06:03:52 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba5393e5sm22633445e9.20.2025.02.26.06.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:48 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D707560370; Wed, 26 Feb 2025 14:03:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 09/25] libvirt-ci: bump to latest for vulkan-tools (libvirt MR 525) Date: Wed, 26 Feb 2025 14:03:27 +0000 Message-Id: <20250226140343.3907080-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- .gitlab-ci.d/cirrus/freebsd-14.vars | 2 +- .gitlab-ci.d/cirrus/macos-14.vars | 2 +- scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml | 1 + scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml | 1 + tests/docker/dockerfiles/alpine.docker | 5 +++-- tests/docker/dockerfiles/centos9.docker | 1 + tests/docker/dockerfiles/debian-amd64-cross.docker | 3 ++- tests/docker/dockerfiles/debian-arm64-cross.docker | 3 ++- tests/docker/dockerfiles/debian-armhf-cross.docker | 3 ++- tests/docker/dockerfiles/debian-i686-cross.docker | 3 ++- tests/docker/dockerfiles/debian-mips64el-cross.docker | 3 ++- tests/docker/dockerfiles/debian-mipsel-cross.docker | 3 ++- tests/docker/dockerfiles/debian-ppc64el-cross.docker | 3 ++- tests/docker/dockerfiles/debian-s390x-cross.docker | 3 ++- tests/docker/dockerfiles/debian.docker | 3 ++- tests/docker/dockerfiles/fedora-rust-nightly.docker | 1 + tests/docker/dockerfiles/fedora-win64-cross.docker | 1 + tests/docker/dockerfiles/fedora.docker | 1 + tests/docker/dockerfiles/opensuse-leap.docker | 1 + tests/docker/dockerfiles/ubuntu2204.docker | 1 + tests/lcitool/libvirt-ci | 2 +- tests/lcitool/projects/qemu.yml | 1 + tests/lcitool/refresh | 2 +- tests/vm/generated/freebsd.json | 1 + 24 files changed, 35 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-14.vars b/.gitlab-ci.d/cirrus/freebsd-14.vars index 0997c47af5..19ca0d3663 100644 --- a/.gitlab-ci.d/cirrus/freebsd-14.vars +++ b/.gitlab-ci.d/cirrus/freebsd-14.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip' -PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache4 cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk-vnc gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle ninja opencv pixman pkgconf png py311-numpy py311-pillow py311-pip py311-pyyaml py311-sphinx py311-sphinx_rtd_theme py311-tomli python3 rpm2cpio rust rust-bindgen-cli sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 xorriso zstd' +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache4 cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk-vnc gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle ninja opencv pixman pkgconf png py311-numpy py311-pillow py311-pip py311-pyyaml py311-sphinx py311-sphinx_rtd_theme py311-tomli python3 rpm2cpio rust rust-bindgen-cli sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 vulkan-tools xorriso zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/macos-14.vars b/.gitlab-ci.d/cirrus/macos-14.vars index 25dff322e6..b039465f56 100644 --- a/.gitlab-ci.d/cirrus/macos-14.vars +++ b/.gitlab-ci.d/cirrus/macos-14.vars @@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake' NINJA='/opt/homebrew/bin/ninja' PACKAGING_COMMAND='brew' PIP3='/opt/homebrew/bin/pip3' -PKGS='bash bc bindgen bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 gtk-vnc jemalloc jpeg-turbo json-c libcbor libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio rust sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 xorriso zlib zstd' +PKGS='bash bc bindgen bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 gtk-vnc jemalloc jpeg-turbo json-c libcbor libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio rust sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbredir vde vte3 vulkan-tools xorriso zlib zstd' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme tomli' PYTHON='/opt/homebrew/bin/python3' diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml b/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml index 288156d1e4..dbcd2e076d 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml @@ -123,6 +123,7 @@ packages: - tar - tesseract-ocr - tesseract-ocr-eng + - vulkan-tools - xorriso - zlib1g-dev - zstd diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml b/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml index d497139ef3..4b8ee3d885 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml @@ -121,6 +121,7 @@ packages: - tar - tesseract-ocr - tesseract-ocr-eng + - vulkan-tools - xorriso - zlib1g-dev - zstd diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index f87c40fbfe..bf3bd5a30d 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all alpine-319 qemu +# $ lcitool dockerfile --layers all alpine-321 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/alpine:3.19 +FROM docker.io/library/alpine:3.21 RUN apk update && \ apk upgrade && \ @@ -111,6 +111,7 @@ RUN apk update && \ vde2-dev \ virglrenderer-dev \ vte3-dev \ + vulkan-tools \ which \ xen-dev \ xorriso \ diff --git a/tests/docker/dockerfiles/centos9.docker b/tests/docker/dockerfiles/centos9.docker index a9681c8a96..a942835a1d 100644 --- a/tests/docker/dockerfiles/centos9.docker +++ b/tests/docker/dockerfiles/centos9.docker @@ -115,6 +115,7 @@ RUN dnf distro-sync -y && \ usbredir-devel \ util-linux \ vte291-devel \ + vulkan-tools \ which \ xorriso \ zlib-devel \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 644fd3734d..0535585428 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zstd && \ eatmydata apt-get autoremove -y && \ @@ -135,7 +136,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsndio-dev:amd64 \ libspice-protocol-dev:amd64 \ libspice-server-dev:amd64 \ - libssh-gcrypt-dev:amd64 \ + libssh-dev:amd64 \ libsystemd-dev:amd64 \ libtasn1-6-dev:amd64 \ libubsan1:amd64 \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index 060da53796..6b1e4fc827 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zstd && \ eatmydata apt-get autoremove -y && \ @@ -134,7 +135,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsndio-dev:arm64 \ libspice-protocol-dev:arm64 \ libspice-server-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libsystemd-dev:arm64 \ libtasn1-6-dev:arm64 \ libubsan1:arm64 \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index a481fc9695..cf0fe63af9 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zstd && \ eatmydata apt-get autoremove -y && \ @@ -134,7 +135,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsndio-dev:armhf \ libspice-protocol-dev:armhf \ libspice-server-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libsystemd-dev:armhf \ libtasn1-6-dev:armhf \ libubsan1:armhf \ diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker index 61bc361e85..1c84dfb945 100644 --- a/tests/docker/dockerfiles/debian-i686-cross.docker +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zstd && \ eatmydata apt-get autoremove -y && \ @@ -134,7 +135,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsndio-dev:i386 \ libspice-protocol-dev:i386 \ libspice-server-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libsystemd-dev:i386 \ libtasn1-6-dev:i386 \ libubsan1:i386 \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index 9f6c4763c5..257204eae4 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zstd && \ eatmydata apt-get autoremove -y && \ @@ -133,7 +134,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsndio-dev:mips64el \ libspice-protocol-dev:mips64el \ libspice-server-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libsystemd-dev:mips64el \ libtasn1-6-dev:mips64el \ libudev-dev:mips64el \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index 2e979111e0..395c84d65b 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zstd && \ eatmydata apt-get autoremove -y && \ @@ -133,7 +134,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsndio-dev:mipsel \ libspice-protocol-dev:mipsel \ libspice-server-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libsystemd-dev:mipsel \ libtasn1-6-dev:mipsel \ libudev-dev:mipsel \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 8ee450dba0..1ae227ccde 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zstd && \ eatmydata apt-get autoremove -y && \ @@ -134,7 +135,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsndio-dev:ppc64el \ libspice-protocol-dev:ppc64el \ libspice-server-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libsystemd-dev:ppc64el \ libtasn1-6-dev:ppc64el \ libubsan1:ppc64el \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index f451a07c4c..afa81a57ba 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -58,6 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zstd && \ eatmydata apt-get autoremove -y && \ @@ -133,7 +134,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsnappy-dev:s390x \ libsndio-dev:s390x \ libspice-protocol-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libsystemd-dev:s390x \ libtasn1-6-dev:s390x \ libubsan1:s390x \ diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker index 505330a9e2..5b3bac43cc 100644 --- a/tests/docker/dockerfiles/debian.docker +++ b/tests/docker/dockerfiles/debian.docker @@ -87,7 +87,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsndio-dev \ libspice-protocol-dev \ libspice-server-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libsystemd-dev \ libtasn1-6-dev \ libubsan1 \ @@ -131,6 +131,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zlib1g-dev \ zstd && \ diff --git a/tests/docker/dockerfiles/fedora-rust-nightly.docker b/tests/docker/dockerfiles/fedora-rust-nightly.docker index a8e4fb279a..fe4a6ed48d 100644 --- a/tests/docker/dockerfiles/fedora-rust-nightly.docker +++ b/tests/docker/dockerfiles/fedora-rust-nightly.docker @@ -132,6 +132,7 @@ exec "$@"\n' > /usr/bin/nosync && \ util-linux \ virglrenderer-devel \ vte291-devel \ + vulkan-tools \ which \ xen-devel \ xorriso \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 7dc3eb03f5..a950344402 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -61,6 +61,7 @@ exec "$@"\n' > /usr/bin/nosync && \ tesseract \ tesseract-langpack-eng \ util-linux \ + vulkan-tools \ which \ xorriso \ zstd && \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index b64399af66..014e3ccf17 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -132,6 +132,7 @@ exec "$@"\n' > /usr/bin/nosync && \ util-linux \ virglrenderer-devel \ vte291-devel \ + vulkan-tools \ which \ xen-devel \ xorriso \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 4d5fb3e3a1..e90225dc23 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -115,6 +115,7 @@ RUN zypper update -y && \ util-linux \ virglrenderer-devel \ vte-devel \ + vulkan-tools \ which \ xen-devel \ xorriso \ diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker index e1b70b536d..88ce4ef9a9 100644 --- a/tests/docker/dockerfiles/ubuntu2204.docker +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -130,6 +130,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ + vulkan-tools \ xorriso \ zlib1g-dev \ zstd && \ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index b6a65806bc..18c4bfe02c 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit b6a65806bc9b2b56985f5e97c936b77c7e7a99fc +Subproject commit 18c4bfe02c467e5639bf9a687139735ccd7a3fff diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index 80bcac0902..c07242f272 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -122,6 +122,7 @@ packages: - usbredir - virglrenderer - vte + - vulkan-tools - which - xen - xorriso diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 53f8d2585f..aa551aca9b 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -163,7 +163,7 @@ try: # # Standard native builds # - generate_dockerfile("alpine", "alpine-319") + generate_dockerfile("alpine", "alpine-321") generate_dockerfile("centos9", "centos-stream-9") generate_dockerfile("debian", "debian-12", trailer="".join(debian12_extras)) diff --git a/tests/vm/generated/freebsd.json b/tests/vm/generated/freebsd.json index 81fc38d798..c03e1cd586 100644 --- a/tests/vm/generated/freebsd.json +++ b/tests/vm/generated/freebsd.json @@ -73,6 +73,7 @@ "usbredir", "virglrenderer", "vte3", + "vulkan-tools", "xorriso", "zstd" ], From patchwork Wed Feb 26 14:03:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13992494 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 4BEBEC021B8 for ; Wed, 26 Feb 2025 14:08:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI1X-0001He-6P; Wed, 26 Feb 2025 09:04:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnI0y-0000zE-KM for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:56 -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 1tnI0v-0005gE-73 for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:56 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-390d6426ca8so750847f8f.3 for ; Wed, 26 Feb 2025 06:03:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578631; x=1741183431; 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=u9BfwToqsdAvmr5T1oKvg6QCzmXVNMAZSUhDiWFdTr0=; b=ZgJxL4YFLaMVAtReWLJ4HMknLSc7Kg2npbD2WomheDcNVPKbKFC39VVZpbhjYvAqFk +vVrmrHGmQZP25kViY5togb4+gtezvRanT0bNbdOYxd5AFjFdGISE+s8SxIPdJKUUCV4 0ooXhT7UInPoSy2g+E6blAPp2TKS7Bnj77eHUJIddKwJwrrIFXQZuaiES/KglqiYTlYL yMNDN0XYvMv681aUisqeJ4WJQoxkVbOVIdXk+aqfGNfc65V0UclT2NoQiiOfFObspkZM 09AUbqOPm5SA0wUz6kj7Ojtjfy6WfR56YwAmmCt8zlmsEuJ2pSeagQhONDBPujxrSuEk dWPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578631; x=1741183431; 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=u9BfwToqsdAvmr5T1oKvg6QCzmXVNMAZSUhDiWFdTr0=; b=vV7R9MaZv8x1h1lk31C0hsesQD2bzIccwel9qZYb7VgtOjNyr0ubg2qMtWFovZk+uO F3rP2/+gDAOtTmI8DXYnfjGlKQIuJGMt/dBXNbWQDUe2lGj1/7jKV7YuXggADEP5dxSl nlctHy5vw4xw/bwc3MQBPBhTYZNTyH6z4vJ61XAZdQncRhX8F9ssIh38LO6UORTS7gsU eZD7BL+fxn1xdXaiMYRAUoz8hNtAC+JovbpJ8rdNpLu8jBFSmKYgy9vNJ0jnudgvYd7E XPkl6HRA+5ogBBFQERqzSX/VrgThTg+y2B1n+J02Tz6Vz4JAytA/MwdRNRarYLzozXdQ 4R/g== X-Gm-Message-State: AOJu0YyNYhxWY1B2v3GigCnXUS9JHugkGszVjng8CyS7OGi6oKGWjNHt iAJVkK8R4kyiYwqJe1uHZ4LCvENGnYJ7cTgomsOCRDDTxKSVr+Rqm4UM29p3izA= X-Gm-Gg: ASbGncuYXUU4NvmCXtb/5TCW/cG2PdZKIVbXvZb4CruMYGJ0fiW6TN3Z5qPbmnxr0a5 /M2xlvosBd+vBD6yAAutzCVMlg6VPh4H25yLnPlDNsf8aoh2+v0UanBF4Hp7MuhiMZroT0GSEGd OG/ePDuIXAmNnHqtpqhaOmXjkFtcUtZThr8GuuGaGFcllKvNuZoqTk012n/iaFd9fRmcWhofObX pazLVWfom3hdWWzRZYS7QmC5GsXxtF3l5couuwqm4K17fwtoxsoXeqmOiEC+PC3udzCwi3E68fv /S/ZRNCoNvZoY4E/0oP7l4Q61d+s X-Google-Smtp-Source: AGHT+IGvUePK0+QJb5QRhze0sm2iwK03g8mGfOkusNYsZqCj5zakXObMp9hUfnIbbmbgCVfBtVy4DA== X-Received: by 2002:a05:6000:1a86:b0:38c:5bc1:1f03 with SMTP id ffacd0b85a97d-390cc5f584dmr6865008f8f.7.1740578630807; Wed, 26 Feb 2025 06:03:50 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390cd8fc31fsm5649296f8f.87.2025.02.26.06.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:47 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id EFC2260384; Wed, 26 Feb 2025 14:03:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 10/25] tests/vm: bump timeout for shutdown Date: Wed, 26 Feb 2025 14:03:28 +0000 Message-Id: <20250226140343.3907080-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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. Double the timeout to avoid this. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- tests/vm/basevm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 6d41ac7574..9e879e966a 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -83,7 +83,7 @@ class BaseVM(object): # command to halt the guest, can be overridden by subclasses poweroff = "poweroff" # Time to wait for shutdown to finish. - shutdown_timeout_default = 30 + shutdown_timeout_default = 90 # enable IPv6 networking ipv6 = True # This is the timeout on the wait for console bytes. From patchwork Wed Feb 26 14:03:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13992486 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 D4497C021B8 for ; Wed, 26 Feb 2025 14:07:12 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI1c-0001Ts-QS; Wed, 26 Feb 2025 09:04: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 1tnI12-00016y-RK for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:04:01 -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 1tnI10-0005k2-Pp for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:04:00 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4397dff185fso59961515e9.2 for ; Wed, 26 Feb 2025 06:03:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578637; x=1741183437; 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=eFWFW+6NZINw/m6MJHmphcH27lcvn4J7lC5PnXB+pFU=; b=I6p8pIubtOVnxywNO/PCIbwzhz4XKSey/Z0JkZE4pUR/3/6FnbjGsYgNzcySRKmZk2 l+AjyS5z25UU+U0piA218WI1xleApIIwOpdPeaLadCJLTKAXI9dpEGH5ZAV9jTayi/Ea UUQrwovMYB3yHx3fu8SDtQuOg4E8rglkK80FGRT3nk5g3BGYK4TBAclSrooEgbLmLXCW CsYLj3XQiv52a4iWBQ/6Mg+vCYRbEw5EXicxiy9IY6y9zMh8aU97MUo0dt5/Fsud8OaA elY7uU8NaPtS2Zee6EAR6EzivR1SzfniSc8jLthFV1bvABXaDLZbAqkyswwJ47l0zyZL aKZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578637; x=1741183437; 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=eFWFW+6NZINw/m6MJHmphcH27lcvn4J7lC5PnXB+pFU=; b=ifjb//gPIGSbK9QDHElfRXQq74qsRbZO9pcesDFeFb849SfQYwsQhb5VIP+TY4h1Y3 WYxG5sWaI5bGG6Y/qWWcrZdPIxuqKt5D0SclFUw08ilQj+HhtLSg8NRGuul/GYLcy+2Q NvhLS9GZoh0huv0pF4K5G9tu6YAZLtv3Q0VikBn2lPYVuG/qR0epVsMIVbDbkPR6OCYc UcF+W0JRI8xlay47uHsffIXKbrM3YoZ9AVMeMUhxAQBQbMjKQbKGcDUuaECbXrVn5ZUJ aUF9/VigsDMQw/x9a5J8jCgeGdJrTR2p87sb3ypaUOdHj5COjeGbZipYrffOx5AjDinu IQAg== X-Gm-Message-State: AOJu0YxCvOjIGv78liEDiTs5ylgCukEzXz+dAma4RFHjSWnk1RqrQsd1 6dTiFPdLXD2WK9iW7kttu4HXsy5MsVIkrqglplz+GWrgWaQ4CB4gOwtA7CDNXxw= X-Gm-Gg: ASbGncsYZMzVzv83vA4bYNULHiDaqcnhQ6zAxcpOUZTCWnAqsN0VvcUeveSj0nbfn5+ rjofJ0nSdQlr8tCnRznrgrTHZHoQZmjVRjQkHJyH3q0v7eSkqZq8+RZrArLy0ioE0vpLcuvab4/ mzCtp0lQDx5v7hU9xnbD9rW9gsyzCNEqg+a91am6bc88O3FYmjCM1HLB8Qt9pPkvGlw2hU7ks23 TKEUhHdX4FeVNVMGxcu+x6WONGHkLIku8MrsOk+EsMEiGdkXbFvZiQghMQgQNUI+bw1F6PucxL3 iGikU0FnAjpNlr+aKqLWAWjeuDVL X-Google-Smtp-Source: AGHT+IGcdCq0tB08QxeQfbH5w4GggS22UnqKtdKDnlGcLyAdYb6uH4jtxUtcFfwjwrl+Umq0sa8jqQ== X-Received: by 2002:a05:600c:4f0d:b0:439:6118:c188 with SMTP id 5b1f17b1804b1-43ab90155acmr28424875e9.19.1740578636993; Wed, 26 Feb 2025 06:03:56 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ab2cb1063sm33002425e9.2.2025.02.26.06.03.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:52 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 0E0DF603D2; Wed, 26 Feb 2025 14:03:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 11/25] tests/tcg: mark test-vma as a linux-only test Date: Wed, 26 Feb 2025 14:03:29 +0000 Message-Id: <20250226140343.3907080-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- tests/tcg/multiarch/{ => linux}/test-vma.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/tcg/multiarch/{ => linux}/test-vma.c (100%) diff --git a/tests/tcg/multiarch/test-vma.c b/tests/tcg/multiarch/linux/test-vma.c similarity index 100% rename from tests/tcg/multiarch/test-vma.c rename to tests/tcg/multiarch/linux/test-vma.c From patchwork Wed Feb 26 14:03:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13992491 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 31BC7C021B8 for ; Wed, 26 Feb 2025 14:08:28 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI1X-0001HS-5h; Wed, 26 Feb 2025 09:04:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnI0z-00011O-T2 for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:58 -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 1tnI0w-0005hY-QG for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:57 -0500 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-38f29a1a93bso5565556f8f.1 for ; Wed, 26 Feb 2025 06:03:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578633; x=1741183433; 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=zISDsjBmMmQ71Gb6oaelmScpNesPc2IfHlK0vGMPwP0=; b=jdsInQIaOc92j68cqFEK4rCHsyoS2RQT+dm9nLLzAOSxspDXCoZqmDGvokEuSPhEXo N7IFOXeO1NNzPZSMgDJcfHsknVmI9PykS+VyHBNaxvcqMtZK+vTnNYA9Fe+9IiD1cw9W IzhPrWs9Yno9tIscug4yAPtvJkERZtyQPOl2u6ldzKfdCsFR1OtWKQNxnfpeGxi+pmM4 RKHNq1xPceoOOdzj166EMWlvDXBVwzpfS1YftZImvpak1SmUVPeIWXPJZ472dd9hNjj8 586rJvTGvkg3yGNSYTHu6n0hxfuuYanHZ4ZU5EZoQTBC3PrblNa7/ezxzljik/CZI837 YUXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578633; x=1741183433; 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=zISDsjBmMmQ71Gb6oaelmScpNesPc2IfHlK0vGMPwP0=; b=tsm/MTzUbgDZp/y+gygS/jE1Eu4lWi0CR7oP6/jVqwJPXJCymypCyOYmXyZtjYF3Yb A7CeAIZyZjtUUqBxvzQIkLs3e05KmcvJfJt6NVoWjDb7udWKI54oqtEA6979zrnZNzzp JlLhBMhwelxWfarkU9oRy3g7ndyWNLn/6mpQ4qoosoQU1TE7y5lhSybXFke+1sEqXi+P 2W5+6TdWm594tM5JuyiLCMz4CkOpN1WaD5rTZvxw9qVssBJi07XKUphlmT3nsqPvYta6 1eWuLQbh5+4AM55gRaU9KKKucFqHMwJ1ZV5a9RWmgA49jBbRaxMaIeOHluHeqOx3tBZF tAdg== X-Gm-Message-State: AOJu0YzgF+KTqyzvvOs5vKqIbSgH86hrl2gXJ3PLbAZI3upFQjtRSGsQ t/ig+QZopzeYl3CgklIae4ROg83aRhVPVtQXJVcnsFVZHEJGvSGia4rff9K+4gU= X-Gm-Gg: ASbGncsGVX1KZBZWr2XBpE1UmOZBCzFsFLelQJBk17QeOpBXeaxVufrMLWjTlUlEKRz UuPIsfELWUFWh1hh4OSPr8MgeKXNMaRHyHRCYuFjTH0pLWAG+LxGaTeXjibxrDy3VCUtjN8sLVr Q0QI+8MaLd5nAzX/Mdntpua0sPVISWaLsdPrwBJrlOXgKLlw3Y0iLFvVuATKkbwHlSebY87YZBp dONvzlq/qHZ9V6ObvjTY7PFAJzewyYB9fQ62IwNbf4rOr5OhiaF1PCXEWFn2rSt0dnZPZKiqa0s YS9msHPJngFu9M1c3LDohDh1/W71 X-Google-Smtp-Source: AGHT+IHAVSp/Vk9qJ+f8PZ/6Q7AR0sEr3gfMcHIuX2r0CcBzSrP/+q5OI9yk8z/9bJ0w2M+OjnH5dA== X-Received: by 2002:a5d:6c6f:0:b0:38f:2a5e:ec5 with SMTP id ffacd0b85a97d-390d4f43052mr2726474f8f.24.1740578633165; Wed, 26 Feb 2025 06:03:53 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba52bbbbsm23282825e9.3.2025.02.26.06.03.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:52 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 24296603EA; Wed, 26 Feb 2025 14:03:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 12/25] tests/tcg: add message to _Static_assert in test-avx Date: Wed, 26 Feb 2025 14:03:30 +0000 Message-Id: <20250226140343.3907080-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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] lets just add the message. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- tests/tcg/i386/test-avx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tcg/i386/test-avx.c b/tests/tcg/i386/test-avx.c index 230e6d84b8..43df2226b9 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 defined size"); void init_f16reg(v4di *r) { From patchwork Wed Feb 26 14:03:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13992503 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 C4026C021BF for ; Wed, 26 Feb 2025 14:11:22 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI1e-0001Xp-UM; Wed, 26 Feb 2025 09:04: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 1tnI12-00016v-PD for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:04:01 -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 1tnI10-0005jv-68 for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:04:00 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4398c8c8b2cso69757115e9.2 for ; Wed, 26 Feb 2025 06:03:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578637; x=1741183437; 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=ThH5BQgbHAmOS+UQy2wCG4a6AKm/DC+QNI57Vzuv2mA=; b=vcn7x9R7CFOC1/nGW0tBaRzt5Ic16agommM6MpU4orZ38uJkXhfWGFm1u7yl7vL+d8 M6nh7mddfG+s+UGEMTqO9qBQhlRmH7VPodkPOoY9mejBX0hAe5e0f8okor9TaeU10/8f i5ElWUPxZcvj02zKbLq6J2PlUNtUodyIoosfyfmy9HQnfEiu4IubkAyQm3kaGNklzdlb zC0+stQCcCey8QXn8RwzbxdJH4+Qf/ntqyiDZLKBI/Kn5zmk3t3JhzuG+OouB1pgqyqQ yGHDdh4nQ2wR0I5qrpsFv5YEXwvzT1ZPEapzxLfB/W6YOTA5DeWkwACCrUlMnw8FEYCb z78w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578637; x=1741183437; 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=ThH5BQgbHAmOS+UQy2wCG4a6AKm/DC+QNI57Vzuv2mA=; b=bOlZW8VM2iqh1obBlbG3obQ9OSzp2R30UQKgmIt1vZPfMY/Dgpk+sR2HopJtgBUFDk HhCIjMx23ldJAIrhl2feuPTlkJHocoGMIC3W4DJ6WlPf8AUsyI0fS6QY458Y5ltPFn4N GNC1WDJsUqsmetBHHjsLpzP73ZpvQc4aNv0Q2xtzP032wACrnxpL35EA0vAwm7I3DTCY 3X/OKzSIMzEdV/cmpcM0esGrSXsmu2K2LnyKGmwm+5BHjb09o1gbO6F7KNCVfAuKIMbH nI+0W66Lxusy08gn24qlx5snWzHR/UvXDpEI4fF3VOvu1zaKtSguAwDgmmdsHKrvhC3W n11A== X-Gm-Message-State: AOJu0Yy3iPdKvIgDgFGTMkBoKfdxzAQE+bzoz2hxbs973qG4WjK6UiT+ PV4YLfjAtxicnrPTTO9sqbxmNbUnq1wD9HrQUNtE/h7M2zOkTr7567XodRzF+r0= X-Gm-Gg: ASbGnctT9YFrns4mfl12CfDESXI8bchv3yea9g/V4jrS4qRQv93jRuFscdsoxfL62GW ShSrhHqr7I8CJW2JjRmGj0q7xfe2L7l1duK/m2xYDKfNtbcEbmX1WaJXhNkLa2hC+94ZZ+EETh3 m2xVWcQSGuAQHn2GiQJhrHgCT4XL25I/VuHSPSm6KQRVZMyxj2olMNncSzYflhAnng1KBmoFlX6 Ptoug8rzl5rNd5g4c8pi571pBdTsk2b6B6uvp2/eEcsArH6u7BNT9B8wzec+wAz80KAAtAZLw01 pjdPwXaZ2zNmeKmGB/dD6GM8Ox4g X-Google-Smtp-Source: AGHT+IFFNlhkw3kzVazdTaS3EZM4YWxJWGMoAB/2aOLRU0VRtSXmkLsvO3HWriiFXTOsZ1qMWEqvOQ== X-Received: by 2002:a05:600c:3d19:b0:43a:b186:8abc with SMTP id 5b1f17b1804b1-43ab1868ac3mr73031805e9.2.1740578636516; Wed, 26 Feb 2025 06:03:56 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba57145esm22493425e9.30.2025.02.26.06.03.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:52 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 38416603F4; Wed, 26 Feb 2025 14:03:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 13/25] tests/tcg: fix constraints in test-i386-adcox Date: Wed, 26 Feb 2025 14:03:31 +0000 Message-Id: <20250226140343.3907080-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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 Signed-off-by: Alex Bennée Suggested-by: Daniel P. Berrangé --- tests/tcg/i386/test-i386-adcox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tcg/i386/test-i386-adcox.c b/tests/tcg/i386/test-i386-adcox.c index 16169efff8..b56dbc00f2 100644 --- a/tests/tcg/i386/test-i386-adcox.c +++ b/tests/tcg/i386/test-i386-adcox.c @@ -28,7 +28,7 @@ void test_adox_adcx(uint32_t in_c, uint32_t in_o, REG adcx_operand, REG adox_ope "adox %3, %2;" "adcx %3, %1;" "pushf; pop %0" - : "+r" (flags), "+r" (out_adcx), "+r" (out_adox) + : "=r"(flags), "=r"(out_adcx), "=r"(out_adox) : "r" ((REG)-1), "0" (flags), "1" (out_adcx), "2" (out_adox)); assert(out_adcx == in_c + adcx_operand - 1); @@ -53,7 +53,7 @@ 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"(flags), "=r"(out_adcx), "=r"(out_adox) : "r" ((REG)-1), "0" (flags), "1" (out_adcx), "2" (out_adox)); assert(out_adcx == in_c + adcx_operand - 1); From patchwork Wed Feb 26 14:03:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13992493 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 87546C021B8 for ; Wed, 26 Feb 2025 14:08:40 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI1a-0001Pp-IM; Wed, 26 Feb 2025 09:04: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 1tnI12-00015M-0U for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:04:00 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tnI0y-0005iq-Qu for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:59 -0500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43948021a45so59956985e9.1 for ; Wed, 26 Feb 2025 06:03:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578635; x=1741183435; 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=5BNemPe9wlDrqgAM6P13rVeo/N+AN387KhyfuJfKu9A=; b=n86RQzFIbECQbbsWpBFcyA5J3K7UWS5UvLgRC8pCrEQCKbjPTD3Ngdu+wkBlZBO2EZ fif9S0zcC6cN0Tni38FHbBkm81WK0DgBqsPshd3JgAxIcos6VUVJKq2bpPIAJjsczVlS SO0o3S/5YiBEuxi+VBeFWZ/eEsj+5TAOqf2u6zefMdbdEPDD3Rj3bXhHfnlPbiGfkYSV HOfB8iB2So7GU/rQ8px5pI5L6CGroYghWU73OISsVo6u5+2iSl1io9vnDxX+lAB2Ni6L WUPYphS3ox4oEnyo4RUSna4+dZxf8AgyC1CrO92EaWrtMqmFg+mEo7khFMpZh7UfFJrS tghA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578635; x=1741183435; 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=5BNemPe9wlDrqgAM6P13rVeo/N+AN387KhyfuJfKu9A=; b=eRSlD5YSpYOpwIiFnART+pP02l+ap+0hD5H6mnmgFEJfD3zPf/yF5lwXuaTcVicEYx msmGAUHNr+fusfVBS70DZieYza8Kf/6x8CDmuA/9FO2w8xb+Zi4/qn0Uq8IXjSyvSu7W HYz/gmhcgMhFids7onKo5j6y7cEMr2Wo5RANYMcE+Xdtj9ZTJyHmy9h2BJ/qf5iLp5oH J6HBchMvz3KcsrS4+PLAy7k9hzAGK9PSViwIbfczjATXzI3z3b8u+s6aA3L1ni/xqPgD 3jTWIveyR0B5FJUCK9sqmDSKUG7esUHnYg16TjNAypBkkH8S99zO6quej8wl4Qd02q/y Bw5g== X-Gm-Message-State: AOJu0YzYV9ivkpznA0QxGXjpqPZbfz/hlcoOEQ0YqUx8AuDR+0EZheXw YchVAseOD7J51A6mrS+AeHm3guO3Ns8i1T/MQcpDiWfGgwPmrYY+YHhqKcvwU8E= X-Gm-Gg: ASbGncuSWEITmKgqmzJgYpb6AbArEhF/Q/c2vWUHw0YyKSisjq5GM1KNoGZtIYcjPXt 4uvttZ25lSVoWarfRGTRCpw6Fb/P4w/V7mLjbfO+xlzsT+d5DpPDOUOI/jdXluCCoTKb3f7VlaF KQSTg1UKv4qJir1pOJq8yK9J4ls+D8vmX7cJyCCDZwlzlsvEYLXlVu7HWcIARAJZgI2lE7UaZAn uTdnGcDarmCsxlaEwtqJFmMINh31d1UzOgpvMTay5eNkaN4AoLyefebzOsusaME1JQ57OEGPBNy ER2k8t349fTd4geTB41QPZzX3QE/ X-Google-Smtp-Source: AGHT+IEpA9WUnuiSyFwlj6mIeSqMthiIy5xrUvdcSYXriEO4NOyos4Gl6R3UEVHo0fohPqm9cJq8cQ== X-Received: by 2002:a05:600c:4f86:b0:439:967b:46fc with SMTP id 5b1f17b1804b1-43ab8fd73f2mr29573115e9.8.1740578634856; Wed, 26 Feb 2025 06:03:54 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba5710c2sm22311775e9.32.2025.02.26.06.03.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:52 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 4BC05604F0; Wed, 26 Feb 2025 14:03:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 14/25] tests/tcg: enable -fwrapv for test-i386-bmi Date: Wed, 26 Feb 2025 14:03:32 +0000 Message-Id: <20250226140343.3907080-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/tcg/i386/Makefile.target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index bbe2c44b2a..f1df40411b 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -22,7 +22,7 @@ run-test-i386-sse-exceptions: QEMU_OPTS += -cpu max test-i386-pcmpistri: CFLAGS += -msse4.2 run-test-i386-pcmpistri: QEMU_OPTS += -cpu max -test-i386-bmi2: CFLAGS=-O2 +test-i386-bmi2: CFLAGS=-O2 -fwrapv run-test-i386-bmi2: QEMU_OPTS += -cpu max test-i386-adcox: CFLAGS=-O2 From patchwork Wed Feb 26 14:03:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13992489 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 580C5C021BF for ; Wed, 26 Feb 2025 14:08:16 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI1Y-0001N0-IR; Wed, 26 Feb 2025 09:04: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 1tnI10-00012b-Pp for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:58 -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 1tnI0y-0005iC-5Y for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:03:58 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4398738217aso59941905e9.3 for ; Wed, 26 Feb 2025 06:03:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578634; x=1741183434; 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=SQHi+iUIglkFs/MGd8Ifst4Un0l2N6GX9nCWbfT0OV8=; b=nj/5/nSRzht0aCvrPODiMekvs5VcZATNJ583WYAKG/CwpMLFeZdBhmqZenVAEDXsHO cQAXf+cx7m6DA5PbIjIsjYnOQNn3cSDrgJyyjflrZPBs32PsIm2wCNGu5bfPUAD++gMU mglXK7P/3Kxe2Hl8VINyYtO7QwzQ1H1rDumk1T1mVuFWohnnheqGxNGpd1HsmOxEcK1j 5lcx2eXD3LjWF2bcAGB2ru/BIDV2COJ54WWT2veg+mJmqHA2oTp7XSdUwecu56Yhs0Hn fQ/l7kYLhEgAVXub0RALJzZ2IZa+HMHxo/VjIJtrKsZTJGwI99ub14jLkcdpOYC398Nv j70g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578634; x=1741183434; 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=SQHi+iUIglkFs/MGd8Ifst4Un0l2N6GX9nCWbfT0OV8=; b=g1gIJea+c6132XI62/dtSKi7ee3BTMPDJTLr3U1bECluqPRA7E5Hwks+7x5KYZdiF0 sHVGTDvtjoRGLQoqzsXx0rmm3TM9gmx8nGg9TQiMPfCr+lc0kNuqXkUxTYI1ItDftyW9 SXWIuC8U2eube58Xw+BekIQif6V98pwoglWtRh9j2kD7ESE5YXoeoKSPm7SEDrq+to5T nTcXwMtcgd2d2nRwCbYk//hQDxzNwPJWPbpi6DA3n7wieybQMj3OSx5ewquxljSMx5Ia bNk5p0WOSuTFRRsDhchTLv5klAZw73tzqywMn/E11/zD3EJUt3UDac4xmmMJ0mxVHyG7 +NBw== X-Gm-Message-State: AOJu0YyCD92gthtg+3wD3fSyYqUeZEd2tkEykRQgZH/g4T3ytAAWQG/6 Frih8w/Il6vdguXX6nOrTFeJvwIimNsfaDTQdII3XXxZGqHKu/z8TFzy+2dPa94= X-Gm-Gg: ASbGncvJ1gihoLSO1x3Sp7JGCyPJ4sRjq+x1uYDar8aKICJQsliLShbnb0WBhQL+d4x ZkDj5710b2bD+ZW3FVkjWxBJ8YIuPSI+85SzAHXL/S039KRkzGDS8I/pQnKzwBZcKLjW9ndcFHK nghcuiok3nMP8Xa44c5nkKnX3Uy73Br6jzGa/5hoNPiZD0nQk2yPYmJypzniWQLGbCyiMuhFKTZ ob0Vo1x7n+yCpsTZujKlJ9kNM6kNTHpxIGCQK/EOK2WSOx1dZXDBbWM2g33VWW79p2f5AuPZQ79 jlU2voS9Zgo673Xd9LndU/+q4Cur X-Google-Smtp-Source: AGHT+IFPg/9aSNPq2Mz2ikmYiTTmX+v28SQH7KdZrf5AKkoHNFfHuSnr/eYRn16ezdoesGdpvlZycw== X-Received: by 2002:a05:600c:3b93:b0:439:84f8:60d7 with SMTP id 5b1f17b1804b1-43ab8fd8647mr33502655e9.10.1740578634004; Wed, 26 Feb 2025 06:03:54 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba52b591sm23363995e9.6.2025.02.26.06.03.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:52 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 6417560593; Wed, 26 Feb 2025 14:03:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 15/25] plugins/api: use qemu_target_page_mask() to get value Date: Wed, 26 Feb 2025 14:03:33 +0000 Message-Id: <20250226140343.3907080-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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. Signed-off-by: Alex Bennée Message-Id: <20250225110844.3296991-2-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé --- v2 - use the proper qemu_target_page_mask() api --- plugins/api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; From patchwork Wed Feb 26 14:03:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13992506 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 8FF11C021B8 for ; Wed, 26 Feb 2025 14:12:38 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI9B-0006fU-48; Wed, 26 Feb 2025 09:12:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnI8e-0005Rh-Gj for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:12:01 -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 1tnI8b-0007aD-02 for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:11:50 -0500 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-38f325dd9e6so3628566f8f.1 for ; Wed, 26 Feb 2025 06:11:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740579105; x=1741183905; 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=fuqYR0pzDjdy/vyGlSpH8HOM+UQ/7j7Yz2MNCfS9jD0=; b=CRTv6jGwcVOcFhb7e+kixVY2ru8fgiwegX4zJVs53vmzXrmU1OOsYeRmvEFfdgOZT6 G2IxmsmHO9fhJE+3bnRaDR7Ry1vv1eSdpNxZDKBz2K1raA0G+mjOSMPmySxRjkdQ+oIL OIOCPUXmuujaPjVd256yT8i3jHKoT4cPx7GsLl4r7mURE9+0FwNjKy7Tn/+vgd2efk/w sxJ57i8v87ayid8FauWULwk9FQ7jx54OBMgLyq6rRnrmB1KmMOKyTVuVwJf1+aWQwpvo iS28x0d9fxTneHrgiPJaQYAwc0hAHbq9EecvYXBvvctTROl7JrBPv/ji7nRVP7nj+xEM cxmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740579105; x=1741183905; 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=fuqYR0pzDjdy/vyGlSpH8HOM+UQ/7j7Yz2MNCfS9jD0=; b=aYDHgSQY42dJ9vfxrdNDCvFL8Oenlrv6uFrXo3TkpXNgJwKSzao5G0+++JNWAGvpDk xWg2hK5KNAmnAWoCaqv7cf59KcgCNLYYoSxTL2b1wNNDXWRmoi4eWgkGpKEevVsCxFm0 LzQNKYA9qEtT7hviEkXUCQGtzdJMHGMtzDbza0QL/HyRSlOVQAezB/EErDUmX3Lz4EK3 3FMhQ3edKpb+S4u9PW3erlTlZRO+JFKnKRVoZM7RIdLF/5XLBzGjEtIeM0KqTzOSk6Rx gOzUvmZ4x95UioQ3tEVbqVFTPiWAZqZ8i9BbpyHipt5WXRalaWf99sJ8momedm0dGqP+ 9isw== X-Gm-Message-State: AOJu0YyurnLKkSkFY70brUEKY437iOBopKd638TLO3A/PyqDeftVfeyg aubf9ihFX4ajLojAoOqDd/Dz2yomurNTh67goF7EgBjpoTx7N0tmjapNtoh+AsI= X-Gm-Gg: ASbGncuHhc5QsPA9EY7h75hiySL4M0w3MX1fq5HFOdWVTLOW9xtIKCLS+Z9+xL85gsx aYLzQfuSMUbcXC6tFYQIe6t5FVk5ecPr6sZOMmAf6U2i+InKDnpUrLobDUupx5LpJTQ7BgWHD84 gncHqRXf+vunD+d+baCFRnjCD/5lFvX35E1U8KXCsm4VTxzS9MkksR7I4NKwMFdKYRCJI+tjMd0 TzlQH8rzGsyzUemghiltcqM7y43CO+jsmMr00WeEp9BXI+RQ8XmBYQun2mwO49Z3dfXVwlZLDVB Ja0T8wsgaoblJ3KhnMevHimeKx01 X-Google-Smtp-Source: AGHT+IEmzqR4yIfka9lOETpiDzckm1tWP2Y18QUXSLtp5vMiS3CsE23MxPF1Mz98RTU22xNbxa1xvA== X-Received: by 2002:a05:6000:2a9:b0:390:dd1c:45c4 with SMTP id ffacd0b85a97d-390dd1c4886mr1650668f8f.12.1740579105275; Wed, 26 Feb 2025 06:11:45 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ab2cb1063sm33164325e9.2.2025.02.26.06.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:11:42 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 7972360605; Wed, 26 Feb 2025 14:03:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 16/25] plugins/loader: populate target_name with target_name() Date: Wed, 26 Feb 2025 14:03:34 +0000 Message-Id: <20250226140343.3907080-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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: <20250225110844.3296991-3-alex.bennee@linaro.org> --- plugins/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/loader.c b/plugins/loader.c index 99686b5466..827473c8b6 100644 --- a/plugins/loader.c +++ b/plugins/loader.c @@ -297,7 +297,7 @@ int qemu_plugin_load_list(QemuPluginList *head, Error **errp) struct qemu_plugin_desc *desc, *next; g_autofree qemu_info_t *info = g_new0(qemu_info_t, 1); - info->target_name = TARGET_NAME; + info->target_name = target_name(); info->version.min = QEMU_PLUGIN_MIN_VERSION; info->version.cur = QEMU_PLUGIN_VERSION; #ifndef CONFIG_USER_ONLY From patchwork Wed Feb 26 14:03:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13992504 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 D676CC021B8 for ; Wed, 26 Feb 2025 14:12:35 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI94-00069T-11; Wed, 26 Feb 2025 09:12:18 -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 1tnI8e-0005RY-FY for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:12:01 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tnI8Z-0007a3-6B for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:11:50 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-390dc0a7605so369010f8f.1 for ; Wed, 26 Feb 2025 06:11:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740579105; x=1741183905; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sxlbdGkJ13G1o6ELtDmgQA5UFhIUKmW1fQAOczDQAMQ=; b=HirU0ZBvm0G77HNQpEciENliLb1CKniSccK46oBmA8gPer9TofQzyLm2eEGYtsNYvo 5WcDzxMDDeHdJJZxlkYvtpq9L0RBHNaT9CDPHLg1RKe+Bf9qPMlzenlVQFmFdFyDmooO 4POH+a3PuY+NDZhJlfl9IhRaSA08XiIwjL+ezJIdm7sBYBa7ri8yuuFPKJH7bvR2G1w5 XXkBmD7CwrjW1r9gjaYdl82UHotAedsheBMU8DXOzrEItYKw08iyfIhVTKaexj2F27Ze r+0KX2DUmlTHdumb70GeWA6Tq8Eh92oO38BUWoJCuoXYALH3jsmRpzztEjljZO6JTmrB x1oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740579105; x=1741183905; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sxlbdGkJ13G1o6ELtDmgQA5UFhIUKmW1fQAOczDQAMQ=; b=VYcw3EZ5eglJhI3xUxX3l0iDBmX1ijYYxuV+k3rb6oBdj884BBlqTPdmX4gJieOkCj qRnx2fBd9rwqZsiLx7+sXjPwZsJX7Dr/LJ7YVAkCStjNH2OZC8WqBB/l/TCZ9JchDOy6 egmAB97XnsEu7wDaD3MZhI43ZbZAxjVjqZMh12Wpu5JwzfpaTQNqlckjxVvBgH6XOiWV OGpnJ15K/N9qqaqLo1Y13feRYwkr+tQA8lx1tE22AF40H06qeX6aHpU+dHnQUi0MIi45 BTyeLUVrAG4spU+6Ed8WtW5ZMSt6pESSb52fkPalOlRemTa4WI+aVRE/hW+bU5M3Vxrj vTIg== X-Gm-Message-State: AOJu0YyC+B2UxJoob+9MFXwlNchMkz9ug0Hi8SPCQHR3xmQ2k2HiPfH/ RaL059NjX4OEPoI4q0VxxawffPhL1hPw5kzIfwHcuPOMspnyT1eAj8lbRGkC4R4= X-Gm-Gg: ASbGnct6kQ+2S43fqvSdAEI/p3WqmI72xrwTbh1LPGdeyTmWyrP265JCldm1xoojH9o EKL+D3dK17na1aZE8r/mYxasoXOveK7fsAAIGjdNq5sfPYzYL7vYIBdInszuPhkTbCqGMJKqNJn twqb1EXweap9P1hh1M9gixFet1K/TQsOBQzPGiHYogSppAUY/N9uu5agIjS374XA+7oAioPuR5Q vYaCHVoMJ9mIA5sk8pCVIyRUJduXyqpvU3QvIOy56xO6ED7KMW1hXf6UIWlbm8WMjYltUH70g2D bKfOILw5MA7GkbDSoAh57mzyAC6r X-Google-Smtp-Source: AGHT+IFT0IUg4cpty4YVRdJ4aIpaQ9yNJr0bPVGBNJb7rqWbKpLHerqXFpq5IfNsMy0IiYJlPcRU9Q== X-Received: by 2002:adf:e912:0:b0:38f:24f9:8bac with SMTP id ffacd0b85a97d-390cc60c1f9mr5815480f8f.23.1740579104605; Wed, 26 Feb 2025 06:11:44 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390d6a32299sm2210236f8f.55.2025.02.26.06.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:11:42 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 8DF925F924; Wed, 26 Feb 2025 14:03:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 17/25] include/qemu: plugin-memory.h doesn't need cpu-defs.h Date: Wed, 26 Feb 2025 14:03:35 +0000 Message-Id: <20250226140343.3907080-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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: <20250225110844.3296991-4-alex.bennee@linaro.org> --- include/qemu/plugin-memory.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/qemu/plugin-memory.h b/include/qemu/plugin-memory.h index 71c1123308..6065ec7aaf 100644 --- a/include/qemu/plugin-memory.h +++ b/include/qemu/plugin-memory.h @@ -9,7 +9,6 @@ #ifndef PLUGIN_MEMORY_H #define PLUGIN_MEMORY_H -#include "exec/cpu-defs.h" #include "exec/hwaddr.h" struct qemu_plugin_hwaddr { From patchwork Wed Feb 26 14:03:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13992509 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 C0B46C021B8 for ; Wed, 26 Feb 2025 14:14:18 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnIAu-0001Co-1c; Wed, 26 Feb 2025 09:14:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnI8e-0005Rc-FY for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:12:01 -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 1tnI8b-0007aP-0e for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:11:51 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-38f325ddbc2so4951130f8f.1 for ; Wed, 26 Feb 2025 06:11:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740579106; x=1741183906; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4NyoI+xGCkLBfsyhs9LhZ95ONl5hcFB5ViM1AJoAqTc=; b=J5s26S+osGVZWOccXmiLJk6IXSNgFEJJjOP1wPdfyWGOaVPnPMvKoC/Y+0YW8xxXDR YCNUR/luhpS4M3BvpPPJQyc/ozFwn70IgW9CV9WAFNXgNskKv1p6221pm3D6AHyaJM3Y HzEaolLlJ04sbgh0JWjUaDRrpm9IvAb6AEj8HHLUbJs7+YXgFENimxtwh6F0nkJRwJAD UHqbJCMECKlqDph3b43LfhlwmWvw3Q20bewgPEN7kI0I8yxa+7ssin0ZCpA7x7aU6JlZ tavKJOj6nJg2dHHkb2vI6YNb2sLyy7RFLOvnZq1y7SryD83VbOk+xONHR1MzMR4FAQWw azFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740579106; x=1741183906; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4NyoI+xGCkLBfsyhs9LhZ95ONl5hcFB5ViM1AJoAqTc=; b=wO4FO6TKamnhSVIjVN+e72QcU2U+cFuoKoLFi6hl8M5XpktCB6PCq5gCBw4kJIaiep MKYigAB40uDeXbJWFL1FoeZb5l//xWeFr/0D9xBK3DOXxxuwrMnabeJL7uQZ6tVA16dW qSsdYZ3l5QDhym8ozs1iAex1Kqx37sGZY+po8JMNUG6Ipepd2UIwt3BYv9aZeYkPxNbX G52GrPSutcA1bTOI5mfs5WN/jrolKG5wOLWupGvpsBaNaCgueGrHDR8wxKmRLhYB+u5f ndhml/SfnVJgbpw/hOY7EVLVGHgvuoqBc7EXSN/1aoDOdR9Fe0HUYNFCrnoSabT5AxLP FA0A== X-Gm-Message-State: AOJu0YyHaF9zYi2m2etwdTAK5EU7OuWmoovYUB1d7SeJ86MUfUgaApI/ 3SvHHD8mcE1eGp8FrIJD9oFGc5fPEEmwUx8j2VQeco6kvHgEOtDdOk/pYMmJEqU= X-Gm-Gg: ASbGncuGzXbv+dkse5z6hVlDu8ZSABiVvkqromaGS6VvP6RFoudx1k5AMCf0z4odxEZ JXbqjHeILHgJef61fyQmLaIo9UpD3JggIvcL81+I/zO945+Uy2T+r4fX+rDjmy3fvTZUa9FAkDO RPfZbE45VX4yepEU5bAAXeXBSxZBAGEMVamVez/LRfR3RSd4mrw8w2ey6Gh5YlI3BdxRqQZUGJ6 sziJTkqDH4ueVxEbISl1n3+8duKRBXVak3JdYu4vIt3KzClebpl4PPX+59Q3/fEsO2GScG8+yvt gWntA571SBuMRjebbFi6H7EgxBRC X-Google-Smtp-Source: AGHT+IFxNELsls3sumnBY27mPCqDSaPL5EAYDn0T+3jPurXwp6kQ8SYsZejxK6xU4mQSFDypCxs7jw== X-Received: by 2002:a05:6000:401e:b0:385:fd07:8616 with SMTP id ffacd0b85a97d-38f7023e7abmr17955383f8f.0.1740579105933; Wed, 26 Feb 2025 06:11:45 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390cd8e7322sm5923166f8f.64.2025.02.26.06.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:11:45 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A633260624; Wed, 26 Feb 2025 14:03:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 18/25] plugins/api: clean-up the includes Date: Wed, 26 Feb 2025 14:03:36 +0000 Message-Id: <20250226140343.3907080-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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: <20250225110844.3296991-5-alex.bennee@linaro.org> --- plugins/api.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugins/api.c b/plugins/api.c index fa4d495277..c3ba1e98e8 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -39,9 +39,7 @@ #include "qemu/main-loop.h" #include "qemu/plugin.h" #include "qemu/log.h" -#include "qemu/timer.h" #include "tcg/tcg.h" -#include "exec/exec-all.h" #include "exec/gdbstub.h" #include "exec/target_page.h" #include "exec/translation-block.h" @@ -51,7 +49,6 @@ #ifndef CONFIG_USER_ONLY #include "qapi/error.h" #include "migration/blocker.h" -#include "exec/ram_addr.h" #include "qemu/plugin-memory.h" #include "hw/boards.h" #else From patchwork Wed Feb 26 14:03:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13992485 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 0F458C021BF for ; Wed, 26 Feb 2025 14:06:35 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI1w-0001sl-DM; Wed, 26 Feb 2025 09:04:56 -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 1tnI13-000176-7h for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:04:01 -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 1tnI11-0005kE-1L for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:04:00 -0500 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-38f2f391864so3910702f8f.3 for ; Wed, 26 Feb 2025 06:03:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578637; x=1741183437; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3MUzqz6FU8Y/M1Y0uPwJOCVPftv09cieoqEpBt2LY4U=; b=xz6O0gKLw/VXIgarrIxeeO+DihB/0DDA8ZOE4267oykmDm+siJuCrvA2XBEHpF2rz5 cE0+N1J6DTDsPmehD4WgzWbvU4rwsDkyptC3+nBv9ms3lP0lC0j19Pn8kzuJctNuSGbn T0Oz0cL1kd3KohaXJGAjqnXl7RcSIVDeUrMUhdqDfDXPjYbeooJGlcA7nCwC1sep4qWQ TugNQ4/S4t+amGh9kGRzDjSX/wiXAI8vpO4gGtbTwRkvh8gP77obcTCkk/xiuNXseVVW qomX969MIwZc/ZFWhkJJMSoThg6EizUM4Vn4Zg7k4YSXB7Z8KA6MjgPF0u3h0AzhuyKy Ydww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578637; x=1741183437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3MUzqz6FU8Y/M1Y0uPwJOCVPftv09cieoqEpBt2LY4U=; b=MdBDh3nHLlmpBp79JyMNcWOqkrQCOCZbGmhz8/ZWS33633Cgn4AKGhmbK26YdZ+qsX ekK8G9nnCLSbiT+q5FevmxPi+3MCpqEzNhXwLj/L/jhJ1kzhs1aYd8p/bldky+C5BQz9 6dnk8vQHiGeMK3RtOznFwqZt997UjIDXFh5YiV4yc1yYqiiUs+U0Uvzh2PkYX/Il2tqP Ls8FvyXQRLoV46POqZA+HnA/UvZLl+UN8srtOBtOV1BuQyR7YnQuIeIgGfMz1ZzCgTax 6/juuU2f8TdDYvOWy+3aCWl36n+vPiE8r0X0Xyv0ShIbZFYUafpgNSKWQ6JyBklyG2d0 /qLg== X-Gm-Message-State: AOJu0YxER+rBcj2C3YsgTLO3xM+FwbLr/oAts+C5rU+gtPtqiDG/pz1i HlixpT30PbdaAh3p2qmNPm5nFgxM1v6wwdVeM2vCGQP7WH5oQv4iCuGebhYl3+s= X-Gm-Gg: ASbGncvopz6cvgqcDf2KVF/Q4Mk468Wi0b1/PmAayNgAvPw575AT+edHuX2xgiiIZCP 2IyLF+k7EernDiwMU2d7xbKftR9AjgmPeKrti+SkZLSAb+nH1VJjxcvsP0BWtTnRRaEpMYtA9jl UiJSjZw9QH1YF6gYVF3fKCPGnZLQHfwp1DoYCcXHx/YYb4Hmh4TWraFUF40C/Hmz3BdbyogNz7E QpeflE7Ik0QowJj3StTNW6zXe4f8nlZIvSVXnxfnPTcC2ZGMnMblK77X1k8XbOrxGAQ+l3jVH2V UwGjZ5iTD4zs32WyO564lJNuQNzC X-Google-Smtp-Source: AGHT+IEUcvdw1IaTUoKCYFEgx5PnlVjkTybddnFs1rMJ9kJQcWghkz9g9m7ZnxN31fMdFuSJxA641g== X-Received: by 2002:a05:6000:1a85:b0:38f:2403:8e98 with SMTP id ffacd0b85a97d-390d4f3c49cmr2884906f8f.20.1740578637431; Wed, 26 Feb 2025 06:03:57 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390cd86ca0asm5841115f8f.32.2025.02.26.06.03.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:52 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id BBF8C60689; Wed, 26 Feb 2025 14:03:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 19/25] plugins/plugin.h: include queue.h Date: Wed, 26 Feb 2025 14:03:37 +0000 Message-Id: <20250226140343.3907080-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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: <20250225110844.3296991-6-alex.bennee@linaro.org> --- plugins/plugin.h | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/plugin.h b/plugins/plugin.h index 30e2299a54..9ed20b5c41 100644 --- a/plugins/plugin.h +++ b/plugins/plugin.h @@ -13,6 +13,7 @@ #define PLUGIN_H #include +#include "qemu/queue.h" #include "qemu/qht.h" #define QEMU_PLUGIN_MIN_VERSION 2 From patchwork Wed Feb 26 14:03:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13992508 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 61861C021B8 for ; Wed, 26 Feb 2025 14:13:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI9p-00005V-RL; Wed, 26 Feb 2025 09:13:11 -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 1tnI8e-0005Re-G9 for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:12:01 -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 1tnI8Z-0007Z8-4M for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:11:50 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4397e5d5d99so43528885e9.1 for ; Wed, 26 Feb 2025 06:11:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740579103; x=1741183903; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7NduONkNHzryA23734KniKbJ3709Oe6o9/gEpRh5YHc=; b=u1gi+6mkRmmi7OBSyZg2bxAQkugnQQ71KYvl/DwxC0sKKM49YbOBJjsLl8h+UJrCmg DT1Vf5SiCVVl63SFay4nuGJQHyZrthELFLrJmdKf7WeF5oUIQSHjpveAhBnwL/fMSSsV DUPSFJ7+iCzZYLgaRGfDKPweJjRHbgchWYcIsMKQgrh4MZSK4i6Z4y7Rvahc18bhFptw j/91l9MpbBGEWI2BjZ5nucKSIKVPTpWpmI0Xqk0a52CsfarsTd+O7qBbvg0regaTQk5D KW6zM/a5UlZUjJAP9trWUsQvH43qnEL7P/Q4GgVd+RWKZ9ee77Hn68+fflPqhbGCu8M+ 4PkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740579103; x=1741183903; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7NduONkNHzryA23734KniKbJ3709Oe6o9/gEpRh5YHc=; b=HYB5EvSW1VcoeQE4u97sNI1xQ0a/DfSLOkYiZVPs2WEFkybzyqWqWpks6a+hO0mwbJ BzJfQ1nI8XDf7UPSzkxw56vrKnw6wBo9dUJmdGycpRd/rIcrbLTVOdhlyos2mGyT8ohK pBq43WiTE7alBR8rJqEPzk0ElnuY784VkotI27358sWNhNRMfJoDUBECMImBRy1C8vl8 1/0rlP+vymElh26eYmPM2HMgzll0MvFqKIJ8WMCxP/WclvvsldGYijrXxvC4CPBulq6O Yvohat2TgiEoT9/musxN0OrOvnUQScrfxsaFsIzk52NNOYHJeLJx2N7r29HWTSuXCByL Zc+w== X-Gm-Message-State: AOJu0YwnTO0YQuc0kitZPKSQyzITLSgyLpd3xQCFkMoTkiGE4TWvY0A6 vyR72Qk8Sxv81gShRA/aPX3WVBwCnpi4BwAq9+97G1ElLIIRkDC4vsL4bB91uGg= X-Gm-Gg: ASbGncsoLK9cjejFoWbH2vBjEnIyrsN/DH+qYsw1A/M3uiC9Ezgtxor1FQtaqhNQmv8 H/OOohuwPu3533MspKqQeO86qqxx51ITWQOdTc8mdQngVr2vT9+3hNZ9NkVXUgNruHFXLx+dmQ7 MKgTteyHWVkBRJncSVd/Z7Z6+1P/4ikcWAkEghWEEDauhIRUighEh0ne8AzWjVHddktCt45kMbK fm4p42ho+bAZ2PamuBp8GB35R7bG9Ab+vXQcuJ/laRxWn2TGYxGFRVu3raRGOx24/TVJ3vk8KLv NfglrWpZz/JcIdztNh9V+1ynv2JE X-Google-Smtp-Source: AGHT+IFrQcjmbOw6dSRCjQJxBYsvNcSnp22Xn4NpDOzqFMlr40EPPbe18kn62r72W0EnjMtkyVLhWA== X-Received: by 2002:a05:6000:1864:b0:390:dbf5:407b with SMTP id ffacd0b85a97d-390dbf541d3mr1600486f8f.28.1740579102813; Wed, 26 Feb 2025 06:11:42 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390cd8e70c8sm5673538f8f.76.2025.02.26.06.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:11:42 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D869D606FE; Wed, 26 Feb 2025 14:03:45 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 20/25] plugins/loader: compile loader only once Date: Wed, 26 Feb 2025 14:03:38 +0000 Message-Id: <20250226140343.3907080-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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: <20250225110844.3296991-7-alex.bennee@linaro.org> --- plugins/plugin.h | 6 ++++++ plugins/loader.c | 13 ++----------- plugins/system.c | 24 ++++++++++++++++++++++++ plugins/user.c | 19 +++++++++++++++++++ plugins/meson.build | 7 ++++++- 5 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 plugins/system.c create mode 100644 plugins/user.c diff --git a/plugins/plugin.h b/plugins/plugin.h index 9ed20b5c41..6fbc443b96 100644 --- a/plugins/plugin.h +++ b/plugins/plugin.h @@ -119,4 +119,10 @@ struct qemu_plugin_scoreboard *plugin_scoreboard_new(size_t element_size); void plugin_scoreboard_free(struct qemu_plugin_scoreboard *score); +/** + * qemu_plugin_fillin_mode_info() - populate mode specific info + * info: pointer to qemu_info_t structure + */ +void qemu_plugin_fillin_mode_info(qemu_info_t *info); + #endif /* PLUGIN_H */ diff --git a/plugins/loader.c b/plugins/loader.c index 827473c8b6..7523d554f0 100644 --- a/plugins/loader.c +++ b/plugins/loader.c @@ -31,9 +31,6 @@ #include "qemu/memalign.h" #include "hw/core/cpu.h" #include "exec/tb-flush.h" -#ifndef CONFIG_USER_ONLY -#include "hw/boards.h" -#endif #include "plugin.h" @@ -300,14 +297,8 @@ int qemu_plugin_load_list(QemuPluginList *head, Error **errp) info->target_name = target_name(); info->version.min = QEMU_PLUGIN_MIN_VERSION; info->version.cur = QEMU_PLUGIN_VERSION; -#ifndef CONFIG_USER_ONLY - MachineState *ms = MACHINE(qdev_get_machine()); - info->system_emulation = true; - info->system.smp_vcpus = ms->smp.cpus; - info->system.max_vcpus = ms->smp.max_cpus; -#else - info->system_emulation = false; -#endif + + qemu_plugin_fillin_mode_info(info); QTAILQ_FOREACH_SAFE(desc, head, entry, next) { int err; diff --git a/plugins/system.c b/plugins/system.c new file mode 100644 index 0000000000..b3ecc33ba5 --- /dev/null +++ b/plugins/system.c @@ -0,0 +1,24 @@ +/* + * QEMU Plugin system-emulation helpers + * + * Helpers that are specific to system emulation. + * + * Copyright (C) 2017, Emilio G. Cota + * Copyright (C) 2019-2025, Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/plugin.h" +#include "hw/boards.h" + +#include "plugin.h" + +void qemu_plugin_fillin_mode_info(qemu_info_t *info) +{ + MachineState *ms = MACHINE(qdev_get_machine()); + info->system_emulation = true; + info->system.smp_vcpus = ms->smp.cpus; + info->system.max_vcpus = ms->smp.max_cpus; +} diff --git a/plugins/user.c b/plugins/user.c new file mode 100644 index 0000000000..250d542502 --- /dev/null +++ b/plugins/user.c @@ -0,0 +1,19 @@ +/* + * QEMU Plugin user-mode helpers + * + * Helpers that are specific to user-mode. + * + * Copyright (C) 2017, Emilio G. Cota + * Copyright (C) 2019-2025, Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/plugin.h" +#include "plugin.h" + +void qemu_plugin_fillin_mode_info(qemu_info_t *info) +{ + info->system_emulation = false; +} diff --git a/plugins/meson.build b/plugins/meson.build index d60be2a4d6..f7820806d3 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -57,8 +57,13 @@ if host_os == 'windows' command: dlltool_cmd ) endif + +user_ss.add(files('user.c')) +system_ss.add(files('system.c')) + +common_ss.add(files('loader.c')) + specific_ss.add(files( - 'loader.c', 'core.c', 'api.c', )) From patchwork Wed Feb 26 14:03:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13992505 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 66E36C021BF for ; Wed, 26 Feb 2025 14:12:36 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI9E-00072R-Cp; Wed, 26 Feb 2025 09:12:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnI8j-0005TY-O2 for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:12:01 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tnI8b-0007Zr-0C for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:11:56 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-390df942558so215770f8f.2 for ; Wed, 26 Feb 2025 06:11:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740579104; x=1741183904; 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=nv4cWAHWB9xQpiEKQ5DeC2E+zGIYJrWZQFyDlGzpbvA=; b=za07jxZnoyrXCHFYusF90usgvXkf1yjFbX3+2WA1ND2+ebk5rnZTggwwdOlF3au1QB i95MZ6VMatuM445jqQPGgtPGiD5gnRrBfm3YU1rMbI8L+9yMKHGpTJJWq3duFOvnZaZ3 f8Die9GJYrwicLfsc1qgDXM9En5gix1kJKEPFeZISxFEFI8jj2RD6AG+MBTG6EUXQs67 yQDf9ySdqpSGYS9EazQ7MWTG5KN8Yz+FG6akF+qPezJ+Ncz/ranjXPMcjEE5AEU+/u3Y MAdkAhGHwDfwZjZy0PBDgQvsEKjXJ5GXAKCkFFVtWryvO+opkiaKc1uU2ryNgMfaifqn RLqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740579104; x=1741183904; 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=nv4cWAHWB9xQpiEKQ5DeC2E+zGIYJrWZQFyDlGzpbvA=; b=lp87I/1xn1bc41dj7FUEHKR7EUJo2U61P796+jUiFrNJ/RCqUPdu/mAEG3zKHaFrcb I6XGqei23xA6C8PTCtoKL4BA3yv7wb0LsJuVqUDJHkLMWPwtuSTY/MSLG/4lqjQKFSvz 9vFIxGjcMmqmlVoPNRfvUPTDuvfEr0h7V1NpviUyeLcs9KWNOZL0kCoQ6pposmGNqZ0t C2oA6RN7xzFtFox0n2UmZEyYUCrDHyNAqyk2v9Cre3weIpojP4qxIu7ICjQVjjQIU0Qw 21sP/a3yMRhkYQg4OKN4O6fxYaSMdzEoGmQUgWucIXZFk6foxPtZUOMo1CUeDSx4fuew cjWA== X-Gm-Message-State: AOJu0YxcffsolFyGW3GFz6bnuIeYtsxb9BdpgXN+SzLFknHaRUejOM2i C6G9DxvNHBb02d4tP+axpW3jlkXPnw36x7ne9VossQMvb1/h/PEHOIy4yivH4MA= X-Gm-Gg: ASbGncs/1S3ypsgg1LfkQtKVsUmlfwBOITG46zeF8swza1hMNIMbhJjoq5VFGn10vNF n1Koh5vCGYCJlEW2rHJ6yjY1O/eTgZANi5gLX26IBteeMvN2D17taVhhE/hYJtt81maqOqIUjzm qIQyuLySgozBfsh1IbU6aGJPzZ7gH8yMdfCO4puFPwhyGt8PDxLiyetqK1KqUA4Ge6cHrqNDJB/ 4K4LgT2f/XdYcwOY9z9uhnWldH6x/rgJGO6w9fN0c8NDalSdHLfJhitOOVG8uutr0BX0VdGnN9P E1+ss5tEsKP8p/VrqazQd0RmTrwr X-Google-Smtp-Source: AGHT+IGzCB6oDKWLI8Xt9+/CdQ9g98wMCWns3l4CmvPFvF94InIHtUuzbUjZCOcQd/MpLpI0Q8V0NQ== X-Received: by 2002:a05:6000:2a7:b0:38d:e190:b713 with SMTP id ffacd0b85a97d-390d4f8b3d5mr2990252f8f.37.1740579104013; Wed, 26 Feb 2025 06:11:44 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390cd866f0asm5746817f8f.12.2025.02.26.06.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:11:42 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 033E260794; Wed, 26 Feb 2025 14:03:46 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 21/25] plugins/api: split out binary path/start/end/entry code Date: Wed, 26 Feb 2025 14:03:39 +0000 Message-Id: <20250226140343.3907080-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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. Signed-off-by: Alex Bennée Message-Id: <20250225110844.3296991-8-alex.bennee@linaro.org> Reviewed-by: Warner Losh Reviewed-by: Richard Henderson --- v2 - use common-user/plugin-api.c.inc instead - add commentary about state of plugins for BSD user --- bsd-user/plugin-api.c | 15 +++++++++++++ linux-user/plugin-api.c | 14 ++++++++++++ plugins/api-system.c | 39 ++++++++++++++++++++++++++++++++ plugins/api.c | 43 ------------------------------------ common-user/plugin-api.c.inc | 43 ++++++++++++++++++++++++++++++++++++ bsd-user/meson.build | 1 + linux-user/meson.build | 1 + plugins/meson.build | 2 +- 8 files changed, 114 insertions(+), 44 deletions(-) create mode 100644 bsd-user/plugin-api.c create mode 100644 linux-user/plugin-api.c create mode 100644 plugins/api-system.c create mode 100644 common-user/plugin-api.c.inc diff --git a/bsd-user/plugin-api.c b/bsd-user/plugin-api.c new file mode 100644 index 0000000000..6ccef7eaa0 --- /dev/null +++ b/bsd-user/plugin-api.c @@ -0,0 +1,15 @@ +/* + * QEMU Plugin API - bsd-user-mode only implementations + * + * Common user-mode only APIs are in plugins/api-user. These helpers + * are only specific to bsd-user. + * + * Copyright (C) 2017, Emilio G. Cota + * Copyright (C) 2019-2025, Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu.h" +#include "common-user/plugin-api.c.inc" diff --git a/linux-user/plugin-api.c b/linux-user/plugin-api.c new file mode 100644 index 0000000000..e4f796d926 --- /dev/null +++ b/linux-user/plugin-api.c @@ -0,0 +1,14 @@ +/* + * 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.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 Wed Feb 26 14:03:40 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: 13992507 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 EC4E5C021B8 for ; Wed, 26 Feb 2025 14:12:55 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI9G-0007CJ-LD; Wed, 26 Feb 2025 09:12: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 1tnI8b-0005RC-8m for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:11:54 -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 1tnI8X-0007ZC-5B for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:11:48 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4398ec2abc2so60168425e9.1 for ; Wed, 26 Feb 2025 06:11:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740579103; x=1741183903; 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=RFdASjaX52m/LFBMdNIH+YRGWtE+XbpwGlPffnilBbc=; b=syisNZssjAHCxXkFkV0CllLHmJDGR/vW0g4InZ2ZUnGYxFslVT5C0RPqUD87j/JU0r pgn8UN1ZabsVXtAzZuDz21wioGVXJh0zcX6U5vh9ezUu2LUmZu+KhOIMEZCbzr+kyWDW 37oXcE37gq2KOVB2+4wM9RKrVnkrKsvZt8+wRoGpR7uU9Os6nuWRjauLXwToKGrQ/vjq rLM0UoiL+LOyKgmhIyb+NMv8BNZg1n8U671t6Swe/ELfrRHOOX4U25jGYGATR/IIx5In nIuVV556dhQ9oLQXmDxM65lJcCCTLLs3e1VzY/5mXIKv9XKe6zzf6M7vUAvddoOeVbrp 9Jpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740579103; x=1741183903; 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=RFdASjaX52m/LFBMdNIH+YRGWtE+XbpwGlPffnilBbc=; b=dd7tkhn9U472dtiHiD1OkGmUWV1KWEQdVHjeun9fmVa9hS1pnvtQOXdgRjhMlpxuvs F/+Xr0/Mo8QMHLdpr3FOX8cNoatxP8ZN4n3ivRmI1M7P096MefVk/0LjvX0QOEmHccsl 8t0eZUW/PcsA5gW//kwEDR2drSvtX+9xML3OrVwMTNtMtbym6IUwHCe2cndegahJROLr iZpHc1iiQM1VmmGne/S4zGCrrZ/zjOgNynXlMD1OhcOirE0xDc5fqcl/6dOIDsf17xm9 C0QH6iui9cgKVV+e6JODCuimWGy3LG/9U6bOIB0cyVMo53by7lk84c7j1mNYtgmEG47e QTMg== X-Gm-Message-State: AOJu0YzS1oXDnA5LpsE5fsuR6iMyJm6zWcaogV/wQ1FdHI4jg/3/yA2x sAeB7ke35SuhejQUrpbgIGSR/mJsR1cSMyKL8iCVEKBA9CEU3OZw8iULcTViKy8= X-Gm-Gg: ASbGncsRaIzLSPqm36XsEPHNT3tKRYnOkgyK26pe4OuQ6yY8wAZgOKs8EAqxWuOiXR2 o1Gz+VyoPTZkR55WbCGuqvWNjgZE/s63gsaYleXb7GnMwwoyS5Y01u0lu39Tkw84eQSPK9W1Ecu PiFO9utq3RZ4E0+9DoMyGHCPQeJbw0CsIF9jbJzSbZzgqgAGoF2ckDstl0qUyoaiKIt1hj+12/6 ggleVL9p3vajIci0Ylgm179cgj0xeUAv4OlRnxYN/uMC6yfQRrmOEaKuxEOxzs0J2FCbw4L9lc9 IRTxorFhW6PwSo+1YHrqJQCvQRZ8 X-Google-Smtp-Source: AGHT+IHIZKv/rn4CKhDiNy6dg0I6jgrot4jwFHquIT8dVOKLfVgh4vqogplzc8/LT6RCruY+7dxmQg== X-Received: by 2002:a05:600c:444e:b0:439:9543:9488 with SMTP id 5b1f17b1804b1-43ab9015589mr26128155e9.21.1740579103243; Wed, 26 Feb 2025 06:11:43 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba532d33sm22850475e9.15.2025.02.26.06.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:11:42 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 1DBB66086F; Wed, 26 Feb 2025 14:03:46 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 22/25] plugins/api: split out the vaddr/hwaddr helpers Date: Wed, 26 Feb 2025 14:03:40 +0000 Message-Id: <20250226140343.3907080-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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: <20250225110844.3296991-9-alex.bennee@linaro.org> --- plugins/api-system.c | 58 ++++++++++++++++++++++++++++++++++++ plugins/api-user.c | 40 +++++++++++++++++++++++++ plugins/api.c | 70 -------------------------------------------- plugins/meson.build | 2 +- 4 files changed, 99 insertions(+), 71 deletions(-) create mode 100644 plugins/api-user.c diff --git a/plugins/api-system.c b/plugins/api-system.c index cb0dd8f730..38560de342 100644 --- a/plugins/api-system.c +++ b/plugins/api-system.c @@ -12,6 +12,10 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" +#include "qapi/error.h" +#include "migration/blocker.h" +#include "hw/boards.h" +#include "qemu/plugin-memory.h" #include "qemu/plugin.h" /* @@ -37,3 +41,57 @@ uint64_t qemu_plugin_entry_code(void) { return 0; } + +/* + * Virtual Memory queries + */ + +static __thread struct qemu_plugin_hwaddr hwaddr_info; + +struct qemu_plugin_hwaddr *qemu_plugin_get_hwaddr(qemu_plugin_meminfo_t info, + uint64_t vaddr) +{ + CPUState *cpu = current_cpu; + unsigned int mmu_idx = get_mmuidx(info); + enum qemu_plugin_mem_rw rw = get_plugin_meminfo_rw(info); + hwaddr_info.is_store = (rw & QEMU_PLUGIN_MEM_W) != 0; + + assert(mmu_idx < NB_MMU_MODES); + + if (!tlb_plugin_lookup(cpu, vaddr, mmu_idx, + hwaddr_info.is_store, &hwaddr_info)) { + error_report("invalid use of qemu_plugin_get_hwaddr"); + return NULL; + } + + return &hwaddr_info; +} + +bool qemu_plugin_hwaddr_is_io(const struct qemu_plugin_hwaddr *haddr) +{ + return haddr->is_io; +} + +uint64_t qemu_plugin_hwaddr_phys_addr(const struct qemu_plugin_hwaddr *haddr) +{ + if (haddr) { + return haddr->phys_addr; + } + return 0; +} + +const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h) +{ + if (h && h->is_io) { + MemoryRegion *mr = h->mr; + if (!mr->name) { + unsigned maddr = (uintptr_t)mr; + g_autofree char *temp = g_strdup_printf("anon%08x", maddr); + return g_intern_string(temp); + } else { + return g_intern_string(mr->name); + } + } else { + return g_intern_static_string("RAM"); + } +} diff --git a/plugins/api-user.c b/plugins/api-user.c new file mode 100644 index 0000000000..867b420339 --- /dev/null +++ b/plugins/api-user.c @@ -0,0 +1,40 @@ +/* + * QEMU Plugin API - user-mode only implementations + * + * This provides the APIs that have a user-mode specific + * implementations or are only relevant to user-mode. + * + * Copyright (C) 2017, Emilio G. Cota + * Copyright (C) 2019-2025, Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/plugin.h" + +/* + * Virtual Memory queries - these are all NOPs for user-mode which + * only ever has visibility of virtual addresses. + */ + +struct qemu_plugin_hwaddr *qemu_plugin_get_hwaddr(qemu_plugin_meminfo_t info, + uint64_t vaddr) +{ + return NULL; +} + +bool qemu_plugin_hwaddr_is_io(const struct qemu_plugin_hwaddr *haddr) +{ + return false; +} + +uint64_t qemu_plugin_hwaddr_phys_addr(const struct qemu_plugin_hwaddr *haddr) +{ + return 0; +} + +const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h) +{ + return g_intern_static_string("Invalid"); +} diff --git a/plugins/api.c b/plugins/api.c index ffccd71e4b..82241699a5 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -383,76 +383,6 @@ qemu_plugin_mem_value qemu_plugin_mem_get_value(qemu_plugin_meminfo_t info) return value; } -/* - * Virtual Memory queries - */ - -#ifdef CONFIG_SOFTMMU -static __thread struct qemu_plugin_hwaddr hwaddr_info; -#endif - -struct qemu_plugin_hwaddr *qemu_plugin_get_hwaddr(qemu_plugin_meminfo_t info, - uint64_t vaddr) -{ -#ifdef CONFIG_SOFTMMU - CPUState *cpu = current_cpu; - unsigned int mmu_idx = get_mmuidx(info); - enum qemu_plugin_mem_rw rw = get_plugin_meminfo_rw(info); - hwaddr_info.is_store = (rw & QEMU_PLUGIN_MEM_W) != 0; - - assert(mmu_idx < NB_MMU_MODES); - - if (!tlb_plugin_lookup(cpu, vaddr, mmu_idx, - hwaddr_info.is_store, &hwaddr_info)) { - error_report("invalid use of qemu_plugin_get_hwaddr"); - return NULL; - } - - return &hwaddr_info; -#else - return NULL; -#endif -} - -bool qemu_plugin_hwaddr_is_io(const struct qemu_plugin_hwaddr *haddr) -{ -#ifdef CONFIG_SOFTMMU - return haddr->is_io; -#else - return false; -#endif -} - -uint64_t qemu_plugin_hwaddr_phys_addr(const struct qemu_plugin_hwaddr *haddr) -{ -#ifdef CONFIG_SOFTMMU - if (haddr) { - return haddr->phys_addr; - } -#endif - return 0; -} - -const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h) -{ -#ifdef CONFIG_SOFTMMU - if (h && h->is_io) { - MemoryRegion *mr = h->mr; - if (!mr->name) { - unsigned maddr = (uintptr_t)mr; - g_autofree char *temp = g_strdup_printf("anon%08x", maddr); - return g_intern_string(temp); - } else { - return g_intern_string(mr->name); - } - } else { - return g_intern_static_string("RAM"); - } -#else - return g_intern_static_string("Invalid"); -#endif -} - int qemu_plugin_num_vcpus(void) { return plugin_num_vcpus(); diff --git a/plugins/meson.build b/plugins/meson.build index 9c9bc9e5bb..942b59e904 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -58,7 +58,7 @@ if host_os == 'windows' ) endif -user_ss.add(files('user.c')) +user_ss.add(files('user.c', 'api-user.c')) system_ss.add(files('system.c', 'api-system.c')) common_ss.add(files('loader.c')) From patchwork Wed Feb 26 14:03:41 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: 13992479 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 20F82C021B8 for ; Wed, 26 Feb 2025 14:05:40 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI1z-00025D-OO; Wed, 26 Feb 2025 09:04:59 -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 1tnI1M-0001Dq-6q for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:04:23 -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 1tnI1F-0005qZ-EE for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:04:17 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43989226283so47091945e9.1 for ; Wed, 26 Feb 2025 06:04:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578649; x=1741183449; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=j3uOOlAeKCJac1lfZ8pMilX54y2FsqgRLkG3Q0WCNcI=; b=ntEWogRFVmn8tSKvkSTwriYCHQoGwBbtQzk+XS5r/ADe5EhM0rYB2KPP30wy7HFUfi 2Xc6zqEiILcnbIzKy3koyTBB6oWWpDy7DlW1ePlKuNiGWSahAUzK6bqpdtb5WfBi+Gtc r7dPzSthYkjvnlzu8yETZouhoR5xTiOqgrS9phyJQQwjv6j259MUbqXz2ygCITFCSpJH te7dKkDq1+ldhfJ9qpjBS+ea0vHN6+QAexBTJPdUeFmORlfTnAJgOTeREabK821BZL9Z tmX3mzN01gtgRRqUmApCJrEYWTPJ1OOJmBGKwhQ6NRAGfHo173lFoBuyI6gL28fgmwVW xOzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578649; x=1741183449; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j3uOOlAeKCJac1lfZ8pMilX54y2FsqgRLkG3Q0WCNcI=; b=ZuhbjRKyFtDElhn2I98H2GyT9vw/Ycu3BVwab7U803LQpWMt6USSz0JziovDpToiQS HPo5PESgMCYX3agLYKnXZIY673C6w+RDcvtfTLrkZNc3baEAj9rWGVxzKDibkBUd5rWB jmSYjq+Yvglzxsm7Ox2uPawwQKFM5OQ9tJakwUSjfWL/1D+3Sjp0KkVWvllXl7B442uU mYwfAaRncywj1jsZoDxlrTvlx982fFUC8yzTux1B+JoYMHZF7iF7qu0/hLoNhnxzvp4b P2UdIxmBwi+Ef7r4kfsRGCETOZY0Irk21/qCnqu/NFrbTU0ffiKdq/p19Rd+6+87QtpW 0epw== X-Gm-Message-State: AOJu0YwS30gIXf4ptE2B49FmPYaoMEoDdtYXvXpSU7FQFOutpXz28ycK QQIEP2DTE8B3G/7AGO+Q8a3UcLnrLPgkOGzKVdXEMLGtq281mtKQRmdJvZlL8DQ= X-Gm-Gg: ASbGncscWhWnsDS0d4JbAi9jp26fv6hqxIT2zWanQbH6b8h2423cNRufvCInHmFwUlU yvrVgoBEiUHJxvRm+CQD78bOZGFl2r5KpwMAwKkyqhvf8VCSckNiaUt67NY9TZPZ9DN25HoaHn+ xnhYUBkH7ZU1rGICtvo/hmNKvz7RyCScSoCiytS1fUFpyXIxxPMcbc1dSSPhMC3rh/qxr2RUMuc ztUuhFVih22Lz9z9Bv5G38kqecz7jBNUTl1TaFciYnwevp2mYWZgmVdA9FGBnyYZL+hbhodHCSY nyXAYEXNR6V0KTYaztM6gZIDrwsa X-Google-Smtp-Source: AGHT+IF8NulBNBahVpJJW0ZPTOINlMChCVCOta14Z1oqxQC08yOAIUKIrVUeowIUhMlvEOeDIdOfHw== X-Received: by 2002:a5d:5849:0:b0:390:df7f:c20a with SMTP id ffacd0b85a97d-390df7fc33bmr583361f8f.33.1740578648457; Wed, 26 Feb 2025 06:04:08 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390dfab57b9sm371164f8f.68.2025.02.26.06.03.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:04:07 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 36ECE601A1; Wed, 26 Feb 2025 14:03:46 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 23/25] plugins/api: split out time control helpers Date: Wed, 26 Feb 2025 14:03:41 +0000 Message-Id: <20250226140343.3907080-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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: <20250225110844.3296991-10-alex.bennee@linaro.org> --- plugins/api-system.c | 34 ++++++++++++++++++++++++++++++++++ plugins/api-user.c | 17 +++++++++++++++++ plugins/api.c | 41 ----------------------------------------- 3 files changed, 51 insertions(+), 41 deletions(-) diff --git a/plugins/api-system.c b/plugins/api-system.c index 38560de342..cc190b167e 100644 --- a/plugins/api-system.c +++ b/plugins/api-system.c @@ -95,3 +95,37 @@ const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h) return g_intern_static_string("RAM"); } } + +/* + * Time control + */ +static bool has_control; +static Error *migration_blocker; + +const void *qemu_plugin_request_time_control(void) +{ + if (!has_control) { + has_control = true; + error_setg(&migration_blocker, + "TCG plugin time control does not support migration"); + migrate_add_blocker(&migration_blocker, NULL); + return &has_control; + } + return NULL; +} + +static void advance_virtual_time__async(CPUState *cpu, run_on_cpu_data data) +{ + int64_t new_time = data.host_ulong; + qemu_clock_advance_virtual_time(new_time); +} + +void qemu_plugin_update_ns(const void *handle, int64_t new_time) +{ + if (handle == &has_control) { + /* Need to execute out of cpu_exec, so bql can be locked. */ + async_run_on_cpu(current_cpu, + advance_virtual_time__async, + RUN_ON_CPU_HOST_ULONG(new_time)); + } +} diff --git a/plugins/api-user.c b/plugins/api-user.c index 867b420339..28704a89e8 100644 --- a/plugins/api-user.c +++ b/plugins/api-user.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "qemu/plugin.h" +#include "exec/log.h" /* * Virtual Memory queries - these are all NOPs for user-mode which @@ -38,3 +39,19 @@ const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h) { return g_intern_static_string("Invalid"); } + +/* + * Time control - for user mode the only real time is wall clock time + * so realistically all you can do in user mode is slow down execution + * which doesn't require the ability to mess with the clock. + */ + +const void *qemu_plugin_request_time_control(void) +{ + return NULL; +} + +void qemu_plugin_update_ns(const void *handle, int64_t new_time) +{ + qemu_log_mask(LOG_UNIMP, "user-mode can't control time"); +} diff --git a/plugins/api.c b/plugins/api.c index 82241699a5..832bf6ee5e 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -526,44 +526,3 @@ uint64_t qemu_plugin_u64_sum(qemu_plugin_u64 entry) return total; } -/* - * Time control - */ -static bool has_control; -#ifdef CONFIG_SOFTMMU -static Error *migration_blocker; -#endif - -const void *qemu_plugin_request_time_control(void) -{ - if (!has_control) { - has_control = true; -#ifdef CONFIG_SOFTMMU - error_setg(&migration_blocker, - "TCG plugin time control does not support migration"); - migrate_add_blocker(&migration_blocker, NULL); -#endif - return &has_control; - } - return NULL; -} - -#ifdef CONFIG_SOFTMMU -static void advance_virtual_time__async(CPUState *cpu, run_on_cpu_data data) -{ - int64_t new_time = data.host_ulong; - qemu_clock_advance_virtual_time(new_time); -} -#endif - -void qemu_plugin_update_ns(const void *handle, int64_t new_time) -{ -#ifdef CONFIG_SOFTMMU - if (handle == &has_control) { - /* Need to execute out of cpu_exec, so bql can be locked. */ - async_run_on_cpu(current_cpu, - advance_virtual_time__async, - RUN_ON_CPU_HOST_ULONG(new_time)); - } -#endif -} From patchwork Wed Feb 26 14:03:42 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: 13992477 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 7EAF0C18E7C for ; Wed, 26 Feb 2025 14:05:09 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI20-00023M-1S; Wed, 26 Feb 2025 09:05:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnI14-00018p-It for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:04:02 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tnI12-0005lt-HQ for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:04:02 -0500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4399d14334aso60067455e9.0 for ; Wed, 26 Feb 2025 06:04:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578639; x=1741183439; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Jk0L9tiR8Pw91LWiTI1Z3wlxkKLipHgTcC6b1a+5kwk=; b=VIpwlOdsIQjLe6n8GQZ0VPukngFEWdZeDShN5R7I+3aKM0/nt2MH97yq+G7HPb5s3t N36p4fE9ghvJfS6T3684+FxQhl5X0deQhVwbQQK+lann9SOcEeqxhi0IleSK96Jb5HVi zgjoeytI3K8rB2uAQHxqAbTKbEAma0CReT7kCYOgaIYxa44AbPbJQHrzE5v/Fu7e813G gd+Yaqst/3gF9rgYuBCGXV7V8KS/DV3zpKV1rE3dFfECL5Rwxh28KVI3kBWmQc7PkFAb yiN+JqydKJtSyt1/Cl4A6ya25GwWS1X9lHckGf7x6QTI2kfVgpvbPvRI0C9cFYTWDCaU 865g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578639; x=1741183439; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Jk0L9tiR8Pw91LWiTI1Z3wlxkKLipHgTcC6b1a+5kwk=; b=HrdkUmkH/5qomA3HPi8YcLpI456WQUJiLebejBdDD9wft/4QhUV/u1NW/2s6/e78Vb MoPmuQR8MhrRB9Y7YFPBFBom+rlc6QC2/S5lR1U+aTPnr1twUvE8sy7vGxmJPhI0HFwL n9UiV+4vO1WHK3wiZ77tNm5HHqf90befPQkQUVSX8zBAoglzDSkUvIMz/uKm1CYmYZNX 7iOWAzsK8G8KcTcF36eluL7t991JChU+VOpAfAyPRFrcGWJ3Cvp5ncVpik8sUbpPAc/w vUKpgsgashXUgzP1MsprP2djCVuUFboQ0poJFAStQfr3UGTlc9tiqwaKy5xJbWGmdcI4 sCqg== X-Gm-Message-State: AOJu0YxCFWcS1POr4hBi4YLTLXCk6u2gnz8g12X9wxSiLe+kSlGIbFR8 vRd2e3aoICZqWMpeV1a/5EBIiUVvka6XZIaWD1yIpf81U7egGMqgWDhsCWm77vg= X-Gm-Gg: ASbGncv4lhiosbz82lqH9XjPcaKD3zzfVLQ7Izc4k9aNOa3z4AENNxhpYkGMcwQOiWD wfCjfpW1kzYFd5RZXh6RYCigayteRTyNp2arJqQ217g8pPsaWPPAM3mDXDMUkop3rY8HtR8f2pc 03Vrg5I6jILeSBM284VQqnwFLDhmJ2++elsSGnc5mbPdbe+OcX4/FWi5A6AXHYrJm6j1XVgK/vU ZXb7zh5oZBad9uM85m135vje5Gr7PgQVrr34aANBRCusgrOXDpLQI7LPVJuFXLoTFMRwzwbE4GR 6qQT/xzMwM2Um+MmmIDksTTsYhlp X-Google-Smtp-Source: AGHT+IF2S/46ddaGkbCFrC/nFtvPp4N+60pIBssQ0PTdgKTjFNv38cgtY2NZGSdf3l4GiBKeEZC9Bw== X-Received: by 2002:a05:600c:1c06:b0:439:64eb:67cf with SMTP id 5b1f17b1804b1-43ab8fe027fmr30468845e9.13.1740578638944; Wed, 26 Feb 2025 06:03:58 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba53961csm22477935e9.17.2025.02.26.06.03.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:52 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 507DD608D4; Wed, 26 Feb 2025 14:03:46 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth Subject: [PATCH 24/25] plugins/api: build only once Date: Wed, 26 Feb 2025 14:03:42 +0000 Message-Id: <20250226140343.3907080-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20250225110844.3296991-11-alex.bennee@linaro.org> --- plugins/api.c | 11 ----------- plugins/meson.build | 3 +-- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/plugins/api.c b/plugins/api.c index 832bf6ee5e..604ce06802 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -46,17 +46,6 @@ #include "exec/translator.h" #include "disas/disas.h" #include "plugin.h" -#ifndef CONFIG_USER_ONLY -#include "qapi/error.h" -#include "migration/blocker.h" -#include "qemu/plugin-memory.h" -#include "hw/boards.h" -#else -#include "qemu.h" -#ifdef CONFIG_LINUX -#include "loader.h" -#endif -#endif /* Uninstall and Reset handlers */ diff --git a/plugins/meson.build b/plugins/meson.build index 942b59e904..d27220d5ff 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -61,9 +61,8 @@ endif user_ss.add(files('user.c', 'api-user.c')) system_ss.add(files('system.c', 'api-system.c')) -common_ss.add(files('loader.c')) +common_ss.add(files('loader.c', 'api.c')) specific_ss.add(files( 'core.c', - 'api.c', )) From patchwork Wed Feb 26 14:03:43 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: 13992484 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 68D38C021B8 for ; Wed, 26 Feb 2025 14:06:09 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnI1w-0001ta-IM; Wed, 26 Feb 2025 09:04:56 -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 1tnI15-00019Z-3Y for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:04:03 -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 1tnI13-0005mB-86 for qemu-devel@nongnu.org; Wed, 26 Feb 2025 09:04:02 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-438a3216fc2so65586265e9.1 for ; Wed, 26 Feb 2025 06:04:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740578639; x=1741183439; 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=F1MMLvZbg1LX5Rz6KSjocH3HVYPB/IR+83cVCtz/KGM=; b=KWll6xqgakd5GyeCgUUfeb8/VUBrk3mdhZlW9fTQrwWJk5DUEogxlQaEsiUMe0Rkj8 iEbaYwGAwmboZwoR83FJNfYk2uOdWhFdgYVWpw65HYH4OevmIVDDv4sKOulaAO9sM354 fw1hZ+A/p6+XyrEFf8tCKwUW49+K62iaWaTu5JYt5A+84MEMhPGJQdBvqtrSuQwpqRs4 Yu7nGJWGRaD1MFu3VEGighGyx2Z7csYSBGpVYlFxdZM5K11O0TuLN79aY6c2sGZrunBI oeIHFo8qv+YekwUtLKRUWyVy/g6BMPD82mAOJ398xMIYVhjunei8oQaUIFvag2iVD+q+ dAQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740578639; x=1741183439; 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=F1MMLvZbg1LX5Rz6KSjocH3HVYPB/IR+83cVCtz/KGM=; b=TVBIsKDrQUqlAIyseudaX561J8hcZ263ni955L6EVDH+1shGh4oDhq32cj3OU+880h 3Fgw+aWzjet/qdyryM2YDUzdHdgpr82FrGAD05NwFKBpqWN/NCwRDEJKgi+hnbUYsm90 ZYREl3iCZ0P0tG1kpyPk1bCsN2QblM3aGDmaFr6+aEXm7HNDvm8eHv9GDvDrdyUwosIa 5qk4nKmksem5a5ZZ+O+MqregbZx8PHg0ETdoGfGbLFCjnSLkmLfLBvLYKxhExlKTL1SL /r+vuj9fiyDnNJKvdnsc3+8ixIRTumA9TQ4NHUpco89U+7zieFpf/RzK48+BBD2463Ls wgOg== X-Gm-Message-State: AOJu0YyWKuI6vsTcpPxULqDIzM0b1M2H6kbLa/gOpSgO+g8RtAfLEQAa 8zizrhE0uarbU8MCMtZzkgxfwy2IYgfoMBcFt/Jg6aEV9K8sr/wQjqifp0SCL3g= X-Gm-Gg: ASbGncvEer69kjI1lX2iNdJR6Qm1Ht8cslKfIsbqONxfzBh8Q4vV33IjJQAh9eSaA2/ rlSNmUZzoYkKtQRQgBDlUrr1OEzblem4Gny18efPofNTmCf+WvizscczwiqryNpvF8pLp4o77X/ AMjnw03YNJI0gysZLiRl/YLj8ZPg9dC5DVPHq0PpMc1JG49IHATcglFiqeW3A2eo5dAyrB/6FNn fg6Y1D0Fbsx/muBOzakv/PEkKJei6DAZiK7O0WDxQ8YTQLFI4IntPYtKaDzPRzdqXE2uF8KLfhg iKnf3+rD+G9rklp9HGtCHadKdA6s X-Google-Smtp-Source: AGHT+IECTYhG8QM+//FBl9xrzDWUnh7arnZz/ezerS3qJ2Z6nSgdXc95N1dTzOXL8rUuDkVAq7H5JA== X-Received: by 2002:a05:600c:3b97:b0:439:9ee2:5534 with SMTP id 5b1f17b1804b1-439b04f9d11mr175084255e9.12.1740578639446; Wed, 26 Feb 2025 06:03:59 -0800 (PST) Received: from draig.lan ([185.126.160.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba58720esm23260055e9.40.2025.02.26.06.03.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:03:56 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 6580960920; Wed, 26 Feb 2025 14:03:46 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Peter Maydell , Kyle Evans , Eduardo Habkost , Alexandre Iooss , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , Mahmoud Mandour , Paolo Bonzini , Li-Wen Hsu , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Ed Maste , Thomas Huth , Markus Armbruster Subject: [PATCH 25/25] MAINTAINERS: remove widely sanctioned entities Date: Wed, 26 Feb 2025 14:03:43 +0000 Message-Id: <20250226140343.3907080-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226140343.3907080-1-alex.bennee@linaro.org> References: <20250226140343.3907080-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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: <20250221161443.2321327-1-alex.bennee@linaro.org> --- MAINTAINERS | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 1911949526..9cdfe19115 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2529,8 +2529,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 @@ -3627,10 +3626,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