[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/21] migration: migrate-continue
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 09/21] migration: migrate-continue |
Date: |
Mon, 23 Oct 2017 18:07:48 +0200 |
From: "Dr. David Alan Gilbert" <address@hidden>
A new qmp command allows the caller to continue from a given
paused state.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/migration.c | 11 +++++++++++
qapi/migration.json | 17 +++++++++++++++++
2 files changed, 28 insertions(+)
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.
--
2.13.6
- [Qemu-devel] [PULL 00/21] Migration pull request, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 01/21] migration: Fix migrate_test_apply for multifd parameters, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 03/21] migration: Make cache size elements use the right types, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 04/21] migration: Move xbzrle cache resize error handling to xbzrle_cache_resize, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 02/21] migratiom: Remove max_item_age parameter, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 05/21] migration: Make cache_init() take an error parameter, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 06/21] migration: Add 'pause-before-switchover' capability, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 08/21] migration: Wait for semaphore before completing migration, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 09/21] migration: migrate-continue,
Juan Quintela <=
- [Qemu-devel] [PULL 10/21] migrate: HMP migate_continue, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 07/21] migration: Add 'pre-switchover' and 'device' statuses, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 11/21] migration: allow cancel to unpause, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 12/21] migration: pause-before-switchover for postcopy, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 13/21] migration: provide ram_state_init(), Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 14/21] migration: provide ram_state_cleanup, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 15/21] migration: clean up xbzrle cache init/destroy, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 16/21] migration: new ram_init_bitmaps(), Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 17/21] migration: postcopy_place_page factoring out, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 20/21] qapi: Fix grammar in x-multifd-page-count descriptions, Juan Quintela, 2017/10/23