aboutsummaryrefslogtreecommitdiff
path: root/numa.c
diff options
context:
space:
mode:
authorLuiz Capitulino <lcapitulino@redhat.com>2016-01-22 09:15:01 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2016-01-26 15:58:14 +0100
commitfae947b096020e5004ec7ae106a95a69a5e4d929 (patch)
tree98a589a1d9cf3e7980df9a22a50ceecf6dd4c72f /numa.c
parent96bce6831bd19b61e965384427741d805c7234c3 (diff)
downloadqemu-arm-fae947b096020e5004ec7ae106a95a69a5e4d929.tar.gz
memory: exit when hugepage allocation fails if mem-prealloc
When -mem-prealloc is passed on the command-line, the expected behavior is to exit if the hugepage allocation fails. However, this behavior is broken since commit cc57501dee which made hugepage allocation fall back to regular ram in case of faliure. This commit restores the expected behavior for -mem-prealloc. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Message-Id: <20160122091501.75bbd42a@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'numa.c')
-rw-r--r--numa.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/numa.c b/numa.c
index 425ef8dc21..23a5d83024 100644
--- a/numa.c
+++ b/numa.c
@@ -418,12 +418,15 @@ static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner,
Error *err = NULL;
memory_region_init_ram_from_file(mr, owner, name, ram_size, false,
mem_path, &err);
-
- /* Legacy behavior: if allocation failed, fall back to
- * regular RAM allocation.
- */
if (err) {
error_report_err(err);
+ if (mem_prealloc) {
+ exit(1);
+ }
+
+ /* Legacy behavior: if allocation failed, fall back to
+ * regular RAM allocation.
+ */
memory_region_init_ram(mr, owner, name, ram_size, &error_fatal);
}
#else