In hmp, dirty-bytes-rate is more friendly than dirty-pages-rate. It's also better for other tools to determine the cpu throttle value in different architecture.
Signed-off-by: Chao Fan <fanc.f...@cn.fujitsu.com> Signed-off-by: Li Zhijian <lizhij...@cn.fujitsu.com> --- hmp.c | 6 +++--- migration/migration.c | 2 +- qapi-schema.json | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hmp.c b/hmp.c index 261843f..7334bc5 100644 --- a/hmp.c +++ b/hmp.c @@ -215,9 +215,9 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) info->ram->normal_bytes >> 10); monitor_printf(mon, "dirty sync count: %" PRIu64 "\n", info->ram->dirty_sync_count); - if (info->ram->dirty_pages_rate) { - monitor_printf(mon, "dirty pages rate: %" PRIu64 " pages\n", - info->ram->dirty_pages_rate); + if (info->ram->dirty_bytes_rate) { + monitor_printf(mon, "dirty bytes rate: %" PRIu64 " bytes/s\n", + info->ram->dirty_bytes_rate); } if (info->ram->postcopy_requests) { monitor_printf(mon, "postcopy request count: %" PRIu64 "\n", diff --git a/migration/migration.c b/migration/migration.c index 3dab684..7e7b62c 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -648,7 +648,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) if (s->state != MIGRATION_STATUS_COMPLETED) { info->ram->remaining = ram_bytes_remaining(); - info->ram->dirty_pages_rate = s->dirty_pages_rate; + info->ram->dirty_bytes_rate = s->dirty_bytes_rate; } } diff --git a/qapi-schema.json b/qapi-schema.json index 32b4a4b..83a45f8 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -565,9 +565,6 @@ # # @normal-bytes: number of normal bytes sent (since 1.2) # -# @dirty-pages-rate: number of pages dirtied by second by the -# guest (since 1.3) -# # @mbps: throughput in megabits/sec. (since 1.6) # # @dirty-sync-count: number of times that dirty ram was synchronized (since 2.1) @@ -575,12 +572,15 @@ # @postcopy-requests: The number of page requests received from the destination # (since 2.7) # +# @dirty-bytes-rate: how many bytes dirtied by second by the +# guest (since 2.9) +# # Since: 0.14.0 ## { 'struct': 'MigrationStats', 'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' , 'duplicate': 'int', 'skipped': 'int', 'normal': 'int', - 'normal-bytes': 'int', 'dirty-pages-rate' : 'int', + 'normal-bytes': 'int', 'dirty-bytes-rate' : 'int', 'mbps' : 'number', 'dirty-sync-count' : 'int', 'postcopy-requests' : 'int' } } -- 2.9.3