23.03.2022 13:53, Nikita Lapshin wrote:
From: Nikita Lapshin <nikita.laps...@virtuozzo.com>This enable and disable block in migration stream. Signed-off-by: Nikita Lapshin <nikita.laps...@openvz.org> --- migration/migration.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index ad789915ce..d81f3c6891 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1338,7 +1338,8 @@ static bool check_stream_parts(strList *stream_list) { for (; stream_list; stream_list = stream_list->next) { if (!strcmp(stream_list->value, "vmstate") || - !strcmp(stream_list->value, "dirty-bitmaps")) { + !strcmp(stream_list->value, "dirty-bitmaps") || + !strcmp(stream_list->value, "block")) { continue; }@@ -2621,7 +2622,8 @@ bool migrate_use_block(void) s = migrate_get_current(); - return s->enabled_capabilities[MIGRATION_CAPABILITY_BLOCK];+ return s->enabled_capabilities[MIGRATION_CAPABILITY_BLOCK] || + migrate_find_stream_content("block"); }bool migrate_use_return_path(void)
Same as for bitmaps. Yes, I now think we should restrict using new stream-content parameter together with old capabilities, and deprecated this old capabilities. -- Best regards, Vladimir
