dinosauriel/aos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forge devframe instead of frame for bootinfo

Browse Source
This commit is contained in:
Aurel Feer 2022-04-28 15:06:14 +02:00
parent fb5e35287d
commit 9e35e00500
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/spawn/rpc_server.c
View File

@ -383,11 +383,13 @@ static errval_t serialize_bootinfo(struct bootinfo * bootinfo, struct bootinfo_s
struct capability elf_frame_id; struct capability elf_frame_id;
err = cap_direct_identify(elf_frame_cap, &elf_frame_id); err = cap_direct_identify(elf_frame_cap, &elf_frame_id);
if (err_is_fail(err)) return err; if (err_is_fail(err)) return err_push(err, LIB_ERR_CAP_IDENTIFY);
assert(elf_frame_id.type == ObjType_Frame);
serialized_bootinfo->regions[i].mrmod_frame_base = elf_frame_id.u.frame.base; // debug_printf("[serialize_bootinfo] elf_frame_id.type = %d\n", elf_frame_id.type);
serialized_bootinfo->regions[i].mrmod_frame_bytes = elf_frame_id.u.frame.bytes; assert(elf_frame_id.type == ObjType_DevFrame);
serialized_bootinfo->regions[i].mrmod_frame_base = elf_frame_id.u.devframe.base;
serialized_bootinfo->regions[i].mrmod_frame_bytes = elf_frame_id.u.devframe.bytes;
} }
return SYS_ERR_OK; return SYS_ERR_OK;

4
usr/init/main.c
View File

@ -201,8 +201,7 @@ static errval_t deserialize_bootinfo(struct bootinfo_serialized * serialized, st
.cnode = cnode_module, .cnode = cnode_module,
.slot = serialized->regions[i].mrmod_slot, .slot = serialized->regions[i].mrmod_slot,
}; };
err = devframe_forge(forge_destination, serialized->regions[i].mrmod_frame_base, serialized->regions[i].mrmod_frame_bytes, my_core_id);
err = frame_forge(forge_destination, serialized->regions[i].mrmod_frame_base, serialized->regions[i].mrmod_frame_bytes, my_core_id);
if (err_is_fail(err)) return err; if (err_is_fail(err)) return err;
} }
@ -250,6 +249,7 @@ app_main(int argc, char *argv[]) {
if (err_is_fail(err)) return err; if (err_is_fail(err)) return err;
err = deserialize_bootinfo(bi_ser, &bi); err = deserialize_bootinfo(bi_ser, &bi);
if (err_is_fail(err)) return err; if (err_is_fail(err)) return err;
free(bi_ser);
debug_printf("[app_main]: received bootinfo with %d regions\n", bi->regions_length); debug_printf("[app_main]: received bootinfo with %d regions\n", bi->regions_length);