Re: [PATCH 11/18] migration: Move busy++ to migrate_with_multithread

[Lukas Straub]

On Tue, 13 Jun 2023 16:57:50 +0200
Juan Quintela <quintela@redhat.com> wrote:

> And now we can simplify save_compress_page().
> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>

Reviewed-by: Lukas Straub <lukasstraub2@web.de>

> ---
>  migration/ram-compress.c | 1 +
>  migration/ram.c          | 7 +------
>  2 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/migration/ram-compress.c b/migration/ram-compress.c
> index 3c44803132..2652cdee8b 100644
> --- a/migration/ram-compress.c
> +++ b/migration/ram-compress.c
> @@ -293,6 +293,7 @@ bool compress_page_with_multi_thread(RAMBlock *block, 
> ram_addr_t offset,
>          }
>          if (!wait) {
>              qemu_mutex_unlock(&comp_done_lock);
> +            compression_counters.busy++;
>              return false;
>          }
>          /*
> diff --git a/migration/ram.c b/migration/ram.c
> index 2a3ff2c36e..60f24006bc 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -2034,12 +2034,7 @@ static bool save_compress_page(RAMState *rs, 
> PageSearchStatus *pss,
>          return false;
>      }
>  
> -    if (compress_page_with_multi_thread(block, offset, send_queued_data)) {
> -        return true;
> -    }
> -
> -    compression_counters.busy++;
> -    return false;
> +    return compress_page_with_multi_thread(block, offset, send_queued_data);
>  }
>  
>  /**

pgp1j_EAKXjVs.pgp
Description: OpenPGP digital signature