mirror of
https://github.com/qemu/qemu.git
synced 2024-11-24 19:33:39 +08:00
Error check find_ram_offset
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:
parent
c2a8238a2c
commit
3e837b2c05
11
exec.c
11
exec.c
@ -2873,7 +2873,7 @@ static void *file_ram_alloc(RAMBlock *block,
|
||||
static ram_addr_t find_ram_offset(ram_addr_t size)
|
||||
{
|
||||
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))
|
||||
return 0;
|
||||
@ -2889,10 +2889,17 @@ static ram_addr_t find_ram_offset(ram_addr_t size)
|
||||
}
|
||||
}
|
||||
if (next - end >= size && next - end < mingap) {
|
||||
offset = end;
|
||||
offset = 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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user