]> xenbits.xensource.com Git - unikraft/libs/micropython.git/commitdiff
Adapt memory region usage in patch RELEASE-0.12.0 RELEASE-0.13.0 RELEASE-0.13.1 RELEASE-0.14.0
authorMarc Rittinghaus <marc.rittinghaus@unikraft.io>
Sat, 4 Feb 2023 03:23:45 +0000 (04:23 +0100)
committerUnikraft <monkey@unikraft.io>
Sat, 4 Feb 2023 15:10:34 +0000 (15:10 +0000)
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 <marc.rittinghaus@unikraft.io>
Reviewed-by: Razvan Deaconescu <razvand@unikraft.io>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #7

patches/0004-adapt-main-c-to-unikraft.patch

index d924d58b670c0fa6bdd1189fb2837e96ed93f4af..cc73d9d1d22a12db92b399f1e8b3adafcb19e0c3 100644 (file)
 -            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 */