[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/49] avoid a bogus COMPLETED->CANCELLED transition
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 01/49] avoid a bogus COMPLETED->CANCELLED transition |
Date: |
Mon, 13 Jan 2014 18:39:46 +0100 |
From: "Zhanghaoyu (A)" <address@hidden>
Avoid a bogus COMPLETED->CANCELLED transition.
There is a period of time from the timing of setting COMPLETED state to that of
migration thread exits, so during which it's problematic in
COMPLETED->CANCELLED transition.
Signed-off-by: Zeng Junliang <address@hidden>
Signed-off-by: Zhang Haoyu <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/migration.c b/migration.c
index 2b1ab20..fd73b97 100644
--- a/migration.c
+++ b/migration.c
@@ -326,9 +326,16 @@ void migrate_fd_error(MigrationState *s)
static void migrate_fd_cancel(MigrationState *s)
{
+ int old_state ;
DPRINTF("cancelling migration\n");
- migrate_set_state(s, s->state, MIG_STATE_CANCELLED);
+ do {
+ old_state = s->state;
+ if (old_state != MIG_STATE_SETUP && old_state != MIG_STATE_ACTIVE) {
+ break;
+ }
+ migrate_set_state(s, old_state, MIG_STATE_CANCELLED);
+ } while (s->state != MIG_STATE_CANCELLED);
}
void add_migration_state_change_notifier(Notifier *notify)
--
1.8.4.2
- [Qemu-devel] [PULL 00/49] migration queue, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 01/49] avoid a bogus COMPLETED->CANCELLED transition,
Juan Quintela <=
- [Qemu-devel] [PATCH 02/49] introduce MIG_STATE_CANCELLING state, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 03/49] migration: Fix rate limit, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 05/49] migration: Move QEMU_VM_* defines to migration/migration.h, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 04/49] qemu-file: Make a few functions non-static, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 06/49] savevm: Convert all tabs to spaces, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 08/49] savevm.c: Coding style fix, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 07/49] savevm.c: Coding style fixes, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 11/49] savevm: Small comment about why timer QEMUFile/VMState code is in savevm.c, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 12/49] tests: Some unit tests for vmstate.c, Juan Quintela, 2014/01/13
- [Qemu-devel] [PATCH 10/49] qemu-file: Move QEMUFile code to qemu-file.c, Juan Quintela, 2014/01/13