diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2018-12-05 09:43:08 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2018-12-14 11:55:02 +0100 |
| commit | 2c26e648e4350079b0c86a6627b2d3566c3709c0 (patch) | |
| tree | 2686808ae72d50b45a006b7327ec25a10d4d8c04 /tests | |
| parent | e6d79c41c961bcdacb60b46c88009b33841f90a7 (diff) | |
iotests: make 235 work on s390 (and others)
"-machine pc" will not work all architectures. Lets fall back to the
default machine by not specifying it.
In addition we also need to specify -no-shutdown on s390 as qemu will
exit otherwise.
Cc: qemu-stable@nongnu.org
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/235 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/qemu-iotests/235 b/tests/qemu-iotests/235 index da044ed34e..d6edd97ab4 100755 --- a/tests/qemu-iotests/235 +++ b/tests/qemu-iotests/235 @@ -49,7 +49,9 @@ qemu_img_create('-f', iotests.imgfmt, '-o', 'preallocation=metadata', disk, str(size)) vm = QEMUMachine(iotests.qemu_prog) -vm.add_args('-machine', 'pc,accel=kvm') +vm.add_args('-machine', 'accel=kvm') +if iotests.qemu_default_machine == 's390-ccw-virtio': + vm.add_args('-no-shutdown') vm.add_args('-drive', 'id=src,file=' + disk) vm.launch() |