Lukas Straub <lukasstra...@web.de> wrote: > And take the param->mutex lock for the whole section to ensure > thread-safety. > Now, it is explicitly clear if there is no queued data to send. > Before, this was handled by param->file stream being empty and thus > qemu_put_qemu_file() not sending anything. > > This will be used in the next commits to move save_page_header() > out of compress code. > > Signed-off-by: Lukas Straub <lukasstra...@web.de>
Reviewed-by: Juan Quintela <quint...@redhat.com> If you do more changes around here, please consider: > @@ -1540,13 +1547,16 @@ static void flush_compressed_data(RAMState *rs) > for (idx = 0; idx < thread_count; idx++) { Move CompressParam *param = &comp_param[idx]; to here, and use it also for the locks. I will even think about calling the variable just p. And once there, everything under the sun except this uses i as a for variable, not idx O:-) > qemu_mutex_lock(&comp_param[idx].mutex); > if (!comp_param[idx].quit) { > - len = qemu_put_qemu_file(ms->to_dst_file, comp_param[idx].file); > + CompressParam *param = &comp_param[idx]; Move this declaration > + len = qemu_put_qemu_file(ms->to_dst_file, param->file); > + compress_reset_result(param); > + > /* > * it's safe to fetch zero_page without holding comp_done_lock > * as there is no further request submitted to the thread, > * i.e, the thread should be waiting for a request at this point. > */ > - update_compress_thread_counts(&comp_param[idx], len); > + update_compress_thread_counts(param, len); > } > qemu_mutex_unlock(&comp_param[idx].mutex); > } > @@ -1571,15 +1581,17 @@ static int compress_page_with_multi_thread(RAMBlock > *block, ram_addr_t offset) > retry: > for (idx = 0; idx < thread_count; idx++) { > if (comp_param[idx].done) { > - comp_param[idx].done = false; Same here.