Re: [PATCH 05/18] migration: Move compression_counters cleanup ram-compress.c

[Lukas Straub <lukasstraub2@web.de>]

[-- Attachment #1: Type: text/plain, Size: 2073 bytes --]

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

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

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

> ---
>  migration/migration.c    | 4 +---
>  migration/ram-compress.c | 5 +++++
>  migration/savevm.c       | 1 -
>  3 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index 84551f040c..5105ad6825 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -1628,11 +1628,9 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
>  
>      migrate_init(s);
>      /*
> -     * set mig_stats compression_counters memory to zero for a
> -     * new migration
> +     * set mig_stats memory to zero for a new migration
>       */
>      memset(&mig_stats, 0, sizeof(mig_stats));
> -    memset(&compression_counters, 0, sizeof(compression_counters));
>  
>      return true;
>  }
> diff --git a/migration/ram-compress.c b/migration/ram-compress.c
> index 06254d8c69..a0f6a56470 100644
> --- a/migration/ram-compress.c
> +++ b/migration/ram-compress.c
> @@ -430,6 +430,11 @@ int compress_threads_load_setup(QEMUFile *f)
>          return 0;
>      }
>  
> +    /*
> +     * set compression_counters memory to zero for a new migration
> +     */
> +    memset(&compression_counters, 0, sizeof(compression_counters));
> +
>      thread_count = migrate_decompress_threads();
>      decompress_threads = g_new0(QemuThread, thread_count);
>      decomp_param = g_new0(DecompressParam, thread_count);
> diff --git a/migration/savevm.c b/migration/savevm.c
> index bc284087f9..aa31d29f23 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -1621,7 +1621,6 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
>  
>      migrate_init(ms);
>      memset(&mig_stats, 0, sizeof(mig_stats));
> -    memset(&compression_counters, 0, sizeof(compression_counters));
>      ms->to_dst_file = f;
>  
>      qemu_mutex_unlock_iothread();


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]