From: Liang Li <liang.z.li@intel.com>
To: qemu-devel@nongnu.org
Cc: quintela@redhat.com, Liang Li <liang.z.li@intel.com>,
dgilbert@redhat.com, lcapitulino@redhat.com,
yang.z.zhang@intel.com, quintela@redhate.com,
amit.shah@redhat.com
Subject: [Qemu-devel] [v6 14/14] migration: Add hmp interface to set and query parameters
Date: Mon, 23 Mar 2015 16:32:29 +0800 [thread overview]
Message-ID: <1427099549-10633-15-git-send-email-liang.z.li@intel.com> (raw)
In-Reply-To: <1427099549-10633-1-git-send-email-liang.z.li@intel.com>
Add the hmp interface to tune and query the parameters used in
live migration.
Signed-off-by: Liang Li <liang.z.li@intel.com>
Signed-off-by: Yang Zhang <yang.z.zhang@intel.com>
---
hmp-commands.hx | 17 +++++++++++++++
hmp.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
hmp.h | 4 ++++
monitor.c | 25 ++++++++++++++++++++++
4 files changed, 111 insertions(+)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 3089533..61ab0ab 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -993,6 +993,21 @@ Enable/Disable the usage of a capability @var{capability} for migration.
ETEXI
{
+ .name = "migrate_set_parameter",
+ .args_type = "parameter:s,value:i",
+ .params = "parameter value",
+ .help = "Set the parameter for migration",
+ .mhandler.cmd = hmp_migrate_set_parameter,
+ .command_completion = migrate_set_parameter_completion,
+ },
+
+STEXI
+@item migrate_set_parameter @var{parameter} @var{value}
+@findex migrate_set_parameter
+Set the parameter @var{parameter} for migration.
+ETEXI
+
+ {
.name = "client_migrate_info",
.args_type = "protocol:s,hostname:s,port:i?,tls-port:i?,cert-subject:s?",
.params = "protocol hostname port tls-port cert-subject",
@@ -1762,6 +1777,8 @@ show user network stack connection states
show migration status
@item info migrate_capabilities
show current migration capabilities
+@item info migrate_parameters
+show current migration parameters
@item info migrate_cache_size
show current migration XBZRLE cache size
@item info balloon
diff --git a/hmp.c b/hmp.c
index f31ae27..dcb3940 100644
--- a/hmp.c
+++ b/hmp.c
@@ -252,6 +252,29 @@ void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict)
qapi_free_MigrationCapabilityStatusList(caps);
}
+void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
+{
+ MigrationParameters *params;
+
+ params = qmp_query_migrate_parameters(NULL);
+
+ if (params) {
+ monitor_printf(mon, "parameters:");
+ monitor_printf(mon, " %s: %" PRId64,
+ MigrationParameter_lookup[MIGRATION_PARAMETER_COMPRESS_LEVEL],
+ params->compress_level);
+ monitor_printf(mon, " %s: %" PRId64,
+ MigrationParameter_lookup[MIGRATION_PARAMETER_COMPRESS_THREADS],
+ params->compress_threads);
+ monitor_printf(mon, " %s: %" PRId64,
+ MigrationParameter_lookup[MIGRATION_PARAMETER_DECOMPRESS_THREADS],
+ params->decompress_threads);
+ monitor_printf(mon, "\n");
+ }
+
+ qapi_free_MigrationParameters(params);
+}
+
void hmp_info_migrate_cache_size(Monitor *mon, const QDict *qdict)
{
monitor_printf(mon, "xbzrel cache size: %" PRId64 " kbytes\n",
@@ -1184,6 +1207,48 @@ void hmp_migrate_set_capability(Monitor *mon, const QDict *qdict)
}
}
+void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
+{
+ const char *param = qdict_get_str(qdict, "parameter");
+ int value = qdict_get_int(qdict, "value");
+ Error *err = NULL;
+ bool has_compress_level = false;
+ bool has_compress_threads = false;
+ bool has_decompress_threads = false;
+ int i;
+
+ for (i = 0; i < MIGRATION_PARAMETER_MAX; i++) {
+ if (strcmp(param, MigrationParameter_lookup[i]) == 0) {
+ switch (i) {
+ case MIGRATION_PARAMETER_COMPRESS_LEVEL:
+ has_compress_level = true;
+ break;
+ case MIGRATION_PARAMETER_COMPRESS_THREADS:
+ has_compress_threads = true;
+ break;
+ case MIGRATION_PARAMETER_DECOMPRESS_THREADS:
+ has_decompress_threads = true;
+ break;
+ }
+ qmp_migrate_set_parameters(has_compress_level, value,
+ has_compress_threads, value,
+ has_decompress_threads, value,
+ &err);
+ break;
+ }
+ }
+
+ if (i == MIGRATION_PARAMETER_MAX) {
+ error_set(&err, QERR_INVALID_PARAMETER, param);
+ }
+
+ if (err) {
+ monitor_printf(mon, "migrate_set_parameter: %s\n",
+ error_get_pretty(err));
+ error_free(err);
+ }
+}
+
void hmp_set_password(Monitor *mon, const QDict *qdict)
{
const char *protocol = qdict_get_str(qdict, "protocol");
diff --git a/hmp.h b/hmp.h
index 2b9308b..bb7c1e8 100644
--- a/hmp.h
+++ b/hmp.h
@@ -28,6 +28,7 @@ void hmp_info_chardev(Monitor *mon, const QDict *qdict);
void hmp_info_mice(Monitor *mon, const QDict *qdict);
void hmp_info_migrate(Monitor *mon, const QDict *qdict);
void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict);
+void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict);
void hmp_info_migrate_cache_size(Monitor *mon, const QDict *qdict);
void hmp_info_cpus(Monitor *mon, const QDict *qdict);
void hmp_info_block(Monitor *mon, const QDict *qdict);
@@ -64,6 +65,7 @@ void hmp_migrate_incoming(Monitor *mon, const QDict *qdict);
void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict);
void hmp_migrate_set_speed(Monitor *mon, const QDict *qdict);
void hmp_migrate_set_capability(Monitor *mon, const QDict *qdict);
+void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict);
void hmp_migrate_set_cache_size(Monitor *mon, const QDict *qdict);
void hmp_set_password(Monitor *mon, const QDict *qdict);
void hmp_expire_password(Monitor *mon, const QDict *qdict);
@@ -114,6 +116,8 @@ void watchdog_action_completion(ReadLineState *rs, int nb_args,
const char *str);
void migrate_set_capability_completion(ReadLineState *rs, int nb_args,
const char *str);
+void migrate_set_parameter_completion(ReadLineState *rs, int nb_args,
+ const char *str);
void host_net_add_completion(ReadLineState *rs, int nb_args, const char *str);
void host_net_remove_completion(ReadLineState *rs, int nb_args,
const char *str);
diff --git a/monitor.c b/monitor.c
index 68873ec..6ad79e9 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2859,6 +2859,13 @@ static mon_cmd_t info_cmds[] = {
.mhandler.cmd = hmp_info_migrate_capabilities,
},
{
+ .name = "migrate_parameters",
+ .args_type = "",
+ .params = "",
+ .help = "show current migration parameters",
+ .mhandler.cmd = hmp_info_migrate_parameters,
+ },
+ {
.name = "migrate_cache_size",
.args_type = "",
.params = "",
@@ -4548,6 +4555,24 @@ void migrate_set_capability_completion(ReadLineState *rs, int nb_args,
}
}
+void migrate_set_parameter_completion(ReadLineState *rs, int nb_args,
+ const char *str)
+{
+ size_t len;
+
+ len = strlen(str);
+ readline_set_completion_index(rs, len);
+ if (nb_args == 2) {
+ int i;
+ for (i = 0; i < MIGRATION_PARAMETER_MAX; i++) {
+ const char *name = MigrationParameter_lookup[i];
+ if (!strncmp(str, name, len)) {
+ readline_add_completion(rs, name);
+ }
+ }
+ }
+}
+
void host_net_add_completion(ReadLineState *rs, int nb_args, const char *str)
{
int i;
--
1.9.1
next prev parent reply other threads:[~2015-03-23 9:05 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-23 8:32 [Qemu-devel] [PATCH v6 0/14] migration: Add a new feature to do live migration Liang Li
2015-03-23 8:32 ` [Qemu-devel] [v6 01/14] docs: Add a doc about multiple thread compression Liang Li
2015-03-23 8:32 ` [Qemu-devel] [v6 02/14] migration: Add the framework of multi-thread compression Liang Li
2015-03-23 8:32 ` [Qemu-devel] [v6 03/14] migration: Add the framework of multi-thread decompression Liang Li
2015-03-23 8:32 ` [Qemu-devel] [v6 04/14] qemu-file: Add compression functions to QEMUFile Liang Li
2015-03-23 8:32 ` [Qemu-devel] [v6 05/14] arch_init: Alloc and free data struct for compression Liang Li
2015-03-23 8:32 ` [Qemu-devel] [v6 06/14] arch_init: Add and free data struct for decompression Liang Li
2015-03-23 8:32 ` [Qemu-devel] [v6 07/14] migration: Split save_zero_page from ram_save_page Liang Li
2015-03-23 8:32 ` [Qemu-devel] [v6 08/14] migration: Add the core code of multi-thread compression Liang Li
2015-03-25 11:47 ` Juan Quintela
2015-03-26 2:37 ` Li, Liang Z
2015-03-26 10:27 ` Juan Quintela
2015-03-27 2:59 ` Li, Liang Z
2015-03-27 10:47 ` Juan Quintela
2015-03-28 6:11 ` Li, Liang Z
2015-03-23 8:32 ` [Qemu-devel] [v6 09/14] migration: Make compression co-work with xbzrle Liang Li
2015-03-23 8:32 ` [Qemu-devel] [v6 10/14] migration: Add the core code for decompression Liang Li
2015-03-25 11:56 ` Juan Quintela
2015-03-26 2:46 ` Li, Liang Z
2015-03-23 8:32 ` [Qemu-devel] [v6 11/14] migration: Add interface to control compression Liang Li
2015-03-23 8:32 ` [Qemu-devel] [v6 12/14] migration: Use an array instead of 3 parameters Liang Li
2015-03-23 8:32 ` [Qemu-devel] [v6 13/14] migration: Add qmp commands to set and query parameters Liang Li
2015-03-23 8:32 ` Liang Li [this message]
2015-04-02 1:16 ` [Qemu-devel] [PATCH v6 0/14] migration: Add a new feature to do live migration Li, Liang Z
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1427099549-10633-15-git-send-email-liang.z.li@intel.com \
--to=liang.z.li@intel.com \
--cc=amit.shah@redhat.com \
--cc=dgilbert@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=quintela@redhate.com \
--cc=yang.z.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).