[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PATCH 02/36] iotests: make 235 work on s390 (and others)
From: |
Michael Roth |
Subject: |
[Qemu-stable] [PATCH 02/36] iotests: make 235 work on s390 (and others) |
Date: |
Tue, 23 Jul 2019 12:00:30 -0500 |
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>
(cherry picked from commit 2c26e648e4350079b0c86a6627b2d3566c3709c0)
Signed-off-by: Michael Roth <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.17.1
- [Qemu-stable] [PATCH 28/36] cutils: Fix size_to_str() on 32-bit platforms, (continued)
- [Qemu-stable] [PATCH 28/36] cutils: Fix size_to_str() on 32-bit platforms, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 14/36] slirp: check sscanf result when emulating ident, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 26/36] qemu-img: fix error reporting for -object, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 23/36] mac_newworld: use node name instead of alias name for hd device in FWPathProvider, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 30/36] do not call vhost_net_cleanup() on running net from char user event, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 22/36] mac_oldworld: use node name instead of alias name for hd device in FWPathProvider, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 01/36] i2c: Move typedef of bitbang_i2c_interface to i2c.h, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 03/36] Changes requirement for "vsubsbs" instruction, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 02/36] iotests: make 235 work on s390 (and others),
Michael Roth <=
- [Qemu-stable] [PATCH 06/36] hw/s390x: Fix bad mask in time2tod(), Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 33/36] iotests: Filter second BLOCK_JOB_ERROR from 229, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 05/36] pc:piix4: Update smbus I/O space after a migration, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 31/36] s390x/cpumodel: ignore csske for expansion, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 34/36] block/file-posix: Unaligned O_DIRECT block-status, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 32/36] megasas: fix mapped frame size, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 35/36] iotests: Test unaligned raw images with O_DIRECT, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 36/36] vhost: fix vhost_log size overflow during migration, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 08/36] s390x: Return specification exception for unimplemented diag 308 subcodes, Michael Roth, 2019/07/23
- [Qemu-stable] [PATCH 04/36] pcie: set link state inactive/active after hot unplug/plug, Michael Roth, 2019/07/23