diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2023-12-11 09:13:32 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2024-01-08 13:58:31 +0000 |
| commit | 6f6b71536cc0e8b0fa3547deb3a0ac6be3398941 (patch) | |
| tree | 88ce76fea6128803e225400796f7a3dfb4d38f3b /tests | |
| parent | 2d8508bbab39bf342fe80e73c0b528eb3960fa37 (diff) | |
| download | qemu-6f6b71536cc0e8b0fa3547deb3a0ac6be3398941.zip qemu-6f6b71536cc0e8b0fa3547deb3a0ac6be3398941.tar.gz qemu-6f6b71536cc0e8b0fa3547deb3a0ac6be3398941.tar.bz2 | |
tests/avocado: modernise the drive args for replay_linux
QEMU complains about us not being explicit with setting snapshot so
lets do that. Also as cdroms are RO media we don't need to jump the
hoops of setting up snapshots and replay disks - just declare the
drive is a cdrom and nothing should change.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20231211091346.14616-4-alex.bennee@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/avocado/replay_linux.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/avocado/replay_linux.py b/tests/avocado/replay_linux.py index e95bff3..f3a43dc 100644 --- a/tests/avocado/replay_linux.py +++ b/tests/avocado/replay_linux.py @@ -48,12 +48,15 @@ class ReplayLinux(LinuxTest): bus_string = '' if self.bus: bus_string = ',bus=%s.%d' % (self.bus, id,) - vm.add_args('-drive', 'file=%s,snapshot,id=disk%s,if=none' % (path, 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() @@ -65,7 +68,7 @@ class ReplayLinux(LinuxTest): if args: vm.add_args(*args) self.vm_add_disk(vm, self.boot_path, 0, self.hdd) - self.vm_add_disk(vm, self.cloudinit_path, 1, self.cd) + self.vm_add_cdrom(vm, self.cloudinit_path, 1, self.cd) logger = logging.getLogger('replay') if record: logger.info('recording the execution...') |