ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: Remove RAMState.f references in compression code 

Removing referencing to RAMState.f in compress_page_with_multi_thread() and
flush_compressed_data().

Compression code by default isn't compatible with having >1 channels (or it
won't currently know which channel to flush the compressed data), so to
make it simple we always flush on the default to_dst_file port until
someone wants to add >1 ports support, as rs->f right now can really
change (after postcopy preempt is introduced).

There should be no functional change at all after patch applied, since as
long as rs->f referenced in compression code, it must be to_dst_file.

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Peter Xu 2022-10-11 17:55:49 -04:00 committed by Juan Quintela
parent 10661f1180
commit eaa238ab31
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
migration/ram.c
View File

@ -1461,6 +1461,7 @@ static bool save_page_use_compression(RAMState *rs);
static void flush_compressed_data(RAMState *rs) static void flush_compressed_data(RAMState *rs)
{ {
MigrationState *ms = migrate_get_current();
int idx, len, thread_count; int idx, len, thread_count;
if (!save_page_use_compression(rs)) { if (!save_page_use_compression(rs)) {
@ -1479,7 +1480,7 @@ static void flush_compressed_data(RAMState *rs)
for (idx = 0; idx < thread_count; idx++) { for (idx = 0; idx < thread_count; idx++) {
qemu_mutex_lock(&comp_param[idx].mutex); qemu_mutex_lock(&comp_param[idx].mutex);
if (!comp_param[idx].quit) { if (!comp_param[idx].quit) {
len = qemu_put_qemu_file(rs->f, comp_param[idx].file); len = qemu_put_qemu_file(ms->to_dst_file, comp_param[idx].file);
/* /*
* it's safe to fetch zero_page without holding comp_done_lock * it's safe to fetch zero_page without holding comp_done_lock
* as there is no further request submitted to the thread, * as there is no further request submitted to the thread,
@ -1498,11 +1499,11 @@ static inline void set_compress_params(CompressParam *param, RAMBlock *block,
param->offset = offset; param->offset = offset;
} }
static int compress_page_with_multi_thread(RAMState *rs, RAMBlock *block, static int compress_page_with_multi_thread(RAMBlock *block, ram_addr_t offset)
ram_addr_t offset)
{ {
int idx, thread_count, bytes_xmit = -1, pages = -1; int idx, thread_count, bytes_xmit = -1, pages = -1;
bool wait = migrate_compress_wait_thread(); bool wait = migrate_compress_wait_thread();
MigrationState *ms = migrate_get_current();
thread_count = migrate_compress_threads(); thread_count = migrate_compress_threads();
qemu_mutex_lock(&comp_done_lock); qemu_mutex_lock(&comp_done_lock);
@ -1510,7 +1511,8 @@ retry:
for (idx = 0; idx < thread_count; idx++) { for (idx = 0; idx < thread_count; idx++) {
if (comp_param[idx].done) { if (comp_param[idx].done) {
comp_param[idx].done = false; comp_param[idx].done = false;
bytes_xmit = qemu_put_qemu_file(rs->f, comp_param[idx].file); bytes_xmit = qemu_put_qemu_file(ms->to_dst_file,
comp_param[idx].file);
qemu_mutex_lock(&comp_param[idx].mutex); qemu_mutex_lock(&comp_param[idx].mutex);
set_compress_params(&comp_param[idx], block, offset); set_compress_params(&comp_param[idx], block, offset);
qemu_cond_signal(&comp_param[idx].cond); qemu_cond_signal(&comp_param[idx].cond);
@ -2263,7 +2265,7 @@ static bool save_compress_page(RAMState *rs, RAMBlock *block, ram_addr_t offset)
return false; return false;
} }
if (compress_page_with_multi_thread(rs, block, offset) > 0) { if (compress_page_with_multi_thread(block, offset) > 0) {
return true; return true;
} }