Re: [PATCH 2/6] migration: Remove 'inc' option from migrate command

[Markus Armbruster]

Fabiano Rosas <farosas@suse.de> writes:

> The block incremental option for block migration has been deprecated
> in 8.2 in favor of using the block-mirror feature. Remove it now.
>
> Deprecation commit 40101f320d ("migration: migrate 'inc' command
> option is deprecated.").
>
> Signed-off-by: Fabiano Rosas <farosas@suse.de>
> ---
>  docs/about/deprecated.rst       |  9 ------
>  docs/about/removed-features.rst | 14 +++++++++
>  migration/block.c               |  1 -
>  migration/migration-hmp-cmds.c  | 18 ++---------
>  migration/migration.c           | 24 +++++----------
>  migration/options.c             | 30 +-----------------
>  qapi/migration.json             | 54 +++++++--------------------------
>  7 files changed, 35 insertions(+), 115 deletions(-)
>
> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index 4d9d6bf2da..25b309dde4 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -488,15 +488,6 @@ option).
>  Migration
>  ---------
>  
> -``inc`` migrate command option (since 8.2)
> -''''''''''''''''''''''''''''''''''''''''''
> -
> -Use blockdev-mirror with NBD instead.
> -
> -As an intermediate step the ``inc`` functionality can be achieved by
> -setting the ``block-incremental`` migration parameter to ``true``.
> -But this parameter is also deprecated.
> -
>  ``blk`` migrate command option (since 8.2)
>  ''''''''''''''''''''''''''''''''''''''''''
>  
> diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
> index 9873f59bee..e62fc760f1 100644
> --- a/docs/about/removed-features.rst
> +++ b/docs/about/removed-features.rst
> @@ -620,6 +620,13 @@ was superseded by ``sections``.
>  Member ``skipped`` of the ``MigrationStats`` struct hasn't been used
>  for more than 10 years. Removed with no replacement.
>  
> +``migrate`` command option ``inc`` (removed in 9.1)
> +'''''''''''''''''''''''''''''''''''''''''''''''''''
> +
> +Use blockdev-mirror with NBD instead. See "QMP invocation for live
> +storage migration with ``blockdev-mirror`` + NBD" in
> +docs/interop/live-block-operations.rst for a detailed explanation.

You didn't just copy the text from deprecated.rst, you made it more
useful.  Appreciated!

> +
>  Human Monitor Protocol (HMP) commands
>  -------------------------------------
>  
> @@ -680,6 +687,13 @@ This command didn't produce any output already. Removed 
> with no replacement.
>  The ``singlestep`` command has been replaced by the ``one-insn-per-tb``
>  command, which has the same behaviour but a less misleading name.
>  
> +``migrate`` command ``-i`` option (removed in 9.1)
> +''''''''''''''''''''''''''''''''''''''''''''''''''
> +
> +Use blockdev-mirror with NBD instead. See "QMP invocation for live
> +storage migration with ``blockdev-mirror`` + NBD" in
> +docs/interop/live-block-operations.rst for a detailed explanation.
> +
>  Host Architectures
>  ------------------
>  

[...]

Reviewed-by: Markus Armbruster <armbru@redhat.com>