diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-02-16 12:51:40 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-02-16 12:51:40 +0000 |
| commit | 648ba915961664ecb4cff0ee847a929c65e4b4b4 (patch) | |
| tree | 4e688224f2bf948000d03c34cff398c44e65bff2 /docs | |
| parent | 0402ca3c70356e09e694fece39256790ff7755f2 (diff) | |
| parent | 3e0c8050ebba3f55dc2d92b3790a3cfb80786d07 (diff) | |
| download | qemu-648ba915961664ecb4cff0ee847a929c65e4b4b4.tar.gz | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180214a' into staging
Migration pull 20180214
Note that the 'Add test for migration to bad destination' displays
a 'Connection refused' during running, but still gives the correct exit
code and OK (It's checking that the source doesn't fail when
it can't connect, so that's the right error).
If it's particularly disliked that patch can be skipped individually.
# gpg: Signature made Wed 14 Feb 2018 15:33:04 GMT
# gpg: using RSA key 0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-migration-20180214a:
migration: pass MigrationState to migrate_init()
migration: allow send_rq to fail
migration: provide postcopy_fault_thread_notify()
migration: reuse mis->userfault_quit_fd
migration: better error handling with QEMUFile
tests/migration: Add test for migration to bad destination
migration: Fix early failure cleanup
tests/migration: Add source to PC boot block
migration: improve documentation of postcopy-ram
migration/xen: Check return value of qemu_fclose
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/devel/migration.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/devel/migration.rst b/docs/devel/migration.rst index bf97080dac..9d1b7657f0 100644 --- a/docs/devel/migration.rst +++ b/docs/devel/migration.rst @@ -387,8 +387,8 @@ doesn't finish in a given time the switch is made to postcopy. Enabling postcopy ----------------- -To enable postcopy, issue this command on the monitor prior to the -start of migration: +To enable postcopy, issue this command on the monitor (both source and +destination) prior to the start of migration: ``migrate_set_capability postcopy-ram on`` |