diff mbox series

[PULL,41/41] iotests: make 235 work on s390 (and others)

Message ID	20181212132735.16080-42-kwolf@redhat.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: Kevin Wolf <kwolf@redhat.com> To: qemu-block@nongnu.org Date: Wed, 12 Dec 2018 14:27:35 +0100 Message-Id: <20181212132735.16080-42-kwolf@redhat.com> In-Reply-To: <20181212132735.16080-1-kwolf@redhat.com> References: <20181212132735.16080-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 41/41] iotests: make 235 work on s390 (and others) Precedence: list Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	[PULL,01/41] block: adding lzfse decompressing support as a module. \| expand [PULL,01/41] block: adding lzfse decompressing support as a module. [PULL,02/41] configure: adding support to lzfse library. [PULL,03/41] dmg: including dmg-lzfse module inside dmg block driver. [PULL,04/41] dmg: exchanging hardcoded dmg UDIF block types to enum. [PULL,05/41] block/replication: drop extra synchronization [PULL,06/41] block/backup: drop unused synchronization interface [PULL,07/41] qcow2: use Z_OK instead of 0 for deflateInit2 return code check [PULL,08/41] qcow2: make more generic interface for qcow2_compress [PULL,09/41] qcow2: move decompression from qcow2-cluster.c to qcow2.c [PULL,10/41] qcow2: refactor decompress_buffer [PULL,11/41] qcow2: use byte-based read in qcow2_decompress_cluster [PULL,12/41] qcow2: aio support for compressed cluster read [PULL,13/41] qcow2: do decompression in threads [PULL,14/41] file-posix: Reorganise RawPosixAIOData [PULL,15/41] file-posix: Factor out raw_thread_pool_submit() [PULL,16/41] file-posix: Avoid aio_worker() for QEMU_AIO_TRUNCATE [PULL,17/41] file-posix: Avoid aio_worker() for QEMU_AIO_COPY_RANGE [PULL,18/41] file-posix: Avoid aio_worker() for QEMU_AIO_WRITE_ZEROES [PULL,19/41] file-posix: Avoid aio_worker() for QEMU_AIO_DISCARD [PULL,20/41] file-posix: Avoid aio_worker() for QEMU_AIO_FLUSH [PULL,21/41] file-posix: Move read/write operation logic out of aio_worker() [PULL,22/41] file-posix: Avoid aio_worker() for QEMU_AIO_READ/WRITE [PULL,23/41] file-posix: Remove paio_submit_co() [PULL,24/41] file-posix: Switch to .bdrv_co_ioctl [PULL,25/41] file-posix: Avoid aio_worker() for QEMU_AIO_IOCTL [PULL,26/41] block: Add bdrv_reopen_set_read_only() [PULL,27/41] block: Use bdrv_reopen_set_read_only() in bdrv_backing_update_filename() [PULL,28/41] block: Use bdrv_reopen_set_read_only() in commit_start/complete() [PULL,29/41] block: Use bdrv_reopen_set_read_only() in bdrv_commit() [PULL,30/41] block: Use bdrv_reopen_set_read_only() in stream_start/complete() [PULL,31/41] block: Use bdrv_reopen_set_read_only() in qmp_change_backing_file() [PULL,32/41] block: Use bdrv_reopen_set_read_only() in external_snapshot_commit() [PULL,33/41] block: Use bdrv_reopen_set_read_only() in the mirror driver [PULL,34/41] block: Drop bdrv_reopen() [PULL,35/41] qemu-io: Put flag changes in the options QDict in reopen_f() [PULL,36/41] block: Clean up reopen_backing_file() in block/replication.c [PULL,37/41] block: Remove flags parameter from bdrv_reopen_queue() [PULL,38/41] block: Stop passing flags to bdrv_reopen_queue_child() [PULL,39/41] block: Remove assertions from update_flags_from_options() [PULL,40/41] block: Assert that flags are up-to-date in bdrv_reopen_prepare() [PULL,41/41] iotests: make 235 work on s390 (and others)

Commit Message

Kevin Wolf Dec. 12, 2018, 1:27 p.m. UTC

From: Christian Borntraeger <borntraeger@de.ibm.com>

"-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>
---
 tests/qemu-iotests/235 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff mbox series

Patch

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()