[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/12] migration: ensure we start in NONE state
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 08/12] migration: ensure we start in NONE state |
Date: |
Wed, 1 Jul 2015 10:51:29 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
migration/migration.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/migration/migration.c b/migration/migration.c
index cfcc227..c5b778b 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -693,7 +693,6 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
error_setg(errp, QERR_MIGRATION_ACTIVE);
return;
}
-
if (runstate_check(RUN_STATE_INMIGRATE)) {
error_setg(errp, "Guest is waiting for an incoming migration");
return;
@@ -708,6 +707,12 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
return;
}
+ /* We are starting a new migration, so we want to start in a clean
+ state. This change is only needed if previous migration
+ failed/was cancelled. We don't use migrate_set_state() because
+ we are setting the initial state, not changing it. */
+ s->state = MIGRATION_STATUS_NONE;
+
s = migrate_init(¶ms);
if (strstart(uri, "tcp:", &p)) {
--
2.4.3
- Re: [Qemu-devel] [PATCH 04/12] global_state: Make section optional, (continued)
- [Qemu-devel] [PATCH 05/12] vmstate: Create optional sections, Juan Quintela, 2015/07/01
- [Qemu-devel] [PATCH 06/12] migration: Add configuration section, Juan Quintela, 2015/07/01
- [Qemu-devel] [PATCH 07/12] migration: Use cmpxchg correctly, Juan Quintela, 2015/07/01
- [Qemu-devel] [PATCH 09/12] migration: Use always helper to set state, Juan Quintela, 2015/07/01
- [Qemu-devel] [PATCH 10/12] migration: No need to call trace_migrate_set_state(), Juan Quintela, 2015/07/01
- [Qemu-devel] [PATCH 08/12] migration: ensure we start in NONE state,
Juan Quintela <=
- [Qemu-devel] [PATCH 12/12] migration: Add migration events on target side, Juan Quintela, 2015/07/01
- [Qemu-devel] [PATCH 11/12] migration: create migration event, Juan Quintela, 2015/07/01