Skip to content
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.

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

core: virt: initialize heap from virt_guest_created() #7025

Merged
merged 1 commit into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 0 additions & 11 deletions core/arch/arm/kernel/boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -912,17 +912,6 @@ static void update_external_dt(void)
}
#endif /*!CFG_DT*/

#ifdef CFG_NS_VIRTUALIZATION
static TEE_Result virt_init_heap(void)
{
/* We need to initialize pool for every virtual guest partition */
malloc_add_pool(__heap1_start, __heap1_end - __heap1_start);

return TEE_SUCCESS;
}
preinit_early(virt_init_heap);
#endif

void init_tee_runtime(void)
{
#ifndef CFG_WITH_PAGER
Expand Down
1 change: 1 addition & 0 deletions core/arch/arm/kernel/virtualization.c
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ TEE_Result virt_guest_created(uint16_t guest_id)

set_current_prtn(prtn);

malloc_add_pool(__heap1_start, __heap1_end - __heap1_start);
/* Initialize threads */
thread_init_threads();
/* Do the preinitcalls */
Expand Down