diff options
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2017-10-20 10:05:53 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-10-23 18:03:30 +0200 |
| commit | 89cfc02cb6e3fdaf8ae246493ea51e75be2818c1 (patch) | |
| tree | 14a08877ab2c98278eafa0e5d1c8dc52e2a6e076 | |
| parent | e91d8951d59d483f085f7650381b8e55a1a55e4c (diff) | |
migration: migrate-continue
A new qmp command allows the caller to continue from a given
paused state.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
| -rw-r--r-- | migration/migration.c | 11 | ||||
| -rw-r--r-- | qapi/migration.json | 17 |
2 files changed, 28 insertions, 0 deletions
diff --git a/migration/migration.c b/migration/migration.c index ef84d2c1fb..90bfdc3a7c 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1374,6 +1374,17 @@ void qmp_migrate_cancel(Error **errp) migrate_fd_cancel(migrate_get_current()); } +void qmp_migrate_continue(MigrationStatus state, Error **errp) +{ + MigrationState *s = migrate_get_current(); + if (s->state != state) { + error_setg(errp, "Migration not in expected state: %s", + MigrationStatus_str(s->state)); + return; + } + qemu_sem_post(&s->pause_sem); +} + void qmp_migrate_set_cache_size(int64_t value, Error **errp) { MigrationState *s = migrate_get_current(); diff --git a/qapi/migration.json b/qapi/migration.json index b56f95db64..272f191551 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -877,6 +877,23 @@ { 'command': 'migrate_cancel' } ## +# @migrate-continue: +# +# Continue migration when it's in a paused state. +# +# @state: The state the migration is currently expected to be in +# +# Returns: nothing on success +# Since: 2.11 +# Example: +# +# -> { "execute": "migrate-continue" , "arguments": +# { "state": "pre-switchover" } } +# <- { "return": {} } +## +{ 'command': 'migrate-continue', 'data': {'state': 'MigrationStatus'} } + +## # @migrate_set_downtime: # # Set maximum tolerated downtime for migration. |