[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 7/7] migration: pause-before-switchover for postc
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PATCH v3 7/7] migration: pause-before-switchover for postcopy |
Date: |
Wed, 18 Oct 2017 18:40:13 +0100 |
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>
---
migration/migration.c | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 756deb3e2c..af587377e9 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)
{
@@ -1830,8 +1833,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();
@@ -1845,6 +1851,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;
@@ -1987,7 +1999,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;
@@ -2008,11 +2022,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;
}
/**
@@ -2041,7 +2055,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] [PATCH v3 3/7] migration: Wait for semaphore before completing migration, (continued)
- [Qemu-devel] [PATCH v3 3/7] migration: Wait for semaphore before completing migration, Dr. David Alan Gilbert (git), 2017/10/18
- [Qemu-devel] [PATCH v3 4/7] migration: migrate-continue, Dr. David Alan Gilbert (git), 2017/10/18
- [Qemu-devel] [PATCH v3 5/7] migrate: HMP migate_continue, Dr. David Alan Gilbert (git), 2017/10/18
- [Qemu-devel] [PATCH v3 6/7] migration: allow cancel to unpause, Dr. David Alan Gilbert (git), 2017/10/18
- [Qemu-devel] [PATCH v3 7/7] migration: pause-before-switchover for postcopy,
Dr. David Alan Gilbert (git) <=
- Re: [Qemu-devel] [PATCH v3 0/7] migration: pause-before-switchover, Peter Xu, 2017/10/19
- Re: [Qemu-devel] [PATCH v3 0/7] migration: pause-before-switchover, Jiri Denemark, 2017/10/19