| Message ID | 20181205084308.201356-1-borntraeger@de.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/1] iotests: make 235 work on s390 (and others) | expand |
On 12/5/18 2:43 AM, Christian Borntraeger wrote: > "-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. > > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> CC: qemu-stable > --- > tests/qemu-iotests/235 | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Reviewed-by: Eric Blake <eblake@redhat.com> Too late for 3.1; for that, we can just document that there are known iotests failures under some configurations
Am 05.12.2018 um 16:34 hat Eric Blake geschrieben: > On 12/5/18 2:43 AM, Christian Borntraeger wrote: > > "-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. > > > > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> > > CC: qemu-stable > > > --- > > tests/qemu-iotests/235 | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > Reviewed-by: Eric Blake <eblake@redhat.com> > > Too late for 3.1; for that, we can just document that there are known > iotests failures under some configurations Thanks, applied to the block-next branch. Kevin
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()
"-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. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> --- tests/qemu-iotests/235 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)