From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34017) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMcoy-0000UU-0v for qemu-devel@nongnu.org; Fri, 22 Jan 2016 09:36:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMcov-0005cy-2y for qemu-devel@nongnu.org; Fri, 22 Jan 2016 09:36:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41759) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMcou-0005cj-Td for qemu-devel@nongnu.org; Fri, 22 Jan 2016 09:36:13 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 1A49DBAEDC for ; Fri, 22 Jan 2016 14:36:12 +0000 (UTC) Date: Fri, 22 Jan 2016 09:15:01 -0500 From: Luiz Capitulino Message-ID: <20160122091501.75bbd42a@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] memory: exit when hugepage allocation fails if mem-prealloc List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: imammedo@redhat.com Cc: pbonzini@redhat.com, armbru@redhat.com, qemu-devel 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 --- numa.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/numa.c b/numa.c index 425ef8d..0e1638d 100644 --- a/numa.c +++ b/numa.c @@ -418,12 +418,13 @@ 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 -- 2.1.0