On 2025/05/22 1:42, Alex Bennée wrote:
> From: Gustavo Romero <gustavo.romero@linaro.org>
>
> Add a functional test, aarch64_hotplug_pci, to exercise PCI hotplug and
> hot-unplug on arm64.
>
> Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
> Message-Id: <20250512144629.182340-1-gustavo.romero@linaro.org>
> [AJB: add qemu-arm link]
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>
> ---
> v2
> - add qemu-arm link to MAINTAINERS
> ---
> MAINTAINERS | 6 ++
> tests/functional/meson.build | 1 +
> tests/functional/test_aarch64_hotplug_pci.py | 74 ++++++++++++++++++++
> 3 files changed, 81 insertions(+)
> create mode 100755 tests/functional/test_aarch64_hotplug_pci.py
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 7060cf49b9..818d7b9d5f 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2078,6 +2078,12 @@ S: Supported
> F: include/hw/pci/pcie_doe.h
> F: hw/pci/pcie_doe.c
>
> +ARM PCI Hotplug
> +M: Gustavo Romero <gustavo.romero@linaro.org>
> +L: qemu-arm@nongnu.org
> +S: Supported
> +F: tests/functional/test_aarch64_hotplug_pci.py
> +
> ACPI/SMBIOS
> M: Michael S. Tsirkin <mst@redhat.com>
> M: Igor Mammedov <imammedo@redhat.com>
> diff --git a/tests/functional/meson.build b/tests/functional/meson.build
> index 52b4706cfe..2d68840fa2 100644
> --- a/tests/functional/meson.build
> +++ b/tests/functional/meson.build
> @@ -83,6 +83,7 @@ tests_aarch64_system_quick = [
> tests_aarch64_system_thorough = [
> 'aarch64_aspeed_ast2700',
> 'aarch64_aspeed_ast2700fc',
> + 'aarch64_hotplug_pci',
> 'aarch64_imx8mp_evk',
> 'aarch64_raspi3',
> 'aarch64_raspi4',
> diff --git a/tests/functional/test_aarch64_hotplug_pci.py b/tests/functional/test_aarch64_hotplug_pci.py
> new file mode 100755
> index 0000000000..fa1bb62c8f
> --- /dev/null
> +++ b/tests/functional/test_aarch64_hotplug_pci.py
> @@ -0,0 +1,74 @@
> +#!/usr/bin/env python3
> +#
> +# SPDX-License-Identifier: GPL-2.0-or-later
> +#
> +# The test hotplugs a PCI device and checks it on a Linux guest.
> +#
> +# Copyright (c) 2025 Linaro Ltd.
> +#
> +# Author:
> +# Gustavo Romero <gustavo.romero@linaro.org>
> +#
> +# This work is licensed under the terms of the GNU GPL, version 2 or
> +# later. See the COPYING file in the top-level directory.
> +
> +from qemu_test import LinuxKernelTest, Asset, exec_command_and_wait_for_pattern
> +from qemu_test import BUILD_DIR
> +
> +class HotplugPCI(LinuxKernelTest):
> +
> + ASSET_KERNEL = Asset(
> + ('https://ftp.debian.org/debian/dists/stable/main/installer-arm64/'
> + 'current/images/netboot/debian-installer/arm64/linux'),
> + '3821d4db56d42c6a4eac62f31846e35465940afd87746b4cfcdf5c9eca3117b2')
> +
> + ASSET_INITRD = Asset(
> + ('https://ftp.debian.org/debian/dists/stable/main/installer-arm64/'
> + 'current/images/netboot/debian-installer/arm64/initrd.gz'),
> + '2583ec22b45265ad69e82f198674f53d4cd85be124fe012eedc2fd91156bc4b4')
> +
> + def test_hotplug_pci(self):
> +
> + self.set_machine('virt')
> + self.vm.add_args('-m', '512M')
> + self.vm.add_args('-cpu', 'cortex-a57')
> + self.vm.add_args('-append',
> + 'console=ttyAMA0,115200 init=/bin/sh')
> + self.vm.add_args('-device',
> + 'pcie-root-port,bus=pcie.0,chassis=1,slot=1,id=pcie.1')
> + self.vm.add_args('-bios', self.build_file('pc-bios',
> + 'edk2-aarch64-code.fd'))
One call of self.vm.add_args should be sufficient:
self.vm.add_args('-m', '512M',
'-cpu', 'cortex-a57',
'-append',
'console=ttyAMA0,115200 init=/bin/sh',
'-device',
'pcie-root-port,bus=pcie.0,chassis=1,slot=1,id=pcie.1',
'-bios',
self.build_file('pc-bios', 'edk2-aarch64-code.fd'))
> +
> + # BusyBox prompt
> + prompt = "~ #"
> + self.launch_kernel(self.ASSET_KERNEL.fetch(),
> + self.ASSET_INITRD.fetch(),
> + wait_for=prompt)
> +
> + # Check for initial state: 2 network adapters, lo and enp0s1.
> + exec_command_and_wait_for_pattern(self,
> + 'ls -l /sys/class/net | wc -l',
Shorter: ls /sys/class/net | wc -l
> + '2')
> +
> + # Hotplug one network adapter to the root port, i.e. pcie.1 bus.
> + self.vm.cmd('device_add',
> + driver='virtio-net-pci',
> + bus='pcie.1',
> + addr=0,
> + id='na')
> + # Wait for the kernel to recognize the new device.
> + self.wait_for_console_pattern('virtio-pci')
> + self.wait_for_console_pattern('virtio_net')
> +
> + # Check if there is a new network adapter.
> + exec_command_and_wait_for_pattern(self,
> + 'ls -l /sys/class/net | wc -l',
> + '3')
> +
> + self.vm.cmd('device_del', id='na')
> + exec_command_and_wait_for_pattern(self,
> + 'ls -l /sys/class/net | wc -l',
> + '2')
> +
> +if __name__ == '__main__':
> + LinuxKernelTest.main()