From 1c7d86abbad3008c46f572d30d0f4a432f91b129 Mon Sep 17 00:00:00 2001 From: Chris Guikema Date: Wed, 25 Oct 2023 16:08:39 -0400 Subject: [PATCH] init, trivial: allow for relocs to be optional Kernel relocations are not needed with 64-bit guest kernels. This commit allows for vm0.kernel_relocs = "" to specify no relocation is needed. Signed-off-by: Chris Guikema --- components/Init/src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Init/src/main.c b/components/Init/src/main.c index 1e726e26..ec76e531 100644 --- a/components/Init/src/main.c +++ b/components/Init/src/main.c @@ -859,7 +859,7 @@ void *main_continued(void *arg) error = vm_ram_find_largest_free_region(&vm, &kernel_load_addr, &kernel_region_size); ZF_LOGF_IF(error, "Unable to find ram region for loading kernel image"); guest_kernel_image_t guest_kernel_image; - guest_kernel_image.kernel_image_arch.is_reloc_enabled = true; + guest_kernel_image.kernel_image_arch.is_reloc_enabled = !(strcmp(kernel_relocs, "") == 0); guest_kernel_image.kernel_image_arch.relocs_file = kernel_relocs; error = vm_load_guest_kernel(&vm, kernel_image, kernel_load_addr, BIT(PAGE_BITS_4M), &guest_kernel_image); ZF_LOGF_IF(error, "Failed to load guest kernel file");