| Message ID | 1446604018-14025-4-git-send-email-tubo@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On 04.11.2015 03:26, Bo Tu wrote: > Now, s390-virtio-ccw is default machine and s390-ccw.img is default boot > loader. If the s390-virtio-ccw machine finds no device to load from and > errors out, then emits a panic and exits the vm. This breaks test cases > 068 for s390x. > Adding the parameter of "-no-shutdown" for s390-ccw-virtio will pause VM > before shutdown. > > Reviewed-by: Sascha Silbe <silbe@linux.vnet.ibm.com> > Signed-off-by: Bo Tu <tubo@linux.vnet.ibm.com> > --- > tests/qemu-iotests/068 | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) Acked-by: Max Reitz <mreitz@redhat.com> (I have no way of verifying that this patch fixes this test for said machine type, so I cannot give an R-b.)
diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 index b72e555..58d1d80 100755 --- a/tests/qemu-iotests/068 +++ b/tests/qemu-iotests/068 @@ -50,13 +50,23 @@ echo echo "=== Saving and reloading a VM state to/from a qcow2 image ===" echo _make_test_img $IMG_SIZE + +case "$QEMU_DEFAULT_MACHINE" in + s390-ccw-virtio) + platform_parm="-no-shutdown -machine accel=kvm" + ;; + *) + platform_parm="" + ;; +esac + # Give qemu some time to boot before saving the VM state bash -c 'sleep 1; echo -e "savevm 0\nquit"' |\ - $QEMU -nographic -monitor stdio -serial none -hda "$TEST_IMG" |\ + $QEMU $platform_parm -nographic -monitor stdio -serial none -hda "$TEST_IMG" |\ _filter_qemu # Now try to continue from that VM state (this should just work) echo quit |\ - $QEMU -nographic -monitor stdio -serial none -hda "$TEST_IMG" -loadvm 0 |\ + $QEMU $platform_parm -nographic -monitor stdio -serial none -hda "$TEST_IMG" -loadvm 0 |\ _filter_qemu # success, all done