[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/7] migration: pause-before-device for postcopy
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PATCH 7/7] migration: pause-before-device for postcopy |
Date: |
Wed, 11 Oct 2017 20:13:17 +0100 |
From: "Dr. David Alan Gilbert" <address@hidden>
Add pause-before-device support for postcopy.
After starting postcopy it will transition
active->pause_before_device->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 fa42918270..bdb6a30995 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)
{
@@ -1829,8 +1832,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_device()) {
+ migrate_set_state(&ms->state, MIGRATION_STATUS_ACTIVE,
+ MIGRATION_STATUS_POSTCOPY_ACTIVE);
+ }
trace_postcopy_start();
qemu_mutex_lock_iothread();
@@ -1850,6 +1856,12 @@ static int postcopy_start(MigrationState *ms, bool
*old_vm_running)
}
restart_block = true;
+ ret = migration_maybe_pause(ms, &cur_state,
+ MIGRATION_STATUS_POSTCOPY_ACTIVE);
+ if (ret < 0) {
+ goto fail;
+ }
+
/*
* Cause any non-postcopiable, but iterative devices to
* send out their final data.
@@ -1986,7 +1998,9 @@ fail:
* 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)
{
int ret;
if (!migrate_pause_before_device()) {
@@ -2014,11 +2028,11 @@ static int migration_maybe_pause(MigrationState *s, int
*current_active_state)
MIGRATION_STATUS_PAUSE_BEFORE_DEVICE);
qemu_sem_wait(&s->pause_sem);
migrate_set_state(&s->state, MIGRATION_STATUS_PAUSE_BEFORE_DEVICE,
- 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;
}
/**
@@ -2047,7 +2061,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 this worked it will already have inactivated */
inactivate &= !migrate_pause_before_device();
}
--
2.13.6
- [Qemu-devel] [PATCH 0/7] migration: pause-before-device, Dr. David Alan Gilbert (git), 2017/10/11
- [Qemu-devel] [PATCH 1/7] migration: Add 'pause-before-device' capability, Dr. David Alan Gilbert (git), 2017/10/11
- [Qemu-devel] [PATCH 2/7] migration: Add 'pause-before-device' and 'device' statuses, Dr. David Alan Gilbert (git), 2017/10/11
- [Qemu-devel] [PATCH 3/7] migration: Wait for semaphore before completing migration, Dr. David Alan Gilbert (git), 2017/10/11
- [Qemu-devel] [PATCH 4/7] migration: migrate-continue, Dr. David Alan Gilbert (git), 2017/10/11
- [Qemu-devel] [PATCH 5/7] migrate: HMP migate_continue, Dr. David Alan Gilbert (git), 2017/10/11
- [Qemu-devel] [PATCH 6/7] migration: allow cancel to unpause, Dr. David Alan Gilbert (git), 2017/10/11
- [Qemu-devel] [PATCH 7/7] migration: pause-before-device for postcopy,
Dr. David Alan Gilbert (git) <=
- Re: [Qemu-devel] [PATCH 0/7] migration: pause-before-device, no-reply, 2017/10/11
- Re: [Qemu-devel] [PATCH 0/7] migration: pause-before-device, Daniel P. Berrange, 2017/10/12
Re: [Qemu-devel] [PATCH 0/7] migration: pause-before-device, Daniel P. Berrange, 2017/10/12