github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-01-13 11:33:58 +00:00
Code Issues Projects Releases Wiki Activity

HV: modularization: use abi_module struct in acrn boot info

Browse Source 
Use more generic abi_module struct to replace multiboot_module struct in
acrn_boot_info;

Tracked-On: #5661

Signed-off-by: Victor Sun <victor.sun@intel.com>
Reviewed-by: Jason Chen CJ <jason.cj.chen@intel.com>
This commit is contained in:
Victor Sun
2021-06-08 15:17:50 +08:00
committed by wenlingz
parent 16624bab5e
commit c59ea6c250
5 changed files with 70 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
hypervisor/boot/multiboot/multiboot2.c
View File

@@ -37,11 +37,14 @@ static void mb2_mmap_to_abi(struct acrn_boot_info *abi, const struct multiboot2_
static void mb2_mods_to_abi(struct acrn_boot_info *abi,
uint32_t mbi_mod_idx, const struct multiboot2_tag_module *mb2_tag_mods)
{
if (mbi_mod_idx < MAX_MODULE_NUM) {
abi->mi_mods[mbi_mod_idx].mm_mod_start = mb2_tag_mods->mod_start;
abi->mi_mods[mbi_mod_idx].mm_mod_end = mb2_tag_mods->mod_end;
abi->mi_mods[mbi_mod_idx].mm_string = (uint32_t)(uint64_t)mb2_tag_mods->cmdline;
abi->mods[mbi_mod_idx].start = hpa2hva_early((uint64_t)mb2_tag_mods->mod_start);
if (mb2_tag_mods->mod_end > mb2_tag_mods->mod_start) {
abi->mods[mbi_mod_idx].size = mb2_tag_mods->mod_end - mb2_tag_mods->mod_start;
}
(void)strncpy_s((void *)(abi->mods[mbi_mod_idx].string), MAX_MOD_STRING_SIZE,
(char *)hpa2hva_early((uint64_t)mb2_tag_mods->cmdline),
strnlen_s((char *)hpa2hva_early((uint64_t)mb2_tag_mods->cmdline), MAX_MOD_STRING_SIZE));
}
/**
@@ -94,8 +97,10 @@ int32_t multiboot2_to_acrn_bi(struct acrn_boot_info *abi, void *mb2_info)
mb2_mmap_to_abi(abi, (const struct multiboot2_tag_mmap *)mb2_tag);
break;
case MULTIBOOT2_TAG_TYPE_MODULE:
mb2_mods_to_abi(abi, mod_idx, (const struct multiboot2_tag_module *)mb2_tag);
mod_idx++;
if (mod_idx < MAX_MODULE_NUM) {
mb2_mods_to_abi(abi, mod_idx, (const struct multiboot2_tag_module *)mb2_tag);
mod_idx++;
}
break;
case MULTIBOOT2_TAG_TYPE_BOOT_LOADER_NAME:
str = ((struct multiboot2_tag_string *)mb2_tag)->string;
@@ -132,7 +137,7 @@ int32_t multiboot2_to_acrn_bi(struct acrn_boot_info *abi, void *mb2_info)
+ ((mb2_tag->size + (MULTIBOOT2_INFO_ALIGN - 1U)) & ~(MULTIBOOT2_INFO_ALIGN - 1U)));
}
abi->mi_mods_count = mod_idx;
abi->mods_count = mod_idx;
return ret;
}