mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Error check find_ram_offset

Browse Source 
Spotted via code review, we initialize offset to 0 to avoid a
compiler warning, but in the unlikely case that offset is
never set to something else, we should abort instead of return
a value that will almost certainly cause problems.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Alex Williamson 2011-10-31 08:54:09 -06:00 committed by Anthony Liguori
parent c2a8238a2c
commit 3e837b2c05
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
exec.c
View File

@ -2873,7 +2873,7 @@ static void *file_ram_alloc(RAMBlock *block,
static ram_addr_t find_ram_offset(ram_addr_t size) static ram_addr_t find_ram_offset(ram_addr_t size)
{ {
RAMBlock *block, *next_block; RAMBlock *block, *next_block;
ram_addr_t offset = 0, mingap = RAM_ADDR_MAX; ram_addr_t offset = RAM_ADDR_MAX, mingap = RAM_ADDR_MAX;
if (QLIST_EMPTY(&ram_list.blocks)) if (QLIST_EMPTY(&ram_list.blocks))
return 0; return 0;
@ -2889,10 +2889,17 @@ static ram_addr_t find_ram_offset(ram_addr_t size)
} }
} }
if (next - end >= size && next - end < mingap) { if (next - end >= size && next - end < mingap) {
offset = end; offset = end;
mingap = next - end; mingap = next - end;
} }
} }
if (offset == RAM_ADDR_MAX) {
fprintf(stderr, "Failed to find gap of requested size: %" PRIu64 "\n",
(uint64_t)size);
abort();
}
return offset; return offset;
} }