motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 00:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests/functional: Convert the virtio_gpu avocado test into a standalone test

Browse source 
Nothing thrilling in here, it's just a straight forward conversion.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240830133841.142644-25-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2024-08-30 15:38:18 +02:00
parent 624fb343df
commit 239d08aa96
2 changed files with 30 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/functional/meson.build
View file

@ -79,6 +79,7 @@ tests_x86_64_system_quick = [
tests_x86_64_system_thorough = [ tests_x86_64_system_thorough = [
'netdev_ethtool', 'netdev_ethtool',
'virtio_gpu',
] ]
precache_all = [] precache_all = []

64
tests/avocado/virtio-gpu.py → tests/functional/test_virtio_gpu.py Normal file → Executable file
View file

@ -1,14 +1,16 @@
#!/usr/bin/env python3
#
# virtio-gpu tests # virtio-gpu tests
# #
# This work is licensed under the terms of the GNU GPL, version 2 or # This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory. # later. See the COPYING file in the top-level directory.
from avocado_qemu import BUILD_DIR from qemu_test import BUILD_DIR
from avocado_qemu import QemuSystemTest from qemu_test import QemuSystemTest, Asset
from avocado_qemu import wait_for_console_pattern from qemu_test import wait_for_console_pattern
from avocado_qemu import exec_command_and_wait_for_pattern from qemu_test import exec_command_and_wait_for_pattern
from avocado_qemu import is_readable_executable_file from qemu_test import is_readable_executable_file
from qemu.utils import kvm_available from qemu.utils import kvm_available
@ -28,25 +30,18 @@ def pick_default_vug_bin():
class VirtioGPUx86(QemuSystemTest): class VirtioGPUx86(QemuSystemTest):
"""
:avocado: tags=virtio-gpu
:avocado: tags=arch:x86_64
:avocado: tags=cpu:host
"""
KERNEL_COMMAND_LINE = "printk.time=0 console=ttyS0 rdinit=/bin/bash" KERNEL_COMMAND_LINE = "printk.time=0 console=ttyS0 rdinit=/bin/bash"
KERNEL_URL = ( ASSET_KERNEL = Asset(
"https://archives.fedoraproject.org/pub/archive/fedora" ("https://archives.fedoraproject.org/pub/archive/fedora"
"/linux/releases/33/Everything/x86_64/os/images" "/linux/releases/33/Everything/x86_64/os/images"
"/pxeboot/vmlinuz" "/pxeboot/vmlinuz"),
) '2dc5fb5cfe9ac278fa45640f3602d9b7a08cc189ed63fd9b162b07073e4df397')
KERNEL_HASH = '1433cfe3f2ffaa44de4ecfb57ec25dc2399cdecf' ASSET_INITRD = Asset(
INITRD_URL = ( ("https://archives.fedoraproject.org/pub/archive/fedora"
"https://archives.fedoraproject.org/pub/archive/fedora" "/linux/releases/33/Everything/x86_64/os/images"
"/linux/releases/33/Everything/x86_64/os/images" "/pxeboot/initrd.img"),
"/pxeboot/initrd.img" 'c49b97f893a5349e4883452178763e402bdc5caa8845b226a2d1329b5f356045')
)
INITRD_HASH = 'c828d68a027b53e5220536585efe03412332c2d9'
def wait_for_console_pattern(self, success_message, vm=None): def wait_for_console_pattern(self, success_message, vm=None):
wait_for_console_pattern( wait_for_console_pattern(
@ -57,16 +52,14 @@ class VirtioGPUx86(QemuSystemTest):
) )
def test_virtio_vga_virgl(self): def test_virtio_vga_virgl(self):
"""
:avocado: tags=device:virtio-vga-gl
"""
# FIXME: should check presence of virtio, virgl etc # FIXME: should check presence of virtio, virgl etc
self.require_accelerator('kvm') self.require_accelerator('kvm')
kernel_path = self.fetch_asset(self.KERNEL_URL, self.KERNEL_HASH) kernel_path = self.ASSET_KERNEL.fetch()
initrd_path = self.fetch_asset(self.INITRD_URL, self.INITRD_HASH) initrd_path = self.ASSET_INITRD.fetch()
self.vm.set_console() self.vm.set_console()
self.vm.add_args("-cpu", "host")
self.vm.add_args("-m", "2G") self.vm.add_args("-m", "2G")
self.vm.add_args("-machine", "pc,accel=kvm") self.vm.add_args("-machine", "pc,accel=kvm")
self.vm.add_args("-device", "virtio-vga-gl") self.vm.add_args("-device", "virtio-vga-gl")
@ -83,7 +76,7 @@ class VirtioGPUx86(QemuSystemTest):
self.vm.launch() self.vm.launch()
except: except:
# TODO: probably fails because we are missing the VirGL features # TODO: probably fails because we are missing the VirGL features
self.cancel("VirGL not enabled?") self.skipTest("VirGL not enabled?")
self.wait_for_console_pattern("as init process") self.wait_for_console_pattern("as init process")
exec_command_and_wait_for_pattern( exec_command_and_wait_for_pattern(
@ -92,18 +85,15 @@ class VirtioGPUx86(QemuSystemTest):
self.wait_for_console_pattern("features: +virgl +edid") self.wait_for_console_pattern("features: +virgl +edid")
def test_vhost_user_vga_virgl(self): def test_vhost_user_vga_virgl(self):
"""
:avocado: tags=device:vhost-user-vga
"""
# FIXME: should check presence of vhost-user-gpu, virgl, memfd etc # FIXME: should check presence of vhost-user-gpu, virgl, memfd etc
self.require_accelerator('kvm') self.require_accelerator('kvm')
vug = pick_default_vug_bin() vug = pick_default_vug_bin()
if not vug: if not vug:
self.cancel("Could not find vhost-user-gpu") self.skipTest("Could not find vhost-user-gpu")
kernel_path = self.fetch_asset(self.KERNEL_URL, self.KERNEL_HASH) kernel_path = self.ASSET_KERNEL.fetch()
initrd_path = self.fetch_asset(self.INITRD_URL, self.INITRD_HASH) initrd_path = self.ASSET_INITRD.fetch()
# Create socketpair to connect proxy and remote processes # Create socketpair to connect proxy and remote processes
qemu_sock, vug_sock = socket.socketpair( qemu_sock, vug_sock = socket.socketpair(
@ -129,6 +119,7 @@ class VirtioGPUx86(QemuSystemTest):
) )
self.vm.set_console() self.vm.set_console()
self.vm.add_args("-cpu", "host")
self.vm.add_args("-m", "2G") self.vm.add_args("-m", "2G")
self.vm.add_args("-object", "memory-backend-memfd,id=mem,size=2G") self.vm.add_args("-object", "memory-backend-memfd,id=mem,size=2G")
self.vm.add_args("-machine", "pc,memory-backend=mem,accel=kvm") self.vm.add_args("-machine", "pc,memory-backend=mem,accel=kvm")
@ -147,7 +138,7 @@ class VirtioGPUx86(QemuSystemTest):
self.vm.launch() self.vm.launch()
except: except:
# TODO: probably fails because we are missing the VirGL features # TODO: probably fails because we are missing the VirGL features
self.cancel("VirGL not enabled?") self.skipTest("VirGL not enabled?")
self.wait_for_console_pattern("as init process") self.wait_for_console_pattern("as init process")
exec_command_and_wait_for_pattern(self, "/usr/sbin/modprobe virtio_gpu", exec_command_and_wait_for_pattern(self, "/usr/sbin/modprobe virtio_gpu",
"features: +virgl +edid") "features: +virgl +edid")
@ -155,3 +146,6 @@ class VirtioGPUx86(QemuSystemTest):
qemu_sock.close() qemu_sock.close()
vugp.terminate() vugp.terminate()
vugp.wait() vugp.wait()
if __name__ == '__main__':
QemuSystemTest.main()