[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/6] qmp/hmp: Add throttle ratio to query-migrate and
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 5/6] qmp/hmp: Add throttle ratio to query-migrate and info migrate |
Date: |
Wed, 30 Sep 2015 10:56:05 +0200 |
From: "Jason J. Herne" <address@hidden>
Report throttle percentage in info migrate and query-migrate responses when
cpu throttling is active.
Signed-off-by: Jason J. Herne <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
---
hmp.c | 5 +++++
migration/migration.c | 5 +++++
qapi-schema.json | 7 ++++++-
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/hmp.c b/hmp.c
index 48ce372..5048eee 100644
--- a/hmp.c
+++ b/hmp.c
@@ -232,6 +232,11 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
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_MigrationCapabilityStatusList(caps);
}
diff --git a/migration/migration.c b/migration/migration.c
index e829231..c7472ed 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -447,6 +447,11 @@ MigrationInfo *qmp_query_migrate(Error **errp)
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);
break;
case MIGRATION_STATUS_COMPLETED:
diff --git a/qapi-schema.json b/qapi-schema.json
index 646c0fa..8b0520c 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -480,6 +480,10 @@
# may be expensive, but do not actually occur during the iterative
# 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
##
{ 'struct': 'MigrationInfo',
@@ -489,7 +493,8 @@
'*total-time': 'int',
'*expected-downtime': 'int',
'*downtime': 'int',
- '*setup-time': 'int'} }
+ '*setup-time': 'int',
+ '*x-cpu-throttle-percentage': 'int'} }
##
# @query-migrate
--
2.4.3
- [Qemu-devel] [PULL 0/6] Migration pull request, Juan Quintela, 2015/10/08
- [Qemu-devel] [PULL 5/6] qmp/hmp: Add throttle ratio to query-migrate and info migrate,
Juan Quintela <=
- [Qemu-devel] [PULL 1/6] migration: yet more possible state transitions, Juan Quintela, 2015/10/08
- [Qemu-devel] [PULL 6/6] migration: Disambiguate MAX_THROTTLE, Juan Quintela, 2015/10/08
- [Qemu-devel] [PULL 2/6] cpu: Provide vcpu throttling interface, Juan Quintela, 2015/10/08
- [Qemu-devel] [PULL 3/6] migration: Parameters for auto-converge cpu throttling, Juan Quintela, 2015/10/08
- [Qemu-devel] [PULL 4/6] migration: Dynamic cpu throttling for auto-converge, Juan Quintela, 2015/10/08
- Re: [Qemu-devel] [PULL 0/6] Migration pull request, Peter Maydell, 2015/10/08