diff options
| author | Liang Li <liang.z.li@intel.com> | 2015-03-23 16:32:24 +0800 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2015-05-07 18:31:53 +0200 |
| commit | 98f1138902195bd9ab8a753d0ee2cf2a0a88b6e8 (patch) | |
| tree | 94673703b7ee7f325fc8ff6046de89bf2b2c9f37 /arch_init.c | |
| parent | 20eb617eacf7a0ce76d9dd10ff246d6ae7f0b4e1 (diff) | |
| download | focaccia-qemu-98f1138902195bd9ab8a753d0ee2cf2a0a88b6e8.tar.gz focaccia-qemu-98f1138902195bd9ab8a753d0ee2cf2a0a88b6e8.zip | |
migration: Make compression co-work with xbzrle
Now, multiple thread compression can co-work with xbzrle. when xbzrle is on, multiple thread compression will only work at the first round of RAM data sync. Signed-off-by: Liang Li <liang.z.li@intel.com> Signed-off-by: Yang Zhang <yang.z.zhang@intel.com> Reviewed-by: Dr.David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'arch_init.c')
| -rw-r--r-- | arch_init.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch_init.c b/arch_init.c index db1759117e..129c710c3c 100644 --- a/arch_init.c +++ b/arch_init.c @@ -349,6 +349,8 @@ static QemuMutex *comp_done_lock; static QemuCond *comp_done_cond; /* The empty QEMUFileOps will be used by file in CompressParam */ static const QEMUFileOps empty_ops = { }; + +static bool compression_switch; static bool quit_comp_thread; static bool quit_decomp_thread; static DecompressParam *decomp_param; @@ -435,6 +437,7 @@ void migrate_compress_threads_create(void) return; } quit_comp_thread = false; + compression_switch = true; thread_count = migrate_compress_threads(); compress_threads = g_new0(QemuThread, thread_count); comp_param = g_new0(CompressParam, thread_count); @@ -1061,9 +1064,16 @@ static int ram_find_and_save_block(QEMUFile *f, bool last_stage, block = QLIST_FIRST_RCU(&ram_list.blocks); complete_round = true; ram_bulk_stage = false; + if (migrate_use_xbzrle()) { + /* If xbzrle is on, stop using the data compression at this + * point. In theory, xbzrle can do better than compression. + */ + flush_compressed_data(f); + compression_switch = false; + } } } else { - if (migrate_use_compression()) { + if (compression_switch && migrate_use_compression()) { pages = ram_save_compressed_page(f, block, offset, last_stage, bytes_transferred); } else { |