From: Luiz Capitulino <lcapitulino@redhat.com>
Date: Fri, 22 Jan 2016 14:15:01 +0000 (-0500)
Subject: memory: exit when hugepage allocation fails if mem-prealloc
X-Git-Tag: v2.6.0-rc0~202^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fae947b096020e5004ec7ae106a95a69a5e4d929;p=thirdparty%2Fqemu.git

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>
---

diff --git a/numa.c b/numa.c
index 425ef8dc214..23a5d830243 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