diff options
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2015-11-12 11:34:44 +0000 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2015-11-12 17:54:39 +0100 |
| commit | a54d340b9d0902fa73ff9e5541974b9b51fb1d45 (patch) | |
| tree | effd2038818c72ba24aa8bef135aa663b7e69a7f | |
| parent | a3b6ff6d0a7a964c5c7cd5f9a0d5e42752b6347a (diff) | |
migrate-start-postcopy: Improve text
Improve the text in both the qapi-schema and hmp help to point out
you need to set the postcopy-ram capability prior to issuing
migrate-start-postcopy.
Also fix the text of the migrate_start_postcopy error that
deals with capabilities.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Acked-by: Jason J. Herne <jjherne@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
| -rw-r--r-- | hmp-commands.hx | 4 | ||||
| -rw-r--r-- | migration/migration.c | 2 | ||||
| -rw-r--r-- | qapi-schema.json | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/hmp-commands.hx b/hmp-commands.hx index f3de407647..bb52e4d3bd 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1025,7 +1025,9 @@ ETEXI .name = "migrate_start_postcopy", .args_type = "", .params = "", - .help = "Switch migration to postcopy mode", + .help = "Followup to a migration command to switch the migration" + " to postcopy mode. The x-postcopy-ram capability must " + "be set before the original migration command.", .mhandler.cmd = hmp_migrate_start_postcopy, }, diff --git a/migration/migration.c b/migration/migration.c index 5df490adf6..9bd2ce73ad 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -768,7 +768,7 @@ void qmp_migrate_start_postcopy(Error **errp) MigrationState *s = migrate_get_current(); if (!migrate_postcopy_ram()) { - error_setg(errp, "Enable postcopy with migration_set_capability before" + error_setg(errp, "Enable postcopy with migrate_set_capability before" " the start of migration"); return; } diff --git a/qapi-schema.json b/qapi-schema.json index c3f95ab170..a1514cac67 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -706,7 +706,9 @@ ## # @migrate-start-postcopy # -# Switch migration to postcopy mode +# Followup to a migration command to switch the migration to postcopy mode. +# The x-postcopy-ram capability must be set before the original migration +# command. # # Since: 2.5 { 'command': 'migrate-start-postcopy' } |