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

tests/functional: bail aarch64_virt tests early if missing TCG

Browse source 
The set_machine and require_accelerator steps can bail early so move
those to the front of the test functions. While we are at it also
clean up some long lines when adding the vm arguments.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20250108121054.1126164-23-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2025-01-08 12:10:44 +00:00
parent f2e116184e
commit 0d3af961f7
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tests/functional/test_aarch64_virt.py
View file

@ -40,9 +40,9 @@ class Aarch64VirtMachine(QemuSystemTest):
iso_path = self.ASSET_ALPINE_ISO.fetch()
self.set_machine('virt')
self.vm.set_console()
self.require_accelerator("tcg")
self.vm.set_console()
self.vm.add_args("-accel", "tcg")
self.vm.add_args("-cpu", "max,pauth-impdef=on")
self.vm.add_args("-machine",
@ -71,15 +71,16 @@ class Aarch64VirtMachine(QemuSystemTest):
Common code to launch basic virt machine with kernel+initrd
and a scratch disk.
"""
self.set_machine('virt')
self.require_accelerator("tcg")
logger = logging.getLogger('aarch64_virt')
kernel_path = self.ASSET_KERNEL.fetch()
self.set_machine('virt')
self.vm.set_console()
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
'console=ttyAMA0')
self.require_accelerator("tcg")
self.vm.add_args('-cpu', 'max,pauth-impdef=on',
'-machine', machine,
'-accel', 'tcg',
@ -100,7 +101,9 @@ class Aarch64VirtMachine(QemuSystemTest):
# Add the device
self.vm.add_args('-blockdev',
f"driver=qcow2,file.driver=file,file.filename={image_path},node-name=scratch")
"driver=qcow2,"
"file.driver=file,"
f"file.filename={image_path},node-name=scratch")
self.vm.add_args('-device',
'virtio-blk-device,drive=scratch')