Re: [PATCH v1 4/8] migration: Add dirty-bitmaps part of migration stream

[Vladimir Sementsov-Ogievskiy]

23.03.2022 13:53, Nikita Lapshin wrote:
> From: Nikita Lapshin <nikita.lapshin@virtuozzo.com>
>
> This enable and disable dirty-bitmaps in migration stream.
>
> Signed-off-by: Nikita Lapshin <nikita.lapshin@openvz.org>
> ---
>   migration/migration.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/migration/migration.c b/migration/migration.c
> index bbf9b6aad1..ad789915ce 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -1337,7 +1337,8 @@ void 
> qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
>   static bool check_stream_parts(strList *stream_list)
>   {
>       for (; stream_list; stream_list = stream_list->next) {
> -        if (!strcmp(stream_list->value, "vmstate")) {
> +        if (!strcmp(stream_list->value, "vmstate") ||
> +            !strcmp(stream_list->value, "dirty-bitmaps")) {
>               continue;
>           }
>   
> @@ -2501,7 +2502,8 @@ bool migrate_dirty_bitmaps(void)
>   
>       s = migrate_get_current();
>   
> -    return s->enabled_capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS];
> +    return s->enabled_capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS] ||
> +           migrate_find_stream_content("dirty-bitmaps");
>   }
>   
>   bool migrate_ignore_shared(void)

Probably we should restrict using dirty-bitmaps capability together with new 
stream-content parameter to be strict.


--
Best regards,
Vladimir