diff options
| author | Juan Quintela <quintela@redhat.com> | 2012-07-23 06:31:30 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2012-12-20 23:09:25 +0100 |
| commit | e76274824defce54a124e5104be3880044c698e1 (patch) | |
| tree | bfcecb6e34830fd2584161312ae8372fd8be98a8 | |
| parent | 188a428559f0cd0bde884d28b42e449abd744c2f (diff) | |
| download | qemu-e76274824defce54a124e5104be3880044c698e1.tar.gz qemu-e76274824defce54a124e5104be3880044c698e1.tar.bz2 qemu-e76274824defce54a124e5104be3880044c698e1.zip | |
migration: just lock migrate_fd_put_ready
Signed-off-by: Juan Quintela <quintela@redhat.com>
| -rw-r--r-- | buffered_file.c | 2 | ||||
| -rw-r--r-- | 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) |