Skip to content

Commit

Permalink
init, trivial: allow for relocs to be optional
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
chrisguikema authored and Indanz committed Oct 27, 2023
1 parent c023ba1 commit 1c7d86a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion components/Init/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 1c7d86a

Please sign in to comment.