github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-23 17:58:30 +00:00
Code Issues Projects Releases Wiki Activity

HV: modularization: name change on acrn_multiboot_info

Browse Source 
The acrn_multiboot_info structure stores acrn specific boot info and should
not be limited to support multiboot protocol related structure only.

This patch only do below changes:

	1. change name of acrn_multiboot_info to acrn_boot_info;
	2. change name of mbi to abi because of the change in 1, also the
	   naming might bring confusion with native multiboot 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-05-21 11:12:24 +08:00
committed by wenlingz
parent b0e1d610d2
commit 8f24d91108
11 changed files with 128 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hypervisor/arch/x86/e820.c
View File

@@ -103,13 +103,13 @@ void init_e820(void)
uint32_t i;
uint64_t top_addr_space = CONFIG_PLATFORM_RAM_SIZE + PLATFORM_LO_MMIO_SIZE;
struct acrn_multiboot_info *mbi = get_acrn_multiboot_info();
struct multiboot_mmap *mmap = mbi->mi_mmap_entry;
struct acrn_boot_info *abi = get_acrn_boot_info();
struct multiboot_mmap *mmap = abi->mi_mmap_entry;
hv_e820_entries_nr = mbi->mi_mmap_entries;
hv_e820_entries_nr = abi->mi_mmap_entries;
dev_dbg(DBG_LEVEL_E820, "mmap addr 0x%x entries %d\n",
mbi->mi_mmap_entry, hv_e820_entries_nr);
abi->mi_mmap_entry, hv_e820_entries_nr);
for (i = 0U; i < hv_e820_entries_nr; i++) {

4
hypervisor/arch/x86/init.c
View File

@@ -91,11 +91,11 @@ void init_primary_pcpu(void)
/* Clear BSS */
(void)memset(&ld_bss_start, 0U, (size_t)(&ld_bss_end - &ld_bss_start));
init_acrn_multiboot_info(boot_regs[0], boot_regs[1]);
init_acrn_boot_info(boot_regs[0], boot_regs[1]);
init_debug_pre();
if (sanitize_acrn_multiboot_info(boot_regs[0], boot_regs[1]) != 0) {
if (sanitize_acrn_boot_info(boot_regs[0], boot_regs[1]) != 0) {
panic("Multiboot info error!");
}

6
hypervisor/arch/x86/seed/seed.c
View File

@@ -41,12 +41,12 @@ static uint32_t parse_seed_arg(void)
{
const char *cmd_src = NULL;
char *arg, *arg_end;
struct acrn_multiboot_info *mbi = get_acrn_multiboot_info();
struct acrn_boot_info *abi = get_acrn_boot_info();
uint32_t i = SEED_ARG_NUM - 1U;
uint32_t len;
if ((mbi->mi_flags & MULTIBOOT_INFO_HAS_CMDLINE) != 0U) {
cmd_src = mbi->mi_cmdline;
if ((abi->mi_flags & MULTIBOOT_INFO_HAS_CMDLINE) != 0U) {
cmd_src = abi->mi_cmdline;
}
if (cmd_src != NULL) {