Markus Armbruster <arm...@redhat.com> wrote: > Juan Quintela <quint...@redhat.com> writes: > >> # >> +# @deprecated: Member @block-incremental is deprecated. Use > > Two spaces between sentences for consistency, please.
Done. At least here I did the copy and paste right. >> diff --git a/migration/block.c b/migration/block.c >> index b60698d6e2..7682f4fbd2 100644 >> --- a/migration/block.c >> +++ b/migration/block.c >> @@ -731,6 +731,9 @@ static int block_save_setup(QEMUFile *f, void *opaque) >> trace_migration_block_save("setup", block_mig_state.submitted, >> block_mig_state.transferred); >> >> + warn_report("block migration is deprecated. Use blockdev-mirror with" >> + "NBD instead."); > > warn_report("block migration is deprecated;" > " use blockdev-mirror with NBD instead."); Done. >> + if (new_caps[MIGRATION_CAPABILITY_BLOCK]) { >> + warn_report("Block migration is deprecated. " >> + "Use blockdev-mirror with NBD instead."); > > Likewise. > >> + } >> >> #ifndef CONFIG_REPLICATION >> if (new_caps[MIGRATION_CAPABILITY_X_COLO]) { >> @@ -1386,6 +1391,8 @@ static void migrate_params_apply(MigrateSetParameters >> *params, Error **errp) >> } >> >> if (params->has_block_incremental) { >> + warn_report("Block migration is deprecated. " >> + "Use blockdev-mirror with NBD instead."); > > Likewise. > >> s->parameters.block_incremental = params->block_incremental; >> } >> if (params->has_multifd_channels) { > > Other than that > Reviewed-by: Markus Armbruster <arm...@redhat.com> Thanks.