On Tue, 13 Jun 2023 16:57:49 +0200
Juan Quintela wrote:
> Move the goto to a while true.
>
> Signed-off-by: Juan Quintela
Reviewed-by: Lukas Straub
> ---
> migration/ram-compress.c | 48
> 1 file changed, 24 insertions(+), 24 deletions(-)
>
> diff --git a/migration/ram-compress.c b/migration/ram-compress.c
> index 8ce9519f3d..3c44803132 100644
> --- a/migration/ram-compress.c
> +++ b/migration/ram-compress.c
> @@ -273,35 +273,35 @@ bool compress_page_with_multi_thread(RAMBlock *block,
> ram_addr_t offset,
>
> thread_count = migrate_compress_threads();
> qemu_mutex_lock(_done_lock);
> -retry:
> -for (idx = 0; idx < thread_count; idx++) {
> -if (comp_param[idx].done) {
> -CompressParam *param = _param[idx];
> -qemu_mutex_lock(>mutex);
> -param->done = false;
> -send_queued_data(param);
> -assert(qemu_file_buffer_empty(param->file));
> -compress_reset_result(param);
> -set_compress_params(param, block, offset);
>
> -qemu_cond_signal(>cond);
> -qemu_mutex_unlock(>mutex);
> +while (true) {
> +for (idx = 0; idx < thread_count; idx++) {
> +if (comp_param[idx].done) {
> +CompressParam *param = _param[idx];
> +qemu_mutex_lock(>mutex);
> +param->done = false;
> +send_queued_data(param);
> +assert(qemu_file_buffer_empty(param->file));
> +compress_reset_result(param);
> +set_compress_params(param, block, offset);
> +
> +qemu_cond_signal(>cond);
> +qemu_mutex_unlock(>mutex);
> +qemu_mutex_unlock(_done_lock);
> +return true;
> +}
> +}
> +if (!wait) {
> qemu_mutex_unlock(_done_lock);
> -return true;
> +return false;
> }
> -}
> -
> -/*
> - * wait for the free thread if the user specifies 'compress-wait-thread',
> - * otherwise we will post the page out in the main thread as normal page.
> - */
> -if (wait) {
> +/*
> + * wait for a free thread if the user specifies
> + * 'compress-wait-thread', otherwise we will post the page out
> + * in the main thread as normal page.
> + */
> qemu_cond_wait(_done_cond, _done_lock);
> -goto retry;
> }
> -qemu_mutex_unlock(_done_lock);
> -
> -return false;
> }
>
> /* return the size after decompression, or negative value on error */
pgp16RF7BPBS3.pgp
Description: OpenPGP digital signature
