mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 15:53:54 -06:00
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>
This commit is contained in:
parent
2d8508bbab
commit
6f6b71536c
1 changed files with 5 additions and 2 deletions
|
@ -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...')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue