On Tue, Mar 21, 2017 at 09:22:52AM +0100, Juan Quintela wrote:
>Chao Fan <fanc.f...@cn.fujitsu.com> wrote:
>> The number of dirty pages outputed in 'pages' in the command
>> 'info migrate', so add page-size to calculate the number of dirty
>> pages in bytes.
>>
>> Signed-off-by: Chao Fan <fanc.f...@cn.fujitsu.com>
>> Signed-off-by: Li Zhijian <lizhij...@cn.fujitsu.com>
>>
>> ---
>> v2: fix the grammar in qapi-schema.json [Eric Blake]
>
>Hi
Hi Juan,
>
>If you see my RAMState series, you can see that things have moved a lot
>here, I added this to my current series:
>
>(there is a rename of qemu_target_page_bits() to qemu_target_page_size()
>in the series).
>
>If you like it, I can leave it that way there.
Yes, of course. This is a better way.
Thank you very much for your help!
Thanks,
Chao Fan
>
>Thanks, Juan.
>
>
>commit 1944568bd8cdf912b3bf231bbc3c66071fde9f58
>Author: Chao Fan <fanc.f...@cn.fujitsu.com>
>Date: Tue Mar 21 10:22:43 2017 +0800
>
> Add page-size to output in 'info migrate'
>
> The number of dirty pages outputed in 'pages' in the command
> 'info migrate', so add page-size to calculate the number of dirty
> pages in bytes.
>
> Signed-off-by: Chao Fan <fanc.f...@cn.fujitsu.com>
> Signed-off-by: Li Zhijian <lizhij...@cn.fujitsu.com>
> Signed-off-by: Juan Quintela <quint...@redhat.com>
>
>diff --git a/hmp.c b/hmp.c
>index edb8970..be75e71 100644
>--- a/hmp.c
>+++ b/hmp.c
>@@ -215,6 +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);
>+ monitor_printf(mon, "page size: %" PRIu64 " kbytes\n",
>+ info->ram->page_size >> 10);
>+
> if (info->ram->dirty_pages_rate) {
> monitor_printf(mon, "dirty pages rate: %" PRIu64 " pages\n",
> info->ram->dirty_pages_rate);
>diff --git a/migration/migration.c b/migration/migration.c
>index 92c3c6b..fc19ba7 100644
>--- a/migration/migration.c
>+++ b/migration/migration.c
>@@ -650,6 +650,7 @@ static void populate_ram_info(MigrationInfo *info,
>MigrationState *s)
> info->ram->mbps = s->mbps;
> info->ram->dirty_sync_count = ram_dirty_sync_count();
> info->ram->postcopy_requests = ram_postcopy_requests();
>+ info->ram->page_size = qemu_target_page_size();
>
> if (s->state != MIGRATION_STATUS_COMPLETED) {
> info->ram->remaining = ram_bytes_remaining();
>diff --git a/qapi-schema.json b/qapi-schema.json
>index 68a4327..c7ec62c 100644
>--- a/qapi-schema.json
>+++ b/qapi-schema.json
>@@ -598,6 +598,9 @@
> # @postcopy-requests: The number of page requests received from the
> destination
> # (since 2.7)
> #
>+# @page-size: The number of bytes per page for the various page-based
>+# statistics (since 2.10)
>+#
> # Since: 0.14.0
> ##
> { 'struct': 'MigrationStats',
>@@ -605,7 +608,7 @@
> 'duplicate': 'int', 'skipped': 'int', 'normal': 'int',
> 'normal-bytes': 'int', 'dirty-pages-rate' : 'int',
> 'mbps' : 'number', 'dirty-sync-count' : 'int',
>- 'postcopy-requests' : 'int' } }
>+ 'postcopy-requests' : 'int', 'page-size' : 'int' } }
>
> ##
> # @XBZRLECacheStats:
>
>
