Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Dec 2018 23:20:58 +0000 (UTC)
From:      Rebecca Cran <bcran@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r342054 - head/stand/efi/loader
Message-ID:  <201812132320.wBDNKwQ7000647@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bcran
Date: Thu Dec 13 23:20:58 2018
New Revision: 342054
URL: https://svnweb.freebsd.org/changeset/base/342054

Log:
  Print an error message in efi_main.c if we can't allocate memory for the heap
  
  With the default Qemu parameters, only 128MB RAM gets given to a VM. This causes
  the loader to be unable to allocate the 64MB it needs for the heap. This change
  makes the cause of the error more obvious.
  
  Differential Revision:	https://reviews.freebsd.org/D17958

Modified:
  head/stand/efi/loader/efi_main.c

Modified: head/stand/efi/loader/efi_main.c
==============================================================================
--- head/stand/efi/loader/efi_main.c	Thu Dec 13 20:09:38 2018	(r342053)
+++ head/stand/efi/loader/efi_main.c	Thu Dec 13 23:20:58 2018	(r342054)
@@ -94,8 +94,10 @@ efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *sy
 	heapsize = 64 * 1024 * 1024;
 	status = BS->AllocatePages(AllocateAnyPages, EfiLoaderData,
 	    EFI_SIZE_TO_PAGES(heapsize), &heap);
-	if (status != EFI_SUCCESS)
+	if (status != EFI_SUCCESS) {
+		ST->ConOut->OutputString(ST->ConOut, L"Failed to allocate memory for heap.\r\n");
 		BS->Exit(IH, status, 0, NULL);
+	}
 
 	setheap((void *)(uintptr_t)heap, (void *)(uintptr_t)(heap + heapsize));
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812132320.wBDNKwQ7000647>