[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 41/41] iotests: make 235 work on s390 (and others)
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 41/41] iotests: make 235 work on s390 (and others) |
Date: |
Wed, 12 Dec 2018 14:27:35 +0100 |
From: Christian Borntraeger <address@hidden>
"-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: address@hidden
Signed-off-by: Christian Borntraeger <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/235 | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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()
--
2.19.2
- [Qemu-block] [PULL 29/41] block: Use bdrv_reopen_set_read_only() in bdrv_commit(), (continued)
- [Qemu-block] [PULL 29/41] block: Use bdrv_reopen_set_read_only() in bdrv_commit(), Kevin Wolf, 2018/12/12
- [Qemu-block] [PULL 31/41] block: Use bdrv_reopen_set_read_only() in qmp_change_backing_file(), Kevin Wolf, 2018/12/12
- [Qemu-block] [PULL 32/41] block: Use bdrv_reopen_set_read_only() in external_snapshot_commit(), Kevin Wolf, 2018/12/12
- [Qemu-block] [PULL 33/41] block: Use bdrv_reopen_set_read_only() in the mirror driver, Kevin Wolf, 2018/12/12
- [Qemu-block] [PULL 34/41] block: Drop bdrv_reopen(), Kevin Wolf, 2018/12/12
- [Qemu-block] [PULL 36/41] block: Clean up reopen_backing_file() in block/replication.c, Kevin Wolf, 2018/12/12
- [Qemu-block] [PULL 35/41] qemu-io: Put flag changes in the options QDict in reopen_f(), Kevin Wolf, 2018/12/12
- [Qemu-block] [PULL 37/41] block: Remove flags parameter from bdrv_reopen_queue(), Kevin Wolf, 2018/12/12
- [Qemu-block] [PULL 38/41] block: Stop passing flags to bdrv_reopen_queue_child(), Kevin Wolf, 2018/12/12
- [Qemu-block] [PULL 39/41] block: Remove assertions from update_flags_from_options(), Kevin Wolf, 2018/12/12
- [Qemu-block] [PULL 41/41] iotests: make 235 work on s390 (and others),
Kevin Wolf <=
- [Qemu-block] [PULL 40/41] block: Assert that flags are up-to-date in bdrv_reopen_prepare(), Kevin Wolf, 2018/12/12
- Re: [Qemu-block] [PULL 00/41] Block layer patches, Peter Maydell, 2018/12/14