diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2017-06-15 17:38:13 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-06-26 14:51:13 +0200 |
| commit | ea4f3cebc4e0224605ab9dd9724aa4e7768fe372 (patch) | |
| tree | 89b20c7436e987a3ba215cf03c6cd56b41ef6037 /tests | |
| parent | 5aaf590df4b075c18cf6f27a51900a126deb8634 (diff) | |
| download | qemu-ea4f3cebc4e0224605ab9dd9724aa4e7768fe372.zip | |
qemu-iotests: 068: test iothread mode
Perform the savevm/loadvm test with both iothread on and off. This
covers the recently found savevm/loadvm hang when iothread is enabled.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/068 | 23 | ||||
| -rw-r--r-- | tests/qemu-iotests/068.out | 11 |
2 files changed, 24 insertions, 10 deletions
diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 index 7292643fdc..3801b65b9d 100755 --- a/tests/qemu-iotests/068 +++ b/tests/qemu-iotests/068 @@ -45,11 +45,6 @@ _supported_os Linux IMGOPTS="compat=1.1" IMG_SIZE=128K -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" @@ -71,10 +66,20 @@ _qemu() _filter_qemu | _filter_hmp } -# Give qemu some time to boot before saving the VM state -bash -c 'sleep 1; echo -e "savevm 0\nquit"' | _qemu -# Now try to continue from that VM state (this should just work) -echo quit | _qemu -loadvm 0 +for extra_args in \ + "" \ + "-object iothread,id=iothread0 -set device.hba0.iothread=iothread0"; do + echo + echo "=== Saving and reloading a VM state to/from a qcow2 image ($extra_args) ===" + echo + + _make_test_img $IMG_SIZE + + # Give qemu some time to boot before saving the VM state + bash -c 'sleep 1; echo -e "savevm 0\nquit"' | _qemu $extra_args + # Now try to continue from that VM state (this should just work) + echo quit | _qemu $extra_args -loadvm 0 +done # success, all done echo "*** done" diff --git a/tests/qemu-iotests/068.out b/tests/qemu-iotests/068.out index 0fa5340c22..aa063cf711 100644 --- a/tests/qemu-iotests/068.out +++ b/tests/qemu-iotests/068.out @@ -1,6 +1,15 @@ QA output created by 068 -=== Saving and reloading a VM state to/from a qcow2 image === +=== Saving and reloading a VM state to/from a qcow2 image () === + +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=131072 +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) savevm 0 +(qemu) quit +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) quit + +=== Saving and reloading a VM state to/from a qcow2 image (-object iothread,id=iothread0 -set device.hba0.iothread=iothread0) === Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=131072 QEMU X.Y.Z monitor - type 'help' for more information |