[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/34] migration: just lock migrate_fd_put_ready
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 16/34] migration: just lock migrate_fd_put_ready |
Date: |
Wed, 19 Dec 2012 13:33:39 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
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 31f31f4..5cd477a 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -223,9 +223,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 ae0d7bd..d6cb320 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)
--
1.7.11.7
- [Qemu-devel] [PATCH 03/34] migration: remove double call to migrate_fd_close, (continued)
- [Qemu-devel] [PATCH 03/34] migration: remove double call to migrate_fd_close, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 04/34] migration: include qemu-file.h, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 05/34] migration-fd: remove duplicate include, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 07/34] exec: change RAM list to a TAILQ, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 06/34] exec: change ramlist from MRU order to a 1-item cache, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 09/34] add a version number to ram_list, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 08/34] exec: sort the memory from biggest to smallest, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 11/34] buffered_file: Move from using a timer to use a thread, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 10/34] protect the ramlist with a separate mutex, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 13/34] migration: move migration thread init code to migrate_fd_put_ready, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 16/34] migration: just lock migrate_fd_put_ready,
Juan Quintela <=
- [Qemu-devel] [PATCH 15/34] migration: remove unfreeze logic, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 14/34] migration: make writes blocking, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 18/34] buffered_file: don't flush on put buffer, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 17/34] buffered_file: Unfold the trick to restart generating migration data, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 22/34] migration: add XFER_LIMIT_RATIO, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 26/34] ram: rename last_block to last_seen_block, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 19/34] buffered_file: unfold buffered_append in buffered_put_buffer, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 12/34] migration: make qemu_fopen_ops_buffered() return void, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 20/34] savevm: New save live migration method: pending, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 23/34] migration: move migration_fd_put_ready(), Juan Quintela, 2012/12/19