From e76274824defce54a124e5104be3880044c698e1 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 23 Jul 2012 06:31:30 +0200 Subject: [PATCH] migration: just lock migrate_fd_put_ready Signed-off-by: Juan Quintela --- buffered_file.c | 2 -- migration.c | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/buffered_file.c b/buffered_file.c index 14e3a6fb73..7743fbdbca 100644 --- 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 032c9c254f..11123bcea0 100644 --- 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)