migration: just lock migrate_fd_put_ready

Signed-off-by: Juan Quintela <quintela@redhat.com>

diff --git a/buffered_file.c b/buffered_file.c
index 14e3a6fb73ff832f97842d7f0efdb9450e78d1c3..7743fbdbcaafa4b98387b608b179318163ecac71 100644 (file)
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -222,9 +222,7 @@ static void *buffered_file_thread(void *opaque)
             /* usleep expects microseconds */
             g_usleep((expire_time - current_time)*1000);
         }
-        qemu_mutex_lock_iothread();
         buffered_put_buffer(s, NULL, 0, 0);
-        qemu_mutex_unlock_iothread();
     }
     g_free(s->buffer);
     g_free(s);

diff --git a/migration.c b/migration.c
index 032c9c254fe4a07fd52d70455940d57187d55a63..11123bcea0090c0ca32fe2491c0727b378595d7b 100644 (file)
--- a/migration.c
+++ b/migration.c
@@ -320,8 +320,10 @@ void migrate_fd_put_ready(MigrationState *s)
 {
     int ret;
 
+    qemu_mutex_lock_iothread();
     if (s->state != MIG_STATE_ACTIVE) {
         DPRINTF("put_ready returning because of non-active state\n");
+        qemu_mutex_unlock_iothread();
         return;
     }
     if (s->first_time) {
@@ -331,6 +333,7 @@ void migrate_fd_put_ready(MigrationState *s)
         if (ret < 0) {
             DPRINTF("failed, %d\n", ret);
             migrate_fd_error(s);
+            qemu_mutex_unlock_iothread();
             return;
         }
     }
@@ -366,6 +369,8 @@ void migrate_fd_put_ready(MigrationState *s)
             }
         }
     }
+    qemu_mutex_unlock_iothread();
+
 }
 
 static void migrate_fd_cancel(MigrationState *s)