diff options
| author | Peter Maydell | 2017-06-07 16:06:42 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-06-07 16:06:42 +0200 |
| commit | b55a69fe5f0a504dac6359bb7e99a72b130c3661 (patch) | |
| tree | e9c0896f1aa5baf5336f98cd363777079a8a0656 /migration/savevm.c | |
| parent | Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.10-pull-request'... (diff) | |
| parent | qemu/migration: fix the double free problem on from_src_file (diff) | |
| download | qemu-b55a69fe5f0a504dac6359bb7e99a72b130c3661.tar.gz qemu-b55a69fe5f0a504dac6359bb7e99a72b130c3661.tar.xz qemu-b55a69fe5f0a504dac6359bb7e99a72b130c3661.zip | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170607' into staging
migration/next for 20170607
# gpg: Signature made Wed 07 Jun 2017 10:02:01 BST
# gpg: using RSA key 0xF487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg: aka "Juan Quintela <quintela@trasno.org>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03 4B82 F487 EF18 5872 D723
* remotes/juanquintela/tags/migration/20170607:
qemu/migration: fix the double free problem on from_src_file
ram: Make RAMState dynamic
ram: Use MigrationStats for statistics
ram: Move ZERO_TARGET_PAGE inside XBZRLE
ram: Call migration_page_queue_free() at ram_migration_cleanup()
ram: We only print throttling information sometimes
ram: Unfold get_xbzrle_cache_stats() into populate_ram_info()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/savevm.c')
| -rw-r--r-- | migration/savevm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/migration/savevm.c b/migration/savevm.c index 1993ca23fe..745caaebef 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2276,7 +2276,6 @@ int load_snapshot(const char *name, Error **errp) aio_context_acquire(aio_context); ret = qemu_loadvm_state(f); - qemu_fclose(f); aio_context_release(aio_context); migration_incoming_state_destroy(); |