[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/21] migration: pause-before-switchover for postcop
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 12/21] migration: pause-before-switchover for postcopy |
Date: |
Mon, 23 Oct 2017 18:07:51 +0200 |
From: "Dr. David Alan Gilbert" <address@hidden>
Add pause-before-switchover support for postcopy.
After starting postcopy it will transition
active->pre-switchover->postcopy_active
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 | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index b523d8f215..a058f8b46d 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -104,6 +104,9 @@ enum mig_rp_message_type {
static MigrationState *current_migration;
static bool migration_object_check(MigrationState *ms, Error **errp);
+static int migration_maybe_pause(MigrationState *s,
+ int *current_active_state,
+ int new_state);
void migration_object_init(void)
{
@@ -1820,8 +1823,11 @@ static int postcopy_start(MigrationState *ms, bool
*old_vm_running)
QEMUFile *fb;
int64_t time_at_stop = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
bool restart_block = false;
- migrate_set_state(&ms->state, MIGRATION_STATUS_ACTIVE,
- MIGRATION_STATUS_POSTCOPY_ACTIVE);
+ int cur_state = MIGRATION_STATUS_ACTIVE;
+ if (!migrate_pause_before_switchover()) {
+ migrate_set_state(&ms->state, MIGRATION_STATUS_ACTIVE,
+ MIGRATION_STATUS_POSTCOPY_ACTIVE);
+ }
trace_postcopy_start();
qemu_mutex_lock_iothread();
@@ -1835,6 +1841,12 @@ static int postcopy_start(MigrationState *ms, bool
*old_vm_running)
goto fail;
}
+ ret = migration_maybe_pause(ms, &cur_state,
+ MIGRATION_STATUS_POSTCOPY_ACTIVE);
+ if (ret < 0) {
+ goto fail;
+ }
+
ret = bdrv_inactivate_all();
if (ret < 0) {
goto fail;
@@ -1977,7 +1989,9 @@ fail:
* migrate_pause_before_switchover called with the iothread locked
* Returns: 0 on success
*/
-static int migration_maybe_pause(MigrationState *s, int *current_active_state)
+static int migration_maybe_pause(MigrationState *s,
+ int *current_active_state,
+ int new_state)
{
if (!migrate_pause_before_switchover()) {
return 0;
@@ -1998,11 +2012,11 @@ static int migration_maybe_pause(MigrationState *s, int
*current_active_state)
MIGRATION_STATUS_PRE_SWITCHOVER);
qemu_sem_wait(&s->pause_sem);
migrate_set_state(&s->state, MIGRATION_STATUS_PRE_SWITCHOVER,
- MIGRATION_STATUS_DEVICE);
- *current_active_state = MIGRATION_STATUS_DEVICE;
+ new_state);
+ *current_active_state = new_state;
qemu_mutex_lock_iothread();
- return s->state == MIGRATION_STATUS_DEVICE ? 0 : -EINVAL;
+ return s->state == new_state ? 0 : -EINVAL;
}
/**
@@ -2031,7 +2045,8 @@ static void migration_completion(MigrationState *s, int
current_active_state,
bool inactivate = !migrate_colo_enabled();
ret = vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
if (ret >= 0) {
- ret = migration_maybe_pause(s, ¤t_active_state);
+ ret = migration_maybe_pause(s, ¤t_active_state,
+ MIGRATION_STATUS_DEVICE);
}
if (ret >= 0) {
qemu_file_set_rate_limit(s->to_dst_file, INT64_MAX);
--
2.13.6
- [Qemu-devel] [PULL 03/21] migration: Make cache size elements use the right types, (continued)
- [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, 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 <=
- [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
- [Qemu-devel] [PULL 19/21] migration: add bitmap for received page, Juan Quintela, 2017/10/23
- Re: [Qemu-devel] [PULL 00/21] Migration pull request, Peter Maydell, 2017/10/25