ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: Remove 'skipped' field from MigrationStats 

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.").

Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
This commit is contained in:
Fabiano Rosas 2024-04-30 11:27:32 -03:00
parent dbea1c89da
commit f7b1cd3c2e
5 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/about/deprecated.rst
View File

@ -477,12 +477,6 @@ option).
Migration 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) ``inc`` migrate command option (since 8.2)
'''''''''''''''''''''''''''''''''''''''''' ''''''''''''''''''''''''''''''''''''''''''

6
docs/about/removed-features.rst
View File

@ -614,6 +614,12 @@ was superseded by ``sections``.
Member ``section-size`` in the return value of ``query-sgx-capabilities`` Member ``section-size`` in the return value of ``query-sgx-capabilities``
was superseded by ``sections``. 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 Human Monitor Protocol (HMP) commands
------------------------------------- -------------------------------------

2
migration/migration-hmp-cmds.c
View File

@ -105,8 +105,6 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
info->ram->total >> 10); info->ram->total >> 10);
monitor_printf(mon, "duplicate: %" PRIu64 " pages\n", monitor_printf(mon, "duplicate: %" PRIu64 " pages\n",
info->ram->duplicate); info->ram->duplicate);
monitor_printf(mon, "skipped: %" PRIu64 " pages\n",
info->ram->skipped);
monitor_printf(mon, "normal: %" PRIu64 " pages\n", monitor_printf(mon, "normal: %" PRIu64 " pages\n",
info->ram->normal); info->ram->normal);
monitor_printf(mon, "normal bytes: %" PRIu64 " kbytes\n", monitor_printf(mon, "normal bytes: %" PRIu64 " kbytes\n",

2
migration/migration.c
View File

@ -1156,8 +1156,6 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
info->ram->transferred = migration_transferred_bytes(); info->ram->transferred = migration_transferred_bytes();
info->ram->total = ram_bytes_total(); info->ram->total = ram_bytes_total();
info->ram->duplicate = stat64_get(&mig_stats.zero_pages); 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 = stat64_get(&mig_stats.normal_pages);
info->ram->normal_bytes = info->ram->normal * page_size; info->ram->normal_bytes = info->ram->normal * page_size;
info->ram->mbps = s->mbps; info->ram->mbps = s->mbps;

8
qapi/migration.json
View File

@ -23,9 +23,6 @@
# #
# @duplicate: number of duplicate (zero) pages (since 1.2) # @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: number of normal pages (since 1.2)
# #
# @normal-bytes: number of normal bytes sent (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 # between 0 and @dirty-sync-count * @multifd-channels. (since
# 7.1) # 7.1)
# #
# Features:
#
# @deprecated: Member @skipped is always zero since 1.5.3
#
# Since: 0.14 # Since: 0.14
## ##
{ 'struct': 'MigrationStats', { 'struct': 'MigrationStats',
'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' , 'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' ,
'duplicate': 'int', 'duplicate': 'int',
'skipped': { 'type': 'int', 'features': [ 'deprecated' ] },
'normal': 'int', 'normal': 'int',
'normal-bytes': 'int', 'dirty-pages-rate': 'int', 'normal-bytes': 'int', 'dirty-pages-rate': 'int',
'mbps': 'number', 'dirty-sync-count': 'int', 'mbps': 'number', 'dirty-sync-count': 'int',