提交 4782893e 编写于 作者: J Jason J. Herne 提交者: Juan Quintela

qmp/hmp: Add throttle ratio to query-migrate and info migrate

Report throttle percentage in info migrate and query-migrate responses when
cpu throttling is active.
Signed-off-by: NJason J. Herne <jjherne@linux.vnet.ibm.com>
Reviewed-by: NDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: NJuan Quintela <quintela@redhat.com>
Reviewed-by: NJuan Quintela <quintela@redhat.com>
上级 070afca2
...@@ -232,6 +232,11 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) ...@@ -232,6 +232,11 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
info->xbzrle_cache->overflow); info->xbzrle_cache->overflow);
} }
if (info->has_x_cpu_throttle_percentage) {
monitor_printf(mon, "cpu throttle percentage: %" PRIu64 "\n",
info->x_cpu_throttle_percentage);
}
qapi_free_MigrationInfo(info); qapi_free_MigrationInfo(info);
qapi_free_MigrationCapabilityStatusList(caps); qapi_free_MigrationCapabilityStatusList(caps);
} }
......
...@@ -447,6 +447,11 @@ MigrationInfo *qmp_query_migrate(Error **errp) ...@@ -447,6 +447,11 @@ MigrationInfo *qmp_query_migrate(Error **errp)
info->disk->total = blk_mig_bytes_total(); info->disk->total = blk_mig_bytes_total();
} }
if (cpu_throttle_active()) {
info->has_x_cpu_throttle_percentage = true;
info->x_cpu_throttle_percentage = cpu_throttle_get_percentage();
}
get_xbzrle_cache_stats(info); get_xbzrle_cache_stats(info);
break; break;
case MIGRATION_STATUS_COMPLETED: case MIGRATION_STATUS_COMPLETED:
......
...@@ -480,6 +480,10 @@ ...@@ -480,6 +480,10 @@
# may be expensive, but do not actually occur during the iterative # may be expensive, but do not actually occur during the iterative
# migration rounds themselves. (since 1.6) # migration rounds themselves. (since 1.6)
# #
# @x-cpu-throttle-percentage: #optional percentage of time guest cpus are being
# throttled during auto-converge. This is only present when auto-converge
# has started throttling guest cpus. (Since 2.5)
#
# Since: 0.14.0 # Since: 0.14.0
## ##
{ 'struct': 'MigrationInfo', { 'struct': 'MigrationInfo',
...@@ -489,7 +493,8 @@ ...@@ -489,7 +493,8 @@
'*total-time': 'int', '*total-time': 'int',
'*expected-downtime': 'int', '*expected-downtime': 'int',
'*downtime': 'int', '*downtime': 'int',
'*setup-time': 'int'} } '*setup-time': 'int',
'*x-cpu-throttle-percentage': 'int'} }
## ##
# @query-migrate # @query-migrate
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册