Re: [PATCH v2 2/3] Reduce the time of checkpoint for COLO

[Li Zhijian]

On 9/22/20 5:24 PM, leirao wrote:
> we should set ram_bulk_stage to false after ram_state_init,
> otherwise the bitmap will be unused in migration_bitmap_find_dirty.
> all pages in ram cache will be flushed to the ram of secondary guest
> for each checkpoint.
>
> Signed-off-by: leirao <lei.rao@intel.com>
> ---
>   migration/ram.c | 14 +++++++++++++-
>   1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/migration/ram.c b/migration/ram.c
> index 76d4fee..59ff0cf 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -3018,6 +3018,18 @@ static void decompress_data_with_multi_threads(QEMUFile 
> *f,
>       qemu_mutex_unlock(&decomp_done_lock);
>   }
>   
> + /*
> +  * we must set ram_bulk_stage to fasle, otherwise in
a typo: s/fasle/false

Reviewed-by: Li Zhijian <lizhijian@cn.fujitsu.com>


> +  * migation_bitmap_find_dirty the bitmap will be unused and
> +  * all the pages in ram cache wil be flushed to the ram of
> +  * secondary VM.
> +  */
> +static void colo_init_ram_state(void)
> +{
> +    ram_state_init(&ram_state);
> +    ram_state->ram_bulk_stage = false;
> +}
> +
>   /*
>    * colo cache: this is for secondary VM, we cache the whole
>    * memory of the secondary VM, it is need to hold the global lock
> @@ -3061,7 +3073,7 @@ int colo_init_ram_cache(void)
>           }
>       }
>   
> -    ram_state_init(&ram_state);
> +    colo_init_ram_state();
>       return 0;
>   }
>