Re: [PATCH 1/6] migration: Remove 'skipped' field from MigrationStats

[Markus Armbruster]

Fabiano Rosas <farosas@suse.de> writes:

> The 'skipped' field of the MigrationStats struct has been deprecated
> in 8.1. Time to remove it.
>
> Deprecation commit 7b24d32634 ("migration: skipped field is really
> obsolete.").
>
> Signed-off-by: Fabiano Rosas <farosas@suse.de>
> ---
>  docs/about/deprecated.rst       | 6 ------
>  docs/about/removed-features.rst | 6 ++++++
>  migration/migration-hmp-cmds.c  | 2 --
>  migration/migration.c           | 2 --
>  qapi/migration.json             | 8 --------
>  5 files changed, 6 insertions(+), 18 deletions(-)
>
> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index 7b548519b5..4d9d6bf2da 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -488,12 +488,6 @@ option).
>  Migration
>  ---------
>  
> -``skipped`` MigrationStats field (since 8.1)
> -''''''''''''''''''''''''''''''''''''''''''''
> -
> -``skipped`` field in Migration stats has been deprecated.  It hasn't
> -been used for more than 10 years.
> -
>  ``inc`` migrate command option (since 8.2)
>  ''''''''''''''''''''''''''''''''''''''''''
>  
> diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
> index f9cf874f7b..9873f59bee 100644
> --- a/docs/about/removed-features.rst
> +++ b/docs/about/removed-features.rst
> @@ -614,6 +614,12 @@ was superseded by ``sections``.
>  Member ``section-size`` in the return value of ``query-sgx-capabilities``
>  was superseded by ``sections``.
>  
> +``query-migrate`` return value member ``skipped`` (removed in 9.1)
> +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
> +
> +Member ``skipped`` of the ``MigrationStats`` struct hasn't been used
> +for more than 10 years. Removed with no replacement.
> +
>  Human Monitor Protocol (HMP) commands
>  -------------------------------------
>  
> diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
> index 7e96ae6ffd..28f776d06d 100644
> --- a/migration/migration-hmp-cmds.c
> +++ b/migration/migration-hmp-cmds.c
> @@ -105,8 +105,6 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
>                         info->ram->total >> 10);
>          monitor_printf(mon, "duplicate: %" PRIu64 " pages\n",
>                         info->ram->duplicate);
> -        monitor_printf(mon, "skipped: %" PRIu64 " pages\n",
> -                       info->ram->skipped);
>          monitor_printf(mon, "normal: %" PRIu64 " pages\n",
>                         info->ram->normal);
>          monitor_printf(mon, "normal bytes: %" PRIu64 " kbytes\n",
> diff --git a/migration/migration.c b/migration/migration.c
> index 696762bc64..3b433fdb31 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -1149,8 +1149,6 @@ static void populate_ram_info(MigrationInfo *info, 
> MigrationState *s)
>      info->ram->transferred = migration_transferred_bytes();
>      info->ram->total = ram_bytes_total();
>      info->ram->duplicate = stat64_get(&mig_stats.zero_pages);
> -    /* legacy value.  It is not used anymore */
> -    info->ram->skipped = 0;
>      info->ram->normal = stat64_get(&mig_stats.normal_pages);
>      info->ram->normal_bytes = info->ram->normal * page_size;
>      info->ram->mbps = s->mbps;
> diff --git a/qapi/migration.json b/qapi/migration.json
> index 8c65b90328..401b8e24ac 100644
> --- a/qapi/migration.json
> +++ b/qapi/migration.json
> @@ -23,9 +23,6 @@
>  #
>  # @duplicate: number of duplicate (zero) pages (since 1.2)
>  #
> -# @skipped: number of skipped zero pages.  Always zero, only provided
> -#     for compatibility (since 1.5)
> -#
>  # @normal: number of normal pages (since 1.2)
>  #
>  # @normal-bytes: number of normal bytes sent (since 1.2)
> @@ -63,16 +60,11 @@
>  #     between 0 and @dirty-sync-count * @multifd-channels.  (since
>  #     7.1)
>  #
> -# Features:
> -#
> -# @deprecated: Member @skipped is always zero since 1.5.3
> -#
>  # Since: 0.14
>  ##
>  { 'struct': 'MigrationStats',
>    'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' ,
>             'duplicate': 'int',
> -           'skipped': { 'type': 'int', 'features': [ 'deprecated' ] },
>             'normal': 'int',
>             'normal-bytes': 'int', 'dirty-pages-rate': 'int',
>             'mbps': 'number', 'dirty-sync-count': 'int',

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