mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
tests/functional: Use the tuxrun kernel for the aarch64 replay test
This way we can do a full boot in record-replay mode and should get a similar test coverage compared to the old replay test from tests/avocado/replay_linux.py. Since the aarch64 test was the last avocado test in the tests/avocado/replay_linux.py file, we can remove this file now completely. Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com> Message-ID: <20250414113031.151105-13-thuth@redhat.com>
This commit is contained in:
Thomas Huth
parent
7fecdb0acd
commit
a820caf844
3 changed files with 29 additions and 169 deletions
|
|
@ -3668,7 +3668,6 @@ F: include/system/replay.h
|
|||
F: docs/devel/replay.rst
|
||||
F: docs/system/replay.rst
|
||||
F: stubs/replay.c
|
||||
F: tests/avocado/replay_linux.py
|
||||
F: tests/functional/*reverse_debug*.py
|
||||
F: tests/functional/*replay*.py
|
||||
F: qapi/replay.json
|
||||
|
|
|
|||
|
|
@ -1,160 +0,0 @@
|
|||
# Record/replay test that boots a complete Linux system via a cloud image
|
||||
#
|
||||
# Copyright (c) 2020 ISP RAS
|
||||
#
|
||||
# Author:
|
||||
# Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
|
||||
#
|
||||
# This work is licensed under the terms of the GNU GPL, version 2 or
|
||||
# later. See the COPYING file in the top-level directory.
|
||||
|
||||
import os
|
||||
import logging
|
||||
import time
|
||||
|
||||
from avocado import skipUnless
|
||||
from avocado_qemu import BUILD_DIR
|
||||
from avocado.utils import cloudinit
|
||||
from avocado.utils import network
|
||||
from avocado.utils import vmimage
|
||||
from avocado.utils import datadrainer
|
||||
from avocado.utils.path import find_command
|
||||
from avocado_qemu.linuxtest import LinuxTest
|
||||
|
||||
class ReplayLinux(LinuxTest):
|
||||
"""
|
||||
Boots a Linux system, checking for a successful initialization
|
||||
"""
|
||||
|
||||
timeout = 1800
|
||||
chksum = None
|
||||
hdd = 'ide-hd'
|
||||
cd = 'ide-cd'
|
||||
bus = 'ide'
|
||||
|
||||
def setUp(self):
|
||||
# LinuxTest does many replay-incompatible things, but includes
|
||||
# useful methods. Do not setup LinuxTest here and just
|
||||
# call some functions.
|
||||
super(LinuxTest, self).setUp()
|
||||
self._set_distro()
|
||||
self.boot_path = self.download_boot()
|
||||
self.phone_server = cloudinit.PhoneHomeServer(('0.0.0.0', 0),
|
||||
self.name)
|
||||
ssh_pubkey, self.ssh_key = self.set_up_existing_ssh_keys()
|
||||
self.cloudinit_path = self.prepare_cloudinit(ssh_pubkey)
|
||||
|
||||
def vm_add_disk(self, vm, path, id, device):
|
||||
bus_string = ''
|
||||
if self.bus:
|
||||
bus_string = ',bus=%s.%d' % (self.bus, id,)
|
||||
vm.add_args('-drive', 'file=%s,snapshot=on,id=disk%s,if=none' % (path, id))
|
||||
vm.add_args('-drive',
|
||||
'driver=blkreplay,id=disk%s-rr,if=none,image=disk%s' % (id, id))
|
||||
vm.add_args('-device',
|
||||
'%s,drive=disk%s-rr%s' % (device, id, bus_string))
|
||||
|
||||
def vm_add_cdrom(self, vm, path, id, device):
|
||||
vm.add_args('-drive', 'file=%s,id=disk%s,if=none,media=cdrom' % (path, id))
|
||||
|
||||
def launch_and_wait(self, record, args, shift):
|
||||
self.require_netdev('user')
|
||||
vm = self.get_vm()
|
||||
vm.add_args('-smp', '1')
|
||||
vm.add_args('-m', '1024')
|
||||
vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22',
|
||||
'-device', 'virtio-net,netdev=vnet')
|
||||
vm.add_args('-object', 'filter-replay,id=replay,netdev=vnet')
|
||||
if args:
|
||||
vm.add_args(*args)
|
||||
self.vm_add_disk(vm, self.boot_path, 0, self.hdd)
|
||||
self.vm_add_cdrom(vm, self.cloudinit_path, 1, self.cd)
|
||||
logger = logging.getLogger('replay')
|
||||
if record:
|
||||
logger.info('recording the execution...')
|
||||
mode = 'record'
|
||||
else:
|
||||
logger.info('replaying the execution...')
|
||||
mode = 'replay'
|
||||
replay_path = os.path.join(self.workdir, 'replay.bin')
|
||||
vm.add_args('-icount', 'shift=%s,rr=%s,rrfile=%s' %
|
||||
(shift, mode, replay_path))
|
||||
|
||||
start_time = time.time()
|
||||
|
||||
vm.set_console()
|
||||
vm.launch()
|
||||
console_drainer = datadrainer.LineLogger(vm.console_socket.fileno(),
|
||||
logger=self.log.getChild('console'),
|
||||
stop_check=(lambda : not vm.is_running()))
|
||||
console_drainer.start()
|
||||
if record:
|
||||
while not self.phone_server.instance_phoned_back:
|
||||
self.phone_server.handle_request()
|
||||
vm.shutdown()
|
||||
logger.info('finished the recording with log size %s bytes'
|
||||
% os.path.getsize(replay_path))
|
||||
self.run_replay_dump(replay_path)
|
||||
logger.info('successfully tested replay-dump.py')
|
||||
else:
|
||||
vm.event_wait('SHUTDOWN', self.timeout)
|
||||
vm.wait()
|
||||
logger.info('successfully finished the replay')
|
||||
elapsed = time.time() - start_time
|
||||
logger.info('elapsed time %.2f sec' % elapsed)
|
||||
return elapsed
|
||||
|
||||
def run_rr(self, args=None, shift=7):
|
||||
t1 = self.launch_and_wait(True, args, shift)
|
||||
t2 = self.launch_and_wait(False, args, shift)
|
||||
logger = logging.getLogger('replay')
|
||||
logger.info('replay overhead {:.2%}'.format(t2 / t1 - 1))
|
||||
|
||||
def run_replay_dump(self, replay_path):
|
||||
try:
|
||||
subprocess.check_call(["./scripts/replay-dump.py",
|
||||
"-f", replay_path],
|
||||
stdout=subprocess.DEVNULL)
|
||||
except subprocess.CalledProcessError:
|
||||
self.fail('replay-dump.py failed')
|
||||
|
||||
|
||||
@skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout')
|
||||
class ReplayLinuxAarch64(ReplayLinux):
|
||||
"""
|
||||
:avocado: tags=accel:tcg
|
||||
:avocado: tags=arch:aarch64
|
||||
:avocado: tags=machine:virt
|
||||
:avocado: tags=cpu:max
|
||||
"""
|
||||
|
||||
chksum = '1e18d9c0cf734940c4b5d5ec592facaed2af0ad0329383d5639c997fdf16fe49'
|
||||
|
||||
hdd = 'virtio-blk-device'
|
||||
cd = 'virtio-blk-device'
|
||||
bus = None
|
||||
|
||||
def get_common_args(self):
|
||||
return ('-bios',
|
||||
os.path.join(BUILD_DIR, 'pc-bios', 'edk2-aarch64-code.fd'),
|
||||
"-cpu", "max,lpa2=off",
|
||||
'-device', 'virtio-rng-pci,rng=rng0',
|
||||
'-object', 'rng-builtin,id=rng0')
|
||||
|
||||
def test_virt_gicv2(self):
|
||||
"""
|
||||
:avocado: tags=machine:gic-version=2
|
||||
"""
|
||||
|
||||
self.run_rr(shift=3,
|
||||
args=(*self.get_common_args(),
|
||||
"-machine", "virt,gic-version=2"))
|
||||
|
||||
def test_virt_gicv3(self):
|
||||
"""
|
||||
:avocado: tags=machine:gic-version=3
|
||||
"""
|
||||
|
||||
self.run_rr(shift=3,
|
||||
args=(*self.get_common_args(),
|
||||
"-machine", "virt,gic-version=3"))
|
||||
|
|
@ -5,25 +5,46 @@
|
|||
#
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
from qemu_test import Asset, skipIfOperatingSystem
|
||||
from subprocess import check_call, DEVNULL
|
||||
|
||||
from qemu_test import Asset, skipIfOperatingSystem, get_qemu_img
|
||||
from replay_kernel import ReplayKernelBase
|
||||
|
||||
|
||||
class Aarch64Replay(ReplayKernelBase):
|
||||
|
||||
ASSET_KERNEL = Asset(
|
||||
('https://archives.fedoraproject.org/pub/archive/fedora/linux/'
|
||||
'releases/29/Everything/aarch64/os/images/pxeboot/vmlinuz'),
|
||||
'7e1430b81c26bdd0da025eeb8fbd77b5dc961da4364af26e771bd39f379cbbf7')
|
||||
'https://storage.tuxboot.com/buildroot/20241119/arm64/Image',
|
||||
'b74743c5e89e1cea0f73368d24ae0ae85c5204ff84be3b5e9610417417d2f235')
|
||||
|
||||
ASSET_ROOTFS = Asset(
|
||||
'https://storage.tuxboot.com/buildroot/20241119/arm64/rootfs.ext4.zst',
|
||||
'a1acaaae2068df4648d04ff75f532aaa8c5edcd6b936122b6f0db4848a07b465')
|
||||
|
||||
def test_aarch64_virt(self):
|
||||
self.require_netdev('user')
|
||||
self.set_machine('virt')
|
||||
self.cpu = 'cortex-a53'
|
||||
self.cpu = 'cortex-a57'
|
||||
kernel_path = self.ASSET_KERNEL.fetch()
|
||||
|
||||
raw_disk = self.uncompress(self.ASSET_ROOTFS)
|
||||
disk = self.scratch_file('scratch.qcow2')
|
||||
qemu_img = get_qemu_img(self)
|
||||
check_call([qemu_img, 'create', '-f', 'qcow2', '-b', raw_disk,
|
||||
'-F', 'raw', disk], stdout=DEVNULL, stderr=DEVNULL)
|
||||
|
||||
args = ('-drive', 'file=%s,snapshot=on,id=hd0,if=none' % disk,
|
||||
'-drive', 'driver=blkreplay,id=hd0-rr,if=none,image=hd0',
|
||||
'-device', 'virtio-blk-device,drive=hd0-rr',
|
||||
'-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22',
|
||||
'-device', 'virtio-net,netdev=vnet',
|
||||
'-object', 'filter-replay,id=replay,netdev=vnet')
|
||||
|
||||
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
|
||||
'console=ttyAMA0')
|
||||
console_pattern = 'VFS: Cannot open root device'
|
||||
self.run_rr(kernel_path, kernel_command_line, console_pattern)
|
||||
'console=ttyAMA0 root=/dev/vda')
|
||||
console_pattern = 'Welcome to TuxTest'
|
||||
self.run_rr(kernel_path, kernel_command_line, console_pattern,
|
||||
args=args)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue