diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-09-28 17:07:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-09-28 17:07:23 +0100 |
| commit | 042938f46e1c477419d1931381fdadffaa49d45e (patch) | |
| tree | a92e216fd64e4a2b014b6d8da34e3ae2a20e8bcc /migration/migration.c | |
| parent | 567ea80834fc8ec6b0f143cc884403abd0fde65c (diff) | |
| parent | 341ba0df4c69269cac839ddbacb2a0ca641a856d (diff) | |
| download | focaccia-qemu-042938f46e1c477419d1931381fdadffaa49d45e.tar.gz focaccia-qemu-042938f46e1c477419d1931381fdadffaa49d45e.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180926a' into staging
Migration pull 2018-09-26 This supercedes Juan's pull from the 13th # gpg: Signature made Wed 26 Sep 2018 18:07:30 BST # 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-20180926a: migration/ram.c: Avoid taking address of fields in packed MultiFDInit_t struct migration: fix the compression code migration: fix QEMUFile leak tests/migration: Speed up the test on ppc64 migration: cleanup in error paths in loadvm migration/postcopy: Clear have_listen_thread tests/migration: Add migration-test header file tests/migration: Support cross compilation in generating boot header file tests/migration: Convert x86 boot block compilation script into Makefile migration: use save_page_use_compression in flush_compressed_data migration: show the statistics of compression migration: do not flush_compressed_data at the end of iteration Add a hint message to loadvm and exits on failure migration: handle the error condition properly migration: fix calculating xbzrle_counters.cache_miss_rate migration/rdma: Fix uninitialised rdma_return_path Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/migration.c')
| -rw-r--r-- | migration/migration.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/migration/migration.c b/migration/migration.c index 05d0a7296a..d6ae879dc8 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -758,6 +758,18 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) info->xbzrle_cache->overflow = xbzrle_counters.overflow; } + if (migrate_use_compression()) { + info->has_compression = true; + info->compression = g_malloc0(sizeof(*info->compression)); + info->compression->pages = compression_counters.pages; + info->compression->busy = compression_counters.busy; + info->compression->busy_rate = compression_counters.busy_rate; + info->compression->compressed_size = + compression_counters.compressed_size; + info->compression->compression_rate = + compression_counters.compression_rate; + } + if (cpu_throttle_active()) { info->has_cpu_throttle_percentage = true; info->cpu_throttle_percentage = cpu_throttle_get_percentage(); @@ -2268,7 +2280,10 @@ out: */ if (postcopy_pause_return_path_thread(ms)) { /* Reload rp, reset the rest */ - rp = ms->rp_state.from_dst_file; + if (rp != ms->rp_state.from_dst_file) { + qemu_fclose(rp); + rp = ms->rp_state.from_dst_file; + } ms->rp_state.error = false; goto retry; } |