diff options
author | Peter Xu | 2018-05-02 12:47:36 +0200 |
---|---|---|
committer | Juan Quintela | 2018-05-15 22:11:45 +0200 |
commit | 02affd41b1157c511ea7fd0cc0bc61a07d9696b1 (patch) | |
tree | b7c9459f513fe2f491dc625393b4df8551932d90 /migration | |
parent | migration: init dst in migration_object_init too (diff) | |
download | qemu-02affd41b1157c511ea7fd0cc0bc61a07d9696b1.tar.gz qemu-02affd41b1157c511ea7fd0cc0bc61a07d9696b1.tar.xz qemu-02affd41b1157c511ea7fd0cc0bc61a07d9696b1.zip |
qmp/migration: new command migrate-recover
The first allow-oob=true command. It's used on destination side when
the postcopy migration is paused and ready for a recovery. After
execution, a new migration channel will be established for postcopy to
continue.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20180502104740.12123-21-peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
s/2.12/2.13/
Diffstat (limited to 'migration')
-rw-r--r-- | migration/migration.c | 24 | ||||
-rw-r--r-- | migration/migration.h | 1 | ||||
-rw-r--r-- | migration/savevm.c | 3 |
3 files changed, 28 insertions, 0 deletions
diff --git a/migration/migration.c b/migration/migration.c index c1832b0263..1beb5e07fb 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1475,6 +1475,30 @@ void qmp_migrate_incoming(const char *uri, Error **errp) once = false; } +void qmp_migrate_recover(const char *uri, Error **errp) +{ + MigrationIncomingState *mis = migration_incoming_get_current(); + + if (mis->state != MIGRATION_STATUS_POSTCOPY_PAUSED) { + error_setg(errp, "Migrate recover can only be run " + "when postcopy is paused."); + return; + } + + if (atomic_cmpxchg(&mis->postcopy_recover_triggered, + false, true) == true) { + error_setg(errp, "Migrate recovery is triggered already"); + return; + } + + /* + * Note that this call will never start a real migration; it will + * only re-setup the migration stream and poke existing migration + * to continue using that newly established channel. + */ + qemu_start_incoming_migration(uri, errp); +} + bool migration_is_blocked(Error **errp) { if (qemu_savevm_state_blocked(errp)) { diff --git a/migration/migration.h b/migration/migration.h index b4438ccb65..f83f1064b5 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -77,6 +77,7 @@ struct MigrationIncomingState { struct PostcopyBlocktimeContext *blocktime_ctx; /* notify PAUSED postcopy incoming migrations to try to continue */ + bool postcopy_recover_triggered; QemuSemaphore postcopy_pause_sem_dst; QemuSemaphore postcopy_pause_sem_fault; }; diff --git a/migration/savevm.c b/migration/savevm.c index 8e7653badc..4251125831 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2190,6 +2190,9 @@ static bool postcopy_pause_incoming(MigrationIncomingState *mis) { trace_postcopy_pause_incoming(); + /* Clear the triggered bit to allow one recovery */ + mis->postcopy_recover_triggered = false; + migrate_set_state(&mis->state, MIGRATION_STATUS_POSTCOPY_ACTIVE, MIGRATION_STATUS_POSTCOPY_PAUSED); |