summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorPeter Maydell2017-09-27 23:44:51 +0200
committerPeter Maydell2017-09-27 23:44:51 +0200
commitab161529261928ae7f3556e3220829c34b2686ec (patch)
treea19806665ba984fec11c0d1175cc39d0d3a4edd8 /docs
parentMerge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20170927' int... (diff)
parentmigration: Route more error paths (diff)
downloadqemu-ab161529261928ae7f3556e3220829c34b2686ec.tar.gz
qemu-ab161529261928ae7f3556e3220829c34b2686ec.tar.xz
qemu-ab161529261928ae7f3556e3220829c34b2686ec.zip
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20170927a' into staging
Migration pull 2017-09-27 # gpg: Signature made Wed 27 Sep 2017 14:56: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-20170927a: migration: Route more error paths migration: Route errors up through vmstate_save migration: wire vmstate_save_state errors up to vmstate_subsection_save migration: Check field save returns migration: check pre_save return in vmstate_save_state migration: pre_save return int migration: disable auto-converge during bulk block migration Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
-rw-r--r--docs/devel/migration.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/devel/migration.txt b/docs/devel/migration.txt
index 1b940a829b..4030703726 100644
--- a/docs/devel/migration.txt
+++ b/docs/devel/migration.txt
@@ -202,7 +202,7 @@ The functions to do that are inside a vmstate definition, and are called:
This function is called after we load the state of one device.
-- void (*pre_save)(void *opaque);
+- int (*pre_save)(void *opaque);
This function is called before we save the state of one device.