Skip to contentSkip to conversation

Fix incorect state information for migrate_cancel

PATCH New Lin Ma 1 participant 1 message Dec 2, 2013

lore
Share & tools
lore

Lin Ma

author
#0 lore raw

PATCH 1/1 Fix incorect state information for migrate_cancel

In qemu-1.4.x, When performing migrate_cancel on hmp, Sometimes s->state is incorrrectly saved to MIG_STATE_ERROR instead of MIG_STATE_CANCELLED.

If the migrate_fd_cancel in main thread is scheduled to run before the thread buffered_file_thread calls migrate_fd_put_buffer, The s->state will be modified to MIG_STATE_CANCELLED by main thread, Then the migrate_fd_put_buffer in thread buffered_file_thread will return -EIO if s->state != MIG_STATE_ACTIVE, This incorrect return value trigged migrate_fd_error to set s->state = MIG_STATE_ERROR.

This patch fixes the issue in qemu-1.4.x.

---
 migration.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
migration.c +1 -1
index 98c7696..0ac4608 100644
@@ -751,7 +751,7 @@ static void *buffered_file_thread(void *opaque)
     }
 
 out:
-    if (ret < 0) {
+    if (ret < 0 && !s->complete) {
         migrate_fd_error(s);
     }
     g_free(s->buffer);
Signature · 1 line
1.8.4