From 99c1143779f74132da426facac0752b35b09aee0 Mon Sep 17 00:00:00 2001 From: Marc Rittinghaus Date: Sat, 4 Feb 2023 04:23:45 +0100 Subject: [PATCH] Adapt memory region usage in patch With refactoring the boot code the memory region descriptor needed to be changed. This PR adapts the patch to work with the new version. Signed-off-by: Marc Rittinghaus Reviewed-by: Razvan Deaconescu Approved-by: Razvan Deaconescu Tested-by: Unikraft CI GitHub-Closes: #7 --- patches/0004-adapt-main-c-to-unikraft.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/0004-adapt-main-c-to-unikraft.patch b/patches/0004-adapt-main-c-to-unikraft.patch index d924d58..cc73d9d 100644 --- a/patches/0004-adapt-main-c-to-unikraft.patch +++ b/patches/0004-adapt-main-c-to-unikraft.patch @@ -22,10 +22,10 @@ - ret = execute_from_lexer(LEX_SRC_STDIN, NULL, MP_PARSE_FILE_INPUT, false); - } + /* see if script is available from initrd */ -+ struct ukplat_memregion_desc img; ++ struct ukplat_memregion_desc *img; + char *cstr; + if (ukplat_memregion_find_initrd0(&img) >= 0) { -+ cstr = (char *)img.base; ++ cstr = (char *)img->vbase; + ret = do_str(cstr); + } + /* repl mode */ -- 2.39.5