diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-12 18:08:19 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-12 18:08:19 +0000 |
| commit | f3bcfc5663646f74e62fe9d3d8774b8f0adda7bf (patch) | |
| tree | 9a1d35e8a5be2a048e94a8abe6e85d92b4accbdb /include | |
| parent | b2df6a79df6343d0ed4ea05d83b3ff1d849e8d25 (diff) | |
| parent | 389775d1f67b2c8f44f9473b1e5363735972e389 (diff) | |
| download | qemu-f3bcfc5663646f74e62fe9d3d8774b8f0adda7bf.zip qemu-f3bcfc5663646f74e62fe9d3d8774b8f0adda7bf.tar.gz qemu-f3bcfc5663646f74e62fe9d3d8774b8f0adda7bf.tar.bz2 | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20151112' into staging
migration/next for 20151112
# gpg: Signature made Thu 12 Nov 2015 16:56:44 GMT using RSA key ID 5872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg: aka "Juan Quintela <quintela@trasno.org>"
* remotes/juanquintela/tags/migration/20151112:
migration_init: Fix lock initialisation/make it explicit
migrate-start-postcopy: Improve text
Postcopy: Fix TP!=HP zero case
Finish non-postcopiable iterative devices before package
migration: Make 32bit linux compile with RDMA
migration: print ram_addr_t as RAM_ADDR_FMT not %zx
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sysemu/sysemu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index f992494..3bb8897 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -112,7 +112,7 @@ void qemu_savevm_state_header(QEMUFile *f); int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy); void qemu_savevm_state_cleanup(void); void qemu_savevm_state_complete_postcopy(QEMUFile *f); -void qemu_savevm_state_complete_precopy(QEMUFile *f); +void qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only); void qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size, uint64_t *res_non_postcopiable, uint64_t *res_postcopiable); |