From nobody Sat Sep 6 16:59:10 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1756974170; cv=none; d=zohomail.com; s=zohoarc; b=d8qrLXpp5OQcV0zObHtu7srgUxTPH2BlhfrREurtyqkhzhf+4THuI6ASfYlqUZmO5ZzQUgYB7UHEq1KbaOljNjwzeasSCSot5ymWILoGD/P2ztg9+cU/N4wQp6kpKw7PfMVwqCzb8oTEk8Ah77ihyKzI491jn3RGvDgHZJilW0g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756974170; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=R1Jmcmvj/wxtRZkBbPu5k8WLatNgN3qwXd3zyWr/Gsg=; b=ilLrBNtF6dgHF8/vYNU2iOL6nDynJq2la4HdpipXSo03t0aSx0DWymNxHlf4BXH4uO01n/GuHwvXndmdLF875vY+8bmw7g4MhHh3IFVAIBlAkgcdG4FwgJLjX2FJnXocbqR/Gm4Ep7s7WciMZYGF0ROEQW6ZB74Nvj07EgaSbk0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1756974169937663.5647538517823; Thu, 4 Sep 2025 01:22:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uu5Ci-0003am-G4; Thu, 04 Sep 2025 04:20:24 -0400 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 1uu5BL-0001Y5-AD for qemu-devel@nongnu.org; Thu, 04 Sep 2025 04:19:03 -0400 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uu5B2-0008E8-RZ for qemu-devel@nongnu.org; Thu, 04 Sep 2025 04:18:58 -0400 Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-61ded2712f4so1195944a12.1 for ; Thu, 04 Sep 2025 01:18:39 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-61cfc4bbc51sm13480108a12.27.2025.09.04.01.18.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Sep 2025 01:18:34 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 5F91E60135; Thu, 04 Sep 2025 09:11:32 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756973916; x=1757578716; 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=R1Jmcmvj/wxtRZkBbPu5k8WLatNgN3qwXd3zyWr/Gsg=; b=XlKsrC6N86VatB7Pv+USBJ51emZqNq+dVYxkeXz4mJANtxrCJxQdZofoOaV1Or0n/C l/bIf+golt3HKWn9J6j95cxOtjucfkex2KDrPbcZk3Kg72O/SDkvafE9oRJC+cdViFBN bPFsNg9nMErkBBKV426Q/CkA/4cLt0FmuSbsIBkYkvls8VayiCaNcLLKmzDAfV4mBYYY IwESvhQ0wq+68Gfs1qvO9csipczCmQdYFXuFN7hGybp1vWackyudXJMpWj/e3NNATfKt EgwwEzYlJo7CzM3DDcFXH2xN+4s1+3mfyShJtBz+j9dwIVs1iG7U9aysUfVaKWXcGRa2 UpoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756973916; x=1757578716; 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=R1Jmcmvj/wxtRZkBbPu5k8WLatNgN3qwXd3zyWr/Gsg=; b=PiDAJBUKkAWKzl5x9i42XMiIzaR0G9wVfN+ygLn/C5CoUDrVnfTD74w5moNkn90zwI V3N48Heqtj8kNNk72F+p736170ksN5qwt6f9PQXUaUShLWAU15RDjwuMg1a2V88jOAGm c9ONp+VRkVoK7DDHs3Ct+SMFm5hcLQ5SVX4VK5NVUenvJVjXygsJXDnxAd3vDuKdJTUd O6KJQ0DZfdLImdOkarCMT4OxeZ8rO5tfClxxz3ttiW7nYCfnLKmuOzBihP3pXBtBJJIS j9dChoPrhnWRtNdvokh+ECaOtwxhiwan6fWpPeOEnePyocE8EMqApO13mkLQCtHlxraI tRHA== X-Gm-Message-State: AOJu0YzFTCmNzMCoyttUt0ZNRhVobTMpI0BHPHL2GxsMVgxTLOVflS81 FiXXd+cR5WcMdJ8ie6DMP9QsRxXCmXkvtCcOzIAWjoPTugDNN+8HAzBlBZpi0K5Yuu2+OB0shx4 JlaNi4znb+A== X-Gm-Gg: ASbGnct6ETOyR6DkBfV6esD67AiXpk81qQ+gj4Pjt6auh3Z5ljjuIgkeOw7W+ms5ZcL bkODc6p8+Uc4fhExM++HwQyBz21jOR8PXNthKnvQpebyGYBjwIqjXMFbeKh9F4CAY6rKIrFAfHg zegF1C462h5mTU4yd3EpLau4xFSIFETTrFp+JMlBDiDBswPKe4JmzhgAlMOXeYo+rSiFft3CFiY WtOBLdPJdOfU34uc6j31gt5rTtKgPECujW38N1qASeKVCOoy8mRBa65gaEegm18TWg65AS2ZIKr GEkgyLmm+PcnPIfI86fVgqkQGzBwaiDKPav7MChS3ljfghPfy2o+Kq3zgYmpl1g/5ZKOoCONly0 fCEFg6ke3dzyd76LzmdP6cTMz9aQotLFe+yMsZRWuComc X-Google-Smtp-Source: AGHT+IGd7u3Qk721bQxPxAfrzD3eIhPfOWYwPcIsP6SkUyYfzaxGv5T68HkRcWFbq+cH9ffQb7YK1w== X-Received: by 2002:a05:6402:847:b0:61d:144:81be with SMTP id 4fb4d7f45d1cf-61d2699473dmr17896861a12.16.1756973916345; Thu, 04 Sep 2025 01:18:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Reinoud Zandijk , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Huacai Chen , Zhao Liu , Paolo Bonzini , Alistair Francis , qemu-arm@nongnu.org, Fam Zheng , Helge Deller , Matthew Rosato , Fabiano Rosas , qemu-rust@nongnu.org, Bibo Mao , qemu-riscv@nongnu.org, Thanos Makatos , Liu Zhiwei , Riku Voipio , Cameron Esfahani , Alexander Graf , Laurent Vivier , Harsh Prateek Bora , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-ppc@nongnu.org, Stafford Horne , Sunil Muthuswamy , Jagannathan Raman , Igor Mammedov , Brian Cain , Phil Dennis-Jordan , devel@lists.libvirt.org, Mads Ynddal , Elena Ufimtseva , Peter Xu , Jason Herne , Michael Rolnik , Weiwei Li , Laurent Vivier , Ilya Leoshkevich , qemu-block@nongnu.org, Peter Maydell , Kostiantyn Kostiuk , Kyle Evans , David Hildenbrand , "Edgar E. Iglesias" , Warner Losh , Daniel Henrique Barboza , John Snow , Yoshinori Sato , Aleksandar Rikalo , Alistair Francis , Marcelo Tosatti , Yonggang Luo , Radoslaw Biernacki , Artyom Tarasenko , Yanan Wang , Eduardo Habkost , Aurelien Jarno , Richard Henderson , qemu-s390x@nongnu.org, Alex Williamson , "Michael S. Tsirkin" , Ani Sinha , Roman Bolshakov , Manos Pitsidianakis , Chinmay Rath , Thomas Huth , Cleber Rosa , kvm@vger.kernel.org, Song Gao , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Halil Pasic , Eric Farman , Palmer Dabbelt , Leif Lindholm , Christian Borntraeger , Michael Roth , Mauro Carvalho Chehab , Jiaxun Yang , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Mark Cave-Ayland , Marcel Apfelbaum , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Nicholas Piggin , John Levon , Pierrick Bouvier Subject: [PATCH v2 034/281] tests/functional: Move x86_64 tests into target-specific folder Date: Thu, 4 Sep 2025 09:07:08 +0100 Message-ID: <20250904081128.1942269-35-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250904081128.1942269-1-alex.bennee@linaro.org> References: <20250904081128.1942269-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x534.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1756974171183116600 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The tests/functional folder has become quite crowded, thus move the x86_64 tests into a target-specific subfolder. Reviewed-by: Pierrick Bouvier Signed-off-by: Thomas Huth Message-ID: <20250819112403.432587-23-thuth@redhat.com> --- MAINTAINERS | 32 ++++++++-------- tests/functional/meson.build | 37 +------------------ tests/functional/x86_64/meson.build | 37 +++++++++++++++++++ .../functional/{ =3D> x86_64}/test_acpi_bits.py | 0 .../test_cpu_model_versions.py} | 0 .../{ =3D> x86_64}/test_cpu_queries.py | 0 .../test_hotplug_blk.py} | 0 .../test_hotplug_cpu.py} | 0 .../{ =3D> x86_64}/test_intel_iommu.py | 0 .../test_kvm_xen.py} | 0 .../{ =3D> x86_64}/test_linux_initrd.py | 0 .../{ =3D> x86_64}/test_mem_addr_space.py | 0 tests/functional/{ =3D> x86_64}/test_memlock.py | 0 .../test_migration.py} | 0 .../test_multiprocess.py} | 0 .../{ =3D> x86_64}/test_netdev_ethtool.py | 0 .../{ =3D> x86_64}/test_pc_cpu_hotplug_props.py | 0 .../test_replay.py} | 0 .../test_reverse_debug.py} | 0 .../test_tuxrun.py} | 0 .../{ =3D> x86_64}/test_virtio_balloon.py | 0 .../{ =3D> x86_64}/test_virtio_gpu.py | 0 .../{ =3D> x86_64}/test_virtio_version.py | 0 23 files changed, 55 insertions(+), 51 deletions(-) create mode 100644 tests/functional/x86_64/meson.build rename tests/functional/{ =3D> x86_64}/test_acpi_bits.py (100%) rename tests/functional/{test_x86_cpu_model_versions.py =3D> x86_64/test_c= pu_model_versions.py} (100%) rename tests/functional/{ =3D> x86_64}/test_cpu_queries.py (100%) rename tests/functional/{test_x86_64_hotplug_blk.py =3D> x86_64/test_hotpl= ug_blk.py} (100%) rename tests/functional/{test_x86_64_hotplug_cpu.py =3D> x86_64/test_hotpl= ug_cpu.py} (100%) rename tests/functional/{ =3D> x86_64}/test_intel_iommu.py (100%) rename tests/functional/{test_x86_64_kvm_xen.py =3D> x86_64/test_kvm_xen.p= y} (100%) rename tests/functional/{ =3D> x86_64}/test_linux_initrd.py (100%) rename tests/functional/{ =3D> x86_64}/test_mem_addr_space.py (100%) rename tests/functional/{ =3D> x86_64}/test_memlock.py (100%) rename tests/functional/{test_x86_64_migration.py =3D> x86_64/test_migrati= on.py} (100%) rename tests/functional/{test_x86_64_multiprocess.py =3D> x86_64/test_mult= iprocess.py} (100%) rename tests/functional/{ =3D> x86_64}/test_netdev_ethtool.py (100%) rename tests/functional/{ =3D> x86_64}/test_pc_cpu_hotplug_props.py (100%) rename tests/functional/{test_x86_64_replay.py =3D> x86_64/test_replay.py}= (100%) rename tests/functional/{test_x86_64_reverse_debug.py =3D> x86_64/test_rev= erse_debug.py} (100%) rename tests/functional/{test_x86_64_tuxrun.py =3D> x86_64/test_tuxrun.py}= (100%) rename tests/functional/{ =3D> x86_64}/test_virtio_balloon.py (100%) rename tests/functional/{ =3D> x86_64}/test_virtio_gpu.py (100%) rename tests/functional/{ =3D> x86_64}/test_virtio_version.py (100%) diff --git a/MAINTAINERS b/MAINTAINERS index b46445ff5c0..7b1a94f696c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -147,6 +147,7 @@ F: target/i386/Kconfig F: target/i386/meson.build F: tools/i386/ F: tests/functional/i386/ +F: tests/functional/x86_64/ =20 Guest CPU cores (TCG) --------------------- @@ -483,7 +484,7 @@ F: docs/system/i386/sgx.rst F: target/i386/kvm/ F: target/i386/sev* F: scripts/kvm/vmxcap -F: tests/functional/test_x86_64_hotplug_cpu.py +F: tests/functional/x86_64/test_hotplug_cpu.py =20 Xen emulation on X86 KVM CPUs M: David Woodhouse @@ -492,7 +493,7 @@ S: Supported F: include/system/kvm_xen.h F: target/i386/kvm/xen* F: hw/i386/kvm/xen* -F: tests/functional/test_x86_64_kvm_xen.py +F: tests/functional/x86_64/test_kvm_xen.py =20 Guest CPU Cores (other accelerators) ------------------------------------ @@ -1894,11 +1895,11 @@ F: include/hw/isa/apm.h F: tests/unit/test-x86-topo.c F: tests/qtest/test-x86-cpuid-compat.c F: tests/functional/i386/test_tuxrun.py -F: tests/functional/test_linux_initrd.py -F: tests/functional/test_mem_addr_space.py -F: tests/functional/test_pc_cpu_hotplug_props.py -F: tests/functional/test_x86_64_tuxrun.py -F: tests/functional/test_x86_cpu_model_versions.py +F: tests/functional/x86_64/test_linux_initrd.py +F: tests/functional/x86_64/test_mem_addr_space.py +F: tests/functional/x86_64/test_pc_cpu_hotplug_props.py +F: tests/functional/x86_64/test_tuxrun.py +F: tests/functional/x86_64/test_cpu_model_versions.py =20 PC Chipset M: Michael S. Tsirkin @@ -1974,7 +1975,7 @@ F: include/hw/boards.h F: include/hw/core/cpu.h F: include/hw/cpu/cluster.h F: include/system/numa.h -F: tests/functional/test_cpu_queries.py +F: tests/functional/x86_64/test_cpu_queries.py F: tests/functional/test_empty_cpu_model.py F: tests/unit/test-smp-parse.c T: git https://gitlab.com/ehabkost/qemu.git machine-next @@ -2159,7 +2160,7 @@ M: Ani Sinha M: Michael S. Tsirkin S: Supported F: tests/functional/acpi-bits/* -F: tests/functional/test_acpi_bits.py +F: tests/functional/x86_64/test_acpi_bits.py F: docs/devel/testing/acpi-bits.rst =20 ACPI/HEST/GHES @@ -2345,7 +2346,7 @@ F: net/vhost-user.c F: include/hw/virtio/ F: docs/devel/virtio* F: docs/devel/migration/virtio.rst -F: tests/functional/test_virtio_version.py +F: tests/functional/x86_64/test_virtio_version.py =20 virtio-balloon M: Michael S. Tsirkin @@ -2357,7 +2358,7 @@ F: include/hw/virtio/virtio-balloon.h F: system/balloon.c F: include/system/balloon.h F: tests/qtest/virtio-balloon-test.c -F: tests/functional/test_virtio_balloon.py +F: tests/functional/x86_64/test_virtio_balloon.py =20 virtio-9p M: Christian Schoenebeck @@ -2380,7 +2381,7 @@ F: hw/block/virtio-blk.c F: hw/block/dataplane/* F: include/hw/virtio/virtio-blk-common.h F: tests/qtest/virtio-blk-test.c -F: tests/functional/test_x86_64_hotplug_blk.py +F: tests/functional/x86_64/test_hotplug_blk.py T: git https://github.com/stefanha/qemu.git block =20 virtio-ccw @@ -2604,7 +2605,7 @@ R: Sriram Yagnaraman S: Odd Fixes F: docs/system/devices/igb.rst F: hw/net/igb* -F: tests/functional/test_netdev_ethtool.py +F: tests/functional/x86_64/test_netdev_ethtool.py F: tests/qtest/igb-test.c F: tests/qtest/libqos/igb.c =20 @@ -2713,6 +2714,7 @@ F: hw/display/virtio-vga.* F: include/hw/virtio/virtio-gpu.h F: docs/system/devices/virtio-gpu.rst F: tests/functional/aarch64/test_virt_gpu.py +F: tests/functional/x86_64/test_virtio_gpu.py =20 vhost-user-blk M: Raphael Norwitz @@ -3856,7 +3858,7 @@ S: Supported F: hw/i386/intel_iommu.c F: hw/i386/intel_iommu_internal.h F: include/hw/i386/intel_iommu.h -F: tests/functional/test_intel_iommu.py +F: tests/functional/x86_64/test_intel_iommu.py F: tests/qtest/intel-iommu-test.c =20 AMD-Vi Emulation @@ -4330,7 +4332,7 @@ F: scripts/ci/ F: tests/docker/ F: tests/vm/ F: tests/lcitool/ -F: tests/functional/test_*_tuxrun.py +F: tests/functional/*/test_tuxrun.py F: scripts/archive-source.sh F: docs/devel/testing/ci* F: docs/devel/testing/main.rst diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 00d18dba3ce..34e30239a6b 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -34,15 +34,7 @@ subdir('sh4') subdir('sh4eb') subdir('sparc') subdir('sparc64') - -test_x86_64_timeouts =3D { - 'acpi_bits' : 420, - 'intel_iommu': 300, - 'netdev_ethtool' : 180, - 'virtio_balloon': 120, - 'x86_64_kvm_xen' : 180, - 'x86_64_replay' : 480, -} +subdir('x86_64') =20 tests_generic_system =3D [ 'empty_cpu_model', @@ -56,33 +48,6 @@ tests_generic_linuxuser =3D [ tests_generic_bsduser =3D [ ] =20 -tests_x86_64_system_quick =3D [ - 'cpu_queries', - 'mem_addr_space', - 'x86_64_migration', - 'pc_cpu_hotplug_props', - 'virtio_version', - 'x86_cpu_model_versions', - 'vnc', - 'memlock', -] - -tests_x86_64_system_thorough =3D [ - 'acpi_bits', - 'intel_iommu', - 'linux_initrd', - 'x86_64_multiprocess', - 'netdev_ethtool', - 'virtio_balloon', - 'virtio_gpu', - 'x86_64_hotplug_blk', - 'x86_64_hotplug_cpu', - 'x86_64_kvm_xen', - 'x86_64_replay', - 'x86_64_reverse_debug', - 'x86_64_tuxrun', -] - tests_xtensa_system_thorough =3D [ 'xtensa_lx60', 'xtensa_replay', diff --git a/tests/functional/x86_64/meson.build b/tests/functional/x86_64/= meson.build new file mode 100644 index 00000000000..696a9ecab42 --- /dev/null +++ b/tests/functional/x86_64/meson.build @@ -0,0 +1,37 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +test_x86_64_timeouts =3D { + 'acpi_bits' : 420, + 'intel_iommu': 300, + 'kvm_xen' : 180, + 'netdev_ethtool' : 180, + 'replay' : 480, + 'virtio_balloon': 120, +} + +tests_x86_64_system_quick =3D [ + 'cpu_model_versions', + 'cpu_queries', + 'mem_addr_space', + 'migration', + 'pc_cpu_hotplug_props', + 'virtio_version', + 'vnc', + 'memlock', +] + +tests_x86_64_system_thorough =3D [ + 'acpi_bits', + 'hotplug_blk', + 'hotplug_cpu', + 'intel_iommu', + 'kvm_xen', + 'linux_initrd', + 'multiprocess', + 'netdev_ethtool', + 'replay', + 'reverse_debug', + 'tuxrun', + 'virtio_balloon', + 'virtio_gpu', +] diff --git a/tests/functional/test_acpi_bits.py b/tests/functional/x86_64/t= est_acpi_bits.py similarity index 100% rename from tests/functional/test_acpi_bits.py rename to tests/functional/x86_64/test_acpi_bits.py diff --git a/tests/functional/test_x86_cpu_model_versions.py b/tests/functi= onal/x86_64/test_cpu_model_versions.py similarity index 100% rename from tests/functional/test_x86_cpu_model_versions.py rename to tests/functional/x86_64/test_cpu_model_versions.py diff --git a/tests/functional/test_cpu_queries.py b/tests/functional/x86_64= /test_cpu_queries.py similarity index 100% rename from tests/functional/test_cpu_queries.py rename to tests/functional/x86_64/test_cpu_queries.py diff --git a/tests/functional/test_x86_64_hotplug_blk.py b/tests/functional= /x86_64/test_hotplug_blk.py similarity index 100% rename from tests/functional/test_x86_64_hotplug_blk.py rename to tests/functional/x86_64/test_hotplug_blk.py diff --git a/tests/functional/test_x86_64_hotplug_cpu.py b/tests/functional= /x86_64/test_hotplug_cpu.py similarity index 100% rename from tests/functional/test_x86_64_hotplug_cpu.py rename to tests/functional/x86_64/test_hotplug_cpu.py diff --git a/tests/functional/test_intel_iommu.py b/tests/functional/x86_64= /test_intel_iommu.py similarity index 100% rename from tests/functional/test_intel_iommu.py rename to tests/functional/x86_64/test_intel_iommu.py diff --git a/tests/functional/test_x86_64_kvm_xen.py b/tests/functional/x86= _64/test_kvm_xen.py similarity index 100% rename from tests/functional/test_x86_64_kvm_xen.py rename to tests/functional/x86_64/test_kvm_xen.py diff --git a/tests/functional/test_linux_initrd.py b/tests/functional/x86_6= 4/test_linux_initrd.py similarity index 100% rename from tests/functional/test_linux_initrd.py rename to tests/functional/x86_64/test_linux_initrd.py diff --git a/tests/functional/test_mem_addr_space.py b/tests/functional/x86= _64/test_mem_addr_space.py similarity index 100% rename from tests/functional/test_mem_addr_space.py rename to tests/functional/x86_64/test_mem_addr_space.py diff --git a/tests/functional/test_memlock.py b/tests/functional/x86_64/tes= t_memlock.py similarity index 100% rename from tests/functional/test_memlock.py rename to tests/functional/x86_64/test_memlock.py diff --git a/tests/functional/test_x86_64_migration.py b/tests/functional/x= 86_64/test_migration.py similarity index 100% rename from tests/functional/test_x86_64_migration.py rename to tests/functional/x86_64/test_migration.py diff --git a/tests/functional/test_x86_64_multiprocess.py b/tests/functiona= l/x86_64/test_multiprocess.py similarity index 100% rename from tests/functional/test_x86_64_multiprocess.py rename to tests/functional/x86_64/test_multiprocess.py diff --git a/tests/functional/test_netdev_ethtool.py b/tests/functional/x86= _64/test_netdev_ethtool.py similarity index 100% rename from tests/functional/test_netdev_ethtool.py rename to tests/functional/x86_64/test_netdev_ethtool.py diff --git a/tests/functional/test_pc_cpu_hotplug_props.py b/tests/function= al/x86_64/test_pc_cpu_hotplug_props.py similarity index 100% rename from tests/functional/test_pc_cpu_hotplug_props.py rename to tests/functional/x86_64/test_pc_cpu_hotplug_props.py diff --git a/tests/functional/test_x86_64_replay.py b/tests/functional/x86_= 64/test_replay.py similarity index 100% rename from tests/functional/test_x86_64_replay.py rename to tests/functional/x86_64/test_replay.py diff --git a/tests/functional/test_x86_64_reverse_debug.py b/tests/function= al/x86_64/test_reverse_debug.py similarity index 100% rename from tests/functional/test_x86_64_reverse_debug.py rename to tests/functional/x86_64/test_reverse_debug.py diff --git a/tests/functional/test_x86_64_tuxrun.py b/tests/functional/x86_= 64/test_tuxrun.py similarity index 100% rename from tests/functional/test_x86_64_tuxrun.py rename to tests/functional/x86_64/test_tuxrun.py diff --git a/tests/functional/test_virtio_balloon.py b/tests/functional/x86= _64/test_virtio_balloon.py similarity index 100% rename from tests/functional/test_virtio_balloon.py rename to tests/functional/x86_64/test_virtio_balloon.py diff --git a/tests/functional/test_virtio_gpu.py b/tests/functional/x86_64/= test_virtio_gpu.py similarity index 100% rename from tests/functional/test_virtio_gpu.py rename to tests/functional/x86_64/test_virtio_gpu.py diff --git a/tests/functional/test_virtio_version.py b/tests/functional/x86= _64/test_virtio_version.py similarity index 100% rename from tests/functional/test_virtio_version.py rename to tests/functional/x86_64/test_virtio_version.py --=20 2.47.2