openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

migration: Replaced qemu_mutex_lock calls with QEMU_LOCK_GUARD 

Replaced various qemu_mutex_lock calls and their respective
qemu_mutex_unlock calls with QEMU_LOCK_GUARD macro. This simplifies
the code by eliminating the respective qemu_mutex_unlock calls.

Signed-off-by: Mahmoud Mandour <ma.mandourr@gmail.com>
Message-Id: <20210311031538.5325-7-ma.mandourr@gmail.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Mahmoud Mandour 2021-03-11 05:15:35 +02:00 committed by Dr. David Alan Gilbert
parent a8e2ab5db2
commit 373969507a
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
migration/migration.c
View File

@ -323,7 +323,7 @@ static int migrate_send_rp_message(MigrationIncomingState *mis,
int ret = 0; int ret = 0;
trace_migrate_send_rp_message((int)message_type, len); trace_migrate_send_rp_message((int)message_type, len);
qemu_mutex_lock(&mis->rp_mutex); QEMU_LOCK_GUARD(&mis->rp_mutex);
/* /*
* It's possible that the file handle got lost due to network * It's possible that the file handle got lost due to network
@ -331,7 +331,7 @@ static int migrate_send_rp_message(MigrationIncomingState *mis,
*/ */
if (!mis->to_src_file) { if (!mis->to_src_file) {
ret = -EIO; ret = -EIO;
goto error; return ret;
} }
qemu_put_be16(mis->to_src_file, (unsigned int)message_type); qemu_put_be16(mis->to_src_file, (unsigned int)message_type);
@ -342,8 +342,6 @@ static int migrate_send_rp_message(MigrationIncomingState *mis,
/* It's possible that qemu file got error during sending */ /* It's possible that qemu file got error during sending */
ret = qemu_file_get_error(mis->to_src_file); ret = qemu_file_get_error(mis->to_src_file);
error:
qemu_mutex_unlock(&mis->rp_mutex);
return ret; return ret;
} }

6
migration/ram.c
View File

@ -819,7 +819,7 @@ static inline bool migration_bitmap_clear_dirty(RAMState *rs,
{ {
bool ret; bool ret;
qemu_mutex_lock(&rs->bitmap_mutex); QEMU_LOCK_GUARD(&rs->bitmap_mutex);
/* /*
* Clear dirty bitmap if needed. This _must_ be called before we * Clear dirty bitmap if needed. This _must_ be called before we
@ -852,7 +852,6 @@ static inline bool migration_bitmap_clear_dirty(RAMState *rs,
if (ret) { if (ret) {
rs->migration_dirty_pages--; rs->migration_dirty_pages--;
} }
qemu_mutex_unlock(&rs->bitmap_mutex);
return ret; return ret;
} }
@ -3275,7 +3274,7 @@ static void decompress_data_with_multi_threads(QEMUFile *f,
int idx, thread_count; int idx, thread_count;
thread_count = migrate_decompress_threads(); thread_count = migrate_decompress_threads();
qemu_mutex_lock(&decomp_done_lock); QEMU_LOCK_GUARD(&decomp_done_lock);
while (true) { while (true) {
for (idx = 0; idx < thread_count; idx++) { for (idx = 0; idx < thread_count; idx++) {
if (decomp_param[idx].done) { if (decomp_param[idx].done) {
@ -3295,7 +3294,6 @@ static void decompress_data_with_multi_threads(QEMUFile *f,
qemu_cond_wait(&decomp_done_cond, &decomp_done_lock); qemu_cond_wait(&decomp_done_cond, &decomp_done_lock);
} }
} }
qemu_mutex_unlock(&decomp_done_lock);
} }
/* /*