Re: [PATCH 08/18] migration: Move update_compress_threads_counts() to ram-compress.c

[Lukas Straub]

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

> Signed-off-by: Juan Quintela <quintela@redhat.com>

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

> ---
>  migration/ram-compress.h |  1 +
>  migration/ram-compress.c | 17 +++++++++++++++++
>  migration/ram.c          | 15 ---------------
>  3 files changed, 18 insertions(+), 15 deletions(-)
> 
> diff --git a/migration/ram-compress.h b/migration/ram-compress.h
> index 77465dad4b..e55d3b50bd 100644
> --- a/migration/ram-compress.h
> +++ b/migration/ram-compress.h
> @@ -70,5 +70,6 @@ void decompress_data_with_multi_threads(QEMUFile *f, void 
> *host, int len);
>  
>  void populate_compress(MigrationInfo *info);
>  uint64_t ram_compressed_pages(void);
> +void update_compress_thread_counts(const CompressParam *param, int 
> bytes_xmit);
>  
>  #endif
> diff --git a/migration/ram-compress.c b/migration/ram-compress.c
> index c48d5c53f6..47b600d62b 100644
> --- a/migration/ram-compress.c
> +++ b/migration/ram-compress.c
> @@ -32,11 +32,14 @@
>  #include "ram-compress.h"
>  
>  #include "qemu/error-report.h"
> +#include "qemu/stats64.h"
>  #include "migration.h"
>  #include "options.h"
>  #include "io/channel-null.h"
>  #include "exec/target_page.h"
>  #include "exec/ramblock.h"
> +#include "ram.h"
> +#include "migration-stats.h"
>  
>  CompressionStats compression_counters;
>  
> @@ -508,3 +511,17 @@ uint64_t ram_compressed_pages(void)
>      return compression_counters.pages;
>  }
>  
> +void update_compress_thread_counts(const CompressParam *param, int 
> bytes_xmit)
> +{
> +    ram_transferred_add(bytes_xmit);
> +
> +    if (param->result == RES_ZEROPAGE) {
> +        stat64_add(&mig_stats.zero_pages, 1);
> +        return;
> +    }
> +
> +    /* 8 means a header with RAM_SAVE_FLAG_CONTINUE. */
> +    compression_counters.compressed_size += bytes_xmit - 8;
> +    compression_counters.pages++;
> +}
> +
> diff --git a/migration/ram.c b/migration/ram.c
> index 13c518f81a..53dec4d305 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -1259,21 +1259,6 @@ static int ram_save_multifd_page(QEMUFile *file, 
> RAMBlock *block,
>      return 1;
>  }
>  
> -static void
> -update_compress_thread_counts(const CompressParam *param, int bytes_xmit)
> -{
> -    ram_transferred_add(bytes_xmit);
> -
> -    if (param->result == RES_ZEROPAGE) {
> -        stat64_add(&mig_stats.zero_pages, 1);
> -        return;
> -    }
> -
> -    /* 8 means a header with RAM_SAVE_FLAG_CONTINUE. */
> -    compression_counters.compressed_size += bytes_xmit - 8;
> -    compression_counters.pages++;
> -}
> -
>  static int send_queued_data(CompressParam *param)
>  {
>      PageSearchStatus *pss = &ram_state->pss[RAM_CHANNEL_PRECOPY];

pgpExOllC32el.pgp
Description: OpenPGP digital signature