Skip to content

libsel4vmmplatsupport: use vm->entry for zImage also #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
axel-h wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −8
Open

libsel4vmmplatsupport: use vm->entry for zImage also #94

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67b979b
libsel4vmmplatsupport: inline function
Mar 21, 2023
1db3074
libsel4vmmplatsupport: use vm->entry
Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions libsel4vmmplatsupport/src/arch/arm/guest_image.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,6 @@ static enum img_type image_get_type(void *file)
}
}

static uintptr_t zImage_get_load_address(void *file, uintptr_t ram_base)
{
struct zimage_hdr *hdr;
hdr = (struct zimage_hdr *)file;
return (hdr->start != 0) ? hdr->start : (ram_base + 0x8000);
}

static int get_guest_image_type(const char *image_name, enum img_type *image_type, Elf64_Ehdr *header)
{
int fd;
Expand Down Expand Up @@ -199,7 +192,11 @@ static uintptr_t load_guest_kernel_image(vm_t *vm, const char *kernel_image_name
load_addr = vm->entry;
break;
case IMG_ZIMAGE:
load_addr = zImage_get_load_address(&header, load_base_addr);
/* zImage is used for 32-bit Linux kernels only. */
load_addr = ((struct zimage_hdr *)(&header))->start;
if (0 == load_addr) {
load_addr = vm->entry;
}
break;
default:
ZF_LOGE("Error: Unknown kernel image format for '%s'", kernel_image_name);
Expand Down