diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-09-07 15:26:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-09-07 15:26:06 +0100 |
| commit | 7794b34e63fd42803e959c4989e5358f2412d325 (patch) | |
| tree | d02cc131cb9f67a081a14a5f92deccf8b09190da /tests | |
| parent | 7e375e04422be092160635ef42e16daec1b0e4ca (diff) | |
| parent | a31fedeed764ce0b0d6097d4334c5770e74641a0 (diff) | |
| download | qemu-7794b34e63fd42803e959c4989e5358f2412d325.tar.gz | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20170906a' into staging
migration pull 2017-09-06
# gpg: Signature made Wed 06 Sep 2017 19:39:23 BST
# gpg: using RSA key 0x0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-migration-20170906a:
migration: dump str in migrate_set_state trace
snapshot/tests: Try loadvm twice
migration: Reset rather than destroy main_thread_load_event
runstate/migrate: Two more transitions
host-utils: Simplify pow2ceil()
host-utils: Proactively fix pow2floor(), switch to unsigned
xbzrle: Drop unused cache_resize()
migration: Report when bdrv_inactivate_all fails
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/068 | 2 | ||||
| -rw-r--r-- | tests/qemu-iotests/068.out | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 index cfa0f2aed5..e7fca6a494 100755 --- a/tests/qemu-iotests/068 +++ b/tests/qemu-iotests/068 @@ -78,7 +78,7 @@ for extra_args in \ # Give qemu some time to boot before saving the VM state { sleep 1; printf "savevm 0\nquit\n"; } | _qemu $extra_args # Now try to continue from that VM state (this should just work) - echo quit | _qemu $extra_args -loadvm 0 + { sleep 1; printf "loadvm 0\nloadvm 0\nquit\n"; } | _qemu $extra_args -S done # success, all done diff --git a/tests/qemu-iotests/068.out b/tests/qemu-iotests/068.out index aa063cf711..f07a938a38 100644 --- a/tests/qemu-iotests/068.out +++ b/tests/qemu-iotests/068.out @@ -7,6 +7,8 @@ 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) loadvm 0 +(qemu) loadvm 0 (qemu) quit === Saving and reloading a VM state to/from a qcow2 image (-object iothread,id=iothread0 -set device.hba0.iothread=iothread0) === @@ -16,5 +18,7 @@ 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) loadvm 0 +(qemu) loadvm 0 (qemu) quit *** done |