Message ID | 1343911494-7784-3-git-send-email-owasserm@redhat.com |
---|---|
State | New |
Headers | show |
On Thu, 2 Aug 2012 15:44:45 +0300 Orit Wasserman <owasserm@redhat.com> wrote: > The management can enable/disable a capability for the next migration by using > migrate-set-apabilities QMP command. > The management can query the current migration capabilities using > query-migrate-capabilities QMP command. > The user can use migrate_set_capability and 'info migrate_capabilities' HMP > commands. > > Signed-off-by: Orit Wasserman <owasserm@redhat.com> > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > hmp-commands.hx | 16 +++++++++++++ > hmp.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ > hmp.h | 2 + > migration.c | 46 ++++++++++++++++++++++++++++++++++++++ > migration.h | 2 + > monitor.c | 7 +++++ > qapi-schema.json | 32 ++++++++++++++++++++++++++ > qmp-commands.hx | 49 ++++++++++++++++++++++++++++++++++++++++ > 8 files changed, 219 insertions(+), 0 deletions(-) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 8267237..f4c8495 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -861,6 +861,20 @@ Set maximum tolerated downtime (in seconds) for migration. > ETEXI > > { > + .name = "migrate_set_capability", > + .args_type = "capability:s,state:b", > + .params = "capability state", > + .help = "Enable/Disable the usage of a capability for migration", > + .mhandler.cmd = hmp_migrate_set_capability, > + }, > + > +STEXI > +@item migrate_set_capability @var{capability} @var{state} > +@findex migrate_set_capability > +Enable/Disable the usage of a capability @var{capability} 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", > @@ -1419,6 +1433,8 @@ show user network stack connection states > show migration status > @item info migration_supported_capabilities > show migration supported capabilities > +@item info migrate_capabilities > +show current migration capabilities > @item info balloon > show balloon information > @item info qtree > diff --git a/hmp.c b/hmp.c > index 2ff71a3..463b730 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -131,8 +131,21 @@ void hmp_info_mice(Monitor *mon) > void hmp_info_migrate(Monitor *mon) > { > MigrationInfo *info; > + MigrationCapabilityStatusList *caps, *cap; > > info = qmp_query_migrate(NULL); > + caps = qmp_query_migrate_capabilities(NULL); > + > + /* do not display parameters during setup */ > + if (info->has_status && caps) { > + monitor_printf(mon, "capabilities: "); > + for (cap = caps; cap; cap = cap->next) { > + monitor_printf(mon, "%s: %s ", > + MigrationCapability_lookup[cap->value->capability], > + cap->value->state ? "on" : "off"); > + } > + monitor_printf(mon, "\n"); > + } > > if (info->has_status) { > monitor_printf(mon, "Migration status: %s\n", info->status); > @@ -159,6 +172,7 @@ void hmp_info_migrate(Monitor *mon) > } > > qapi_free_MigrationInfo(info); > + qapi_free_MigrationCapabilityStatusList(caps); > } > > void hmp_info_migration_supported_capabilities(Monitor *mon) > @@ -182,6 +196,25 @@ void hmp_info_migration_supported_capabilities(Monitor *mon) > qapi_free_MigrationCapabilityStatusList(caps_list); > } > > +void hmp_info_migrate_capabilities(Monitor *mon) > +{ > + MigrationCapabilityStatusList *caps, *cap; > + > + caps = qmp_query_migrate_capabilities(NULL); > + > + if (caps) { > + monitor_printf(mon, "capabilities: "); > + for (cap = caps; cap; cap = cap->next) { > + monitor_printf(mon, "%s: %s ", > + MigrationCapability_lookup[cap->value->capability], > + cap->value->state ? "on" : "off"); > + } > + monitor_printf(mon, "\n"); > + } > + > + qapi_free_MigrationCapabilityStatusList(caps); > +} > + > void hmp_info_cpus(Monitor *mon) > { > CpuInfoList *cpu_list, *cpu; > @@ -756,6 +789,38 @@ void hmp_migrate_set_speed(Monitor *mon, const QDict *qdict) > qmp_migrate_set_speed(value, NULL); > } > > +void hmp_migrate_set_capability(Monitor *mon, const QDict *qdict) > +{ > + const char *cap = qdict_get_str(qdict, "capability"); > + bool state = qdict_get_bool(qdict, "state"); > + Error *err = NULL; > + MigrationCapabilityStatusList *caps = g_malloc0(sizeof(*caps)); > + int i; > + > + for (i = 0; i < MIGRATION_CAPABILITY_MAX; i++) { > + if (strcmp(cap, MigrationCapability_lookup[i]) == 0) { > + caps->value = g_malloc0(sizeof(*caps->value)); > + caps->value->capability = i; > + caps->value->state = state; > + caps->next = NULL; > + qmp_migrate_set_capabilities(caps, &err); > + break; > + } > + } > + > + if (i == MIGRATION_CAPABILITY_MAX) { > + error_set(&err, QERR_INVALID_PARAMETER, cap); > + } > + > + qapi_free_MigrationCapabilityStatusList(caps); > + > + 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 8442c22..f2a890f 100644 > --- a/hmp.h > +++ b/hmp.h > @@ -26,6 +26,7 @@ void hmp_info_chardev(Monitor *mon); > void hmp_info_mice(Monitor *mon); > void hmp_info_migrate(Monitor *mon); > void hmp_info_migration_supported_capabilities(Monitor *mon); > +void hmp_info_migrate_capabilities(Monitor *mon); > void hmp_info_cpus(Monitor *mon); > void hmp_info_block(Monitor *mon); > void hmp_info_blockstats(Monitor *mon); > @@ -52,6 +53,7 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict); > void hmp_migrate_cancel(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_set_password(Monitor *mon, const QDict *qdict); > void hmp_expire_password(Monitor *mon, const QDict *qdict); > void hmp_eject(Monitor *mon, const QDict *qdict); > diff --git a/migration.c b/migration.c > index 35444f7..d1a8d3a 100644 > --- a/migration.c > +++ b/migration.c > @@ -113,6 +113,30 @@ uint64_t migrate_max_downtime(void) > return max_downtime; > } > > +MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp) > +{ > + MigrationCapabilityStatusList *head = NULL; > + MigrationCapabilityStatusList *caps; > + MigrationState *s = migrate_get_current(); > + int i; > + > + for (i = 0; i < MIGRATION_CAPABILITY_MAX; i++) { > + if (head == NULL) { > + head = g_malloc0(sizeof(*caps)); > + caps = head; > + } else { > + caps->next = g_malloc0(sizeof(*caps)); > + caps = caps->next; > + } > + caps->value = > + g_malloc(sizeof(*caps->value)); > + caps->value->capability = i; > + caps->value->state = s->enabled_capabilities[i]; > + } > + > + return head; > +} > + > MigrationInfo *qmp_query_migrate(Error **errp) > { > MigrationInfo *info = g_malloc0(sizeof(*info)); > @@ -178,6 +202,22 @@ qmp_query_migration_supported_capabilities(Error **errp) > return caps_list; > } > > +void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params, > + Error **errp) > +{ > + MigrationState *s = migrate_get_current(); > + MigrationCapabilityStatusList *cap; > + > + if (s->state == MIG_STATE_ACTIVE) { > + error_set(errp, QERR_MIGRATION_ACTIVE); > + return; > + } > + > + for (cap = params; cap; cap = cap->next) { > + s->enabled_capabilities[cap->value->capability] = cap->value->state; > + } > +} > + > /* shared migration helpers */ > > static int migrate_fd_cleanup(MigrationState *s) > @@ -387,10 +427,16 @@ static MigrationState *migrate_init(const MigrationParams *params) > { > MigrationState *s = migrate_get_current(); > int64_t bandwidth_limit = s->bandwidth_limit; > + bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; > + > + memcpy(enabled_capabilities, s->enabled_capabilities, > + sizeof(enabled_capabilities)); > > memset(s, 0, sizeof(*s)); > s->bandwidth_limit = bandwidth_limit; > s->params = *params; > + memcpy(s->enabled_capabilities, enabled_capabilities, > + sizeof(enabled_capabilities)); > > s->bandwidth_limit = bandwidth_limit; > s->state = MIG_STATE_SETUP; > diff --git a/migration.h b/migration.h > index 57572a6..713aae0 100644 > --- a/migration.h > +++ b/migration.h > @@ -19,6 +19,7 @@ > #include "notify.h" > #include "error.h" > #include "vmstate.h" > +#include "qapi-types.h" > > struct MigrationParams { > bool blk; > @@ -39,6 +40,7 @@ struct MigrationState > void *opaque; > MigrationParams params; > int64_t total_time; > + bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; > }; > > void process_incoming_migration(QEMUFile *f); > diff --git a/monitor.c b/monitor.c > index 43f7df5..58d6e2a 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -2669,6 +2669,13 @@ static mon_cmd_t info_cmds[] = { > .mhandler.info = hmp_info_migration_supported_capabilities, > }, > { > + .name = "migrate_capabilities", > + .args_type = "", > + .params = "", > + .help = "show current migration capabilities", > + .mhandler.info = hmp_info_migrate_capabilities, > + }, > + { > .name = "balloon", > .args_type = "", > .params = "", > diff --git a/qapi-schema.json b/qapi-schema.json > index 68d0fbb..f38dfc6 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -345,6 +345,38 @@ > { 'command': 'query-migration-supported-capabilities', 'returns': ['MigrationCapabilityStatus'] } > > ## > +# @migrate-set-capabilities > +# > +# Enable/Disable the following migration capabilities (like xbzrle) > +# > +# Since: 1.2 > +## > +{ 'command': 'migrate-set-capabilities', > + 'data': { 'capabilities': ['MigrationCapabilityStatus'] } } > + > +## > +# @MigrationParameters > +# > +# @capabilities: @MigrationCapabilityStatus list contain current migration > +# capabilities status > +# Since: 1.2 > +## > +{ 'type': 'MigrationParameters', > + 'data': {'capabilities': ['MigrationCapabilityStatus']} } This seems to be unused. > + > + > +## > +# @query-migrate-capabilities > +# > +# Returns information about the current migration capabilities status > +# > +# Returns: @MigrationCapabilitiesStatus > +# > +# Since: 1.2 > +## > +{ 'command': 'query-migrate-capabilities', 'returns': ['MigrationCapabilityStatus']} > + > +## > # @MouseInfo: > # > # Information about a mouse device. > diff --git a/qmp-commands.hx b/qmp-commands.hx > index 16fbcef..e96a993 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -2166,6 +2166,55 @@ EQMP > }, > > SQMP > +migrate-set-capabilities > +------- > + > +Enable/Disable migration capabilities > + > +- "xbzrle": xbzrle support > + > +Arguments: > + > +Example: > + > +-> { "execute": "migrate-set-capabilities" , "arguments": > + { "capabilities": [ { "capability": "xbzrle", "state": true } ] } } > + > +EQMP > + > + { > + .name = "migrate_set_capabilities", s/migrate_set_capabilities/migrate-set-capabilities > + .args_type = "capabilities:O", > + .params = "capability:s,state:b", > + .mhandler.cmd_new = qmp_marshal_input_migrate_set_capabilities, > + }, > +SQMP > +query-migrate-capabilities > +------- > + > +Query current migration capabilities > + > +- "capabilities": migration capabilities state > + - "xbzrle" : XBZRLE state (json-bool) > + > +Arguments: > + > +Example: > + > +-> { "execute": "query-migrate-capabilities" } > +<- { "return": { > + "capabilities" : [ { "capability" : "xbzrle", "state" : false } ] > + } > + } > +EQMP > + > + { > + .name = "query-migrate-capabilities", > + .args_type = "", > + .mhandler.cmd_new = qmp_marshal_input_query_migrate_capabilities, > + }, > + > +SQMP > query-balloon > ------------- >
diff --git a/hmp-commands.hx b/hmp-commands.hx index 8267237..f4c8495 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -861,6 +861,20 @@ Set maximum tolerated downtime (in seconds) for migration. ETEXI { + .name = "migrate_set_capability", + .args_type = "capability:s,state:b", + .params = "capability state", + .help = "Enable/Disable the usage of a capability for migration", + .mhandler.cmd = hmp_migrate_set_capability, + }, + +STEXI +@item migrate_set_capability @var{capability} @var{state} +@findex migrate_set_capability +Enable/Disable the usage of a capability @var{capability} 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", @@ -1419,6 +1433,8 @@ show user network stack connection states show migration status @item info migration_supported_capabilities show migration supported capabilities +@item info migrate_capabilities +show current migration capabilities @item info balloon show balloon information @item info qtree diff --git a/hmp.c b/hmp.c index 2ff71a3..463b730 100644 --- a/hmp.c +++ b/hmp.c @@ -131,8 +131,21 @@ void hmp_info_mice(Monitor *mon) void hmp_info_migrate(Monitor *mon) { MigrationInfo *info; + MigrationCapabilityStatusList *caps, *cap; info = qmp_query_migrate(NULL); + caps = qmp_query_migrate_capabilities(NULL); + + /* do not display parameters during setup */ + if (info->has_status && caps) { + monitor_printf(mon, "capabilities: "); + for (cap = caps; cap; cap = cap->next) { + monitor_printf(mon, "%s: %s ", + MigrationCapability_lookup[cap->value->capability], + cap->value->state ? "on" : "off"); + } + monitor_printf(mon, "\n"); + } if (info->has_status) { monitor_printf(mon, "Migration status: %s\n", info->status); @@ -159,6 +172,7 @@ void hmp_info_migrate(Monitor *mon) } qapi_free_MigrationInfo(info); + qapi_free_MigrationCapabilityStatusList(caps); } void hmp_info_migration_supported_capabilities(Monitor *mon) @@ -182,6 +196,25 @@ void hmp_info_migration_supported_capabilities(Monitor *mon) qapi_free_MigrationCapabilityStatusList(caps_list); } +void hmp_info_migrate_capabilities(Monitor *mon) +{ + MigrationCapabilityStatusList *caps, *cap; + + caps = qmp_query_migrate_capabilities(NULL); + + if (caps) { + monitor_printf(mon, "capabilities: "); + for (cap = caps; cap; cap = cap->next) { + monitor_printf(mon, "%s: %s ", + MigrationCapability_lookup[cap->value->capability], + cap->value->state ? "on" : "off"); + } + monitor_printf(mon, "\n"); + } + + qapi_free_MigrationCapabilityStatusList(caps); +} + void hmp_info_cpus(Monitor *mon) { CpuInfoList *cpu_list, *cpu; @@ -756,6 +789,38 @@ void hmp_migrate_set_speed(Monitor *mon, const QDict *qdict) qmp_migrate_set_speed(value, NULL); } +void hmp_migrate_set_capability(Monitor *mon, const QDict *qdict) +{ + const char *cap = qdict_get_str(qdict, "capability"); + bool state = qdict_get_bool(qdict, "state"); + Error *err = NULL; + MigrationCapabilityStatusList *caps = g_malloc0(sizeof(*caps)); + int i; + + for (i = 0; i < MIGRATION_CAPABILITY_MAX; i++) { + if (strcmp(cap, MigrationCapability_lookup[i]) == 0) { + caps->value = g_malloc0(sizeof(*caps->value)); + caps->value->capability = i; + caps->value->state = state; + caps->next = NULL; + qmp_migrate_set_capabilities(caps, &err); + break; + } + } + + if (i == MIGRATION_CAPABILITY_MAX) { + error_set(&err, QERR_INVALID_PARAMETER, cap); + } + + qapi_free_MigrationCapabilityStatusList(caps); + + 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 8442c22..f2a890f 100644 --- a/hmp.h +++ b/hmp.h @@ -26,6 +26,7 @@ void hmp_info_chardev(Monitor *mon); void hmp_info_mice(Monitor *mon); void hmp_info_migrate(Monitor *mon); void hmp_info_migration_supported_capabilities(Monitor *mon); +void hmp_info_migrate_capabilities(Monitor *mon); void hmp_info_cpus(Monitor *mon); void hmp_info_block(Monitor *mon); void hmp_info_blockstats(Monitor *mon); @@ -52,6 +53,7 @@ void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict); void hmp_migrate_cancel(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_set_password(Monitor *mon, const QDict *qdict); void hmp_expire_password(Monitor *mon, const QDict *qdict); void hmp_eject(Monitor *mon, const QDict *qdict); diff --git a/migration.c b/migration.c index 35444f7..d1a8d3a 100644 --- a/migration.c +++ b/migration.c @@ -113,6 +113,30 @@ uint64_t migrate_max_downtime(void) return max_downtime; } +MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp) +{ + MigrationCapabilityStatusList *head = NULL; + MigrationCapabilityStatusList *caps; + MigrationState *s = migrate_get_current(); + int i; + + for (i = 0; i < MIGRATION_CAPABILITY_MAX; i++) { + if (head == NULL) { + head = g_malloc0(sizeof(*caps)); + caps = head; + } else { + caps->next = g_malloc0(sizeof(*caps)); + caps = caps->next; + } + caps->value = + g_malloc(sizeof(*caps->value)); + caps->value->capability = i; + caps->value->state = s->enabled_capabilities[i]; + } + + return head; +} + MigrationInfo *qmp_query_migrate(Error **errp) { MigrationInfo *info = g_malloc0(sizeof(*info)); @@ -178,6 +202,22 @@ qmp_query_migration_supported_capabilities(Error **errp) return caps_list; } +void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params, + Error **errp) +{ + MigrationState *s = migrate_get_current(); + MigrationCapabilityStatusList *cap; + + if (s->state == MIG_STATE_ACTIVE) { + error_set(errp, QERR_MIGRATION_ACTIVE); + return; + } + + for (cap = params; cap; cap = cap->next) { + s->enabled_capabilities[cap->value->capability] = cap->value->state; + } +} + /* shared migration helpers */ static int migrate_fd_cleanup(MigrationState *s) @@ -387,10 +427,16 @@ static MigrationState *migrate_init(const MigrationParams *params) { MigrationState *s = migrate_get_current(); int64_t bandwidth_limit = s->bandwidth_limit; + bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; + + memcpy(enabled_capabilities, s->enabled_capabilities, + sizeof(enabled_capabilities)); memset(s, 0, sizeof(*s)); s->bandwidth_limit = bandwidth_limit; s->params = *params; + memcpy(s->enabled_capabilities, enabled_capabilities, + sizeof(enabled_capabilities)); s->bandwidth_limit = bandwidth_limit; s->state = MIG_STATE_SETUP; diff --git a/migration.h b/migration.h index 57572a6..713aae0 100644 --- a/migration.h +++ b/migration.h @@ -19,6 +19,7 @@ #include "notify.h" #include "error.h" #include "vmstate.h" +#include "qapi-types.h" struct MigrationParams { bool blk; @@ -39,6 +40,7 @@ struct MigrationState void *opaque; MigrationParams params; int64_t total_time; + bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; }; void process_incoming_migration(QEMUFile *f); diff --git a/monitor.c b/monitor.c index 43f7df5..58d6e2a 100644 --- a/monitor.c +++ b/monitor.c @@ -2669,6 +2669,13 @@ static mon_cmd_t info_cmds[] = { .mhandler.info = hmp_info_migration_supported_capabilities, }, { + .name = "migrate_capabilities", + .args_type = "", + .params = "", + .help = "show current migration capabilities", + .mhandler.info = hmp_info_migrate_capabilities, + }, + { .name = "balloon", .args_type = "", .params = "", diff --git a/qapi-schema.json b/qapi-schema.json index 68d0fbb..f38dfc6 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -345,6 +345,38 @@ { 'command': 'query-migration-supported-capabilities', 'returns': ['MigrationCapabilityStatus'] } ## +# @migrate-set-capabilities +# +# Enable/Disable the following migration capabilities (like xbzrle) +# +# Since: 1.2 +## +{ 'command': 'migrate-set-capabilities', + 'data': { 'capabilities': ['MigrationCapabilityStatus'] } } + +## +# @MigrationParameters +# +# @capabilities: @MigrationCapabilityStatus list contain current migration +# capabilities status +# Since: 1.2 +## +{ 'type': 'MigrationParameters', + 'data': {'capabilities': ['MigrationCapabilityStatus']} } + + +## +# @query-migrate-capabilities +# +# Returns information about the current migration capabilities status +# +# Returns: @MigrationCapabilitiesStatus +# +# Since: 1.2 +## +{ 'command': 'query-migrate-capabilities', 'returns': ['MigrationCapabilityStatus']} + +## # @MouseInfo: # # Information about a mouse device. diff --git a/qmp-commands.hx b/qmp-commands.hx index 16fbcef..e96a993 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2166,6 +2166,55 @@ EQMP }, SQMP +migrate-set-capabilities +------- + +Enable/Disable migration capabilities + +- "xbzrle": xbzrle support + +Arguments: + +Example: + +-> { "execute": "migrate-set-capabilities" , "arguments": + { "capabilities": [ { "capability": "xbzrle", "state": true } ] } } + +EQMP + + { + .name = "migrate_set_capabilities", + .args_type = "capabilities:O", + .params = "capability:s,state:b", + .mhandler.cmd_new = qmp_marshal_input_migrate_set_capabilities, + }, +SQMP +query-migrate-capabilities +------- + +Query current migration capabilities + +- "capabilities": migration capabilities state + - "xbzrle" : XBZRLE state (json-bool) + +Arguments: + +Example: + +-> { "execute": "query-migrate-capabilities" } +<- { "return": { + "capabilities" : [ { "capability" : "xbzrle", "state" : false } ] + } + } +EQMP + + { + .name = "query-migrate-capabilities", + .args_type = "", + .mhandler.cmd_new = qmp_marshal_input_query_migrate_capabilities, + }, + +SQMP query-balloon -------------