ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exec: fix early return from ram_block_add 

After reporting an error, ram_block_add was going on with the registration
of the RAMBlock.  The visible effect is that it unlocked the ramlist
mutex twice.

Fixes: 528f46af6e
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2016-03-09 18:14:01 +01:00
parent e1fb647199
commit 39c350ee12
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exec.c
View File

@ -1589,6 +1589,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp)
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
qemu_mutex_unlock_ramlist(); qemu_mutex_unlock_ramlist();
return;
} }
} else { } else {
new_block->host = phys_mem_alloc(new_block->max_length, new_block->host = phys_mem_alloc(new_block->max_length,
@ -1598,6 +1599,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp)
"cannot set up guest memory '%s'", "cannot set up guest memory '%s'",
memory_region_name(new_block->mr)); memory_region_name(new_block->mr));
qemu_mutex_unlock_ramlist(); qemu_mutex_unlock_ramlist();
return;
} }
memory_try_enable_merging(new_block->host, new_block->max_length); memory_try_enable_merging(new_block->host, new_block->max_length);
} }