[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/21] migration: Add 'pre-switchover' and 'device' s
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 07/21] migration: Add 'pre-switchover' and 'device' statuses |
Date: |
Mon, 23 Oct 2017 18:07:46 +0200 |
From: "Dr. David Alan Gilbert" <address@hidden>
Add two statuses for use when the 'pause-before-switchover'
capability is enabled.
'pre-switchover' is the state that we wait in for management
to allow us to continue.
'device' is the state we enter while serialising the devices
after management gives us the OK.
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 | 6 ++++++
qapi/migration.json | 8 +++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/migration/migration.c b/migration/migration.c
index c041ec7aed..f15372e007 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -526,6 +526,8 @@ static bool migration_is_setup_or_active(int state)
case MIGRATION_STATUS_ACTIVE:
case MIGRATION_STATUS_POSTCOPY_ACTIVE:
case MIGRATION_STATUS_SETUP:
+ case MIGRATION_STATUS_PRE_SWITCHOVER:
+ case MIGRATION_STATUS_DEVICE:
return true;
default:
@@ -600,6 +602,8 @@ MigrationInfo *qmp_query_migrate(Error **errp)
case MIGRATION_STATUS_ACTIVE:
case MIGRATION_STATUS_CANCELLING:
case MIGRATION_STATUS_POSTCOPY_ACTIVE:
+ case MIGRATION_STATUS_PRE_SWITCHOVER:
+ case MIGRATION_STATUS_DEVICE:
/* TODO add some postcopy stats */
info->has_status = true;
info->has_total_time = true;
@@ -1189,6 +1193,8 @@ bool migration_is_idle(void)
case MIGRATION_STATUS_ACTIVE:
case MIGRATION_STATUS_POSTCOPY_ACTIVE:
case MIGRATION_STATUS_COLO:
+ case MIGRATION_STATUS_PRE_SWITCHOVER:
+ case MIGRATION_STATUS_DEVICE:
return false;
case MIGRATION_STATUS__MAX:
g_assert_not_reached();
diff --git a/qapi/migration.json b/qapi/migration.json
index 4960231ba2..b56f95db64 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -96,12 +96,18 @@
# @colo: VM is in the process of fault tolerance, VM can not get into this
# state unless colo capability is enabled for migration. (since 2.8)
#
+# @pre-switchover: Paused before device serialisation. (since 2.11)
+#
+# @device: During device serialisation when pause-before-switchover is enabled
+# (since 2.11)
+#
# Since: 2.3
#
##
{ 'enum': 'MigrationStatus',
'data': [ 'none', 'setup', 'cancelling', 'cancelled',
- 'active', 'postcopy-active', 'completed', 'failed', 'colo' ] }
+ 'active', 'postcopy-active', 'completed', 'failed', 'colo',
+ 'pre-switchover', 'device' ] }
##
# @MigrationInfo:
--
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, 2017/10/23
- [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 <=
- [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
- [Qemu-devel] [PULL 18/21] migration: introduce qemu_ufd_copy_ioctl helper, Juan Quintela, 2017/10/23
- [Qemu-devel] [PULL 21/21] migration: Improve migration thread error handling, Juan Quintela, 2017/10/23