HV: remove vm_config pointer in acrn_vm struct

For each vm_array[] item, its config is located in corresponding
index of vm_configs[], so vm_config pointer is not needed any more.

Tracked-On: #2291

Signed-off-by: Victor Sun <victor.sun@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Victor Sun
2019-01-21 02:18:05 +08:00
committed by Eddie Dong
parent 7bf9b1be2c
commit 253b25937b
7 changed files with 17 additions and 14 deletions

View File

@@ -21,6 +21,7 @@ int32_t init_vm_boot_info(struct acrn_vm *vm)
{
struct multiboot_module *mods = NULL;
struct multiboot_info *mbi = NULL;
struct acrn_vm_config *vm_config = get_vm_config(vm->vm_id);
int32_t ret = -EINVAL;
if (boot_regs[0] != MULTIBOOT_INFO_MAGIC) {
@@ -48,9 +49,9 @@ int32_t init_vm_boot_info(struct acrn_vm *vm)
vm->sw.kernel_info.kernel_src_addr = hpa2hva((uint64_t)mods[0].mm_mod_start);
vm->sw.kernel_info.kernel_size = mods[0].mm_mod_end - mods[0].mm_mod_start;
vm->sw.kernel_info.kernel_load_addr = (void *)(16 * 1024 * 1024UL);
vm->sw.linux_info.bootargs_src_addr = (void *)vm->vm_config->bootargs;
vm->sw.linux_info.bootargs_size = strnlen_s(vm->vm_config->bootargs, MEM_2K);
vm->sw.linux_info.bootargs_load_addr = (void *)(vm->vm_config->mem_size - 8*1024UL);
vm->sw.linux_info.bootargs_src_addr = (void *)vm_config->bootargs;
vm->sw.linux_info.bootargs_size = strnlen_s(vm_config->bootargs, MEM_2K);
vm->sw.linux_info.bootargs_load_addr = (void *)(vm_config->mem_size - 8*1024UL);
clac();
ret = 0;
}