[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/27] migration: ensure we start in NONE state
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 20/27] migration: ensure we start in NONE state |
Date: |
Thu, 2 Jul 2015 18:10:08 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
migration/migration.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/migration/migration.c b/migration/migration.c
index 1e34aa5..5c1233f 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -694,7 +694,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;
@@ -709,6 +708,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
- [Qemu-devel] [PULL 05/27] Translate offsets to destination address space, (continued)
- [Qemu-devel] [PULL 05/27] Translate offsets to destination address space, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 10/27] Sanity check RDMA remote data, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 09/27] Sort destination RAMBlocks to be the same as the source, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 11/27] Fail more cleanly in mismatched RAM cases, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 12/27] Fix older machine type compatibility on power with section footers, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 13/27] runstate: Add runstate store, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 14/27] runstate: migration allows more transitions now, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 15/27] migration: create new section to store global state, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 16/27] global_state: Make section optional, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 17/27] vmstate: Create optional sections, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 20/27] migration: ensure we start in NONE state,
Juan Quintela <=
- [Qemu-devel] [PULL 21/27] migration: Use always helper to set state, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 19/27] migration: Use cmpxchg correctly, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 18/27] migration: Add configuration section, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 24/27] migration: Add migration events on target side, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 22/27] migration: No need to call trace_migrate_set_state(), Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 23/27] migration: create migration event, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 25/27] check_section_footers: Check the correct section_id, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 26/27] migration: protect migration_bitmap, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 27/27] migration: extend migration_bitmap, Juan Quintela, 2015/07/02