aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@redhat.com>2011-10-31 08:54:09 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2011-11-01 10:58:08 -0500
commit3e837b2c05bc63fe2226baf3c29923d5a688593f (patch)
tree874e0771980608b9ea9645edddeffddceda6889c
parentc2a8238a2c1e37a2ae6d628a2b7bd95d1b5f1a89 (diff)
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>
-rw-r--r--exec.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/exec.c b/exec.c
index 2f3c6a0ce3..54ecbe7e36 100644
--- a/exec.c
+++ b/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;
}