OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

HV: Remove 'vm_' of vm_elf_loader and etc. 

In order to make better sense, vm_elf_loader, vm_bzimage_loader and
vm_rawimage_loader are changed to elf_loaer, bzimage_loaer and
rawimage_loader.

Tracked-On: #6323

Signed-off-by: Zhou, Wu <wu.zhou@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Zhou, Wu 2021-08-10 15:58:41 +08:00 committed by wenlingz
parent 897442bc3e
commit c7a0562cf9
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hypervisor/boot/guest/bzimage_loader.c
View File

@ -402,7 +402,7 @@ static void load_bzimage(struct acrn_vm *vm, struct acrn_vcpu *vcpu,
__func__, vm->vm_id, vcpu_get_gpreg(vcpu, CPU_REG_RSI));
}
int32_t vm_bzimage_loader(struct acrn_vm *vm)
int32_t bzimage_loader(struct acrn_vm *vm)
{
int32_t ret = -ENOMEM;
/* get primary vcpu */

2
hypervisor/boot/guest/rawimage_loader.c
View File

@ -25,7 +25,7 @@ static void load_rawimage(struct acrn_vm *vm)
sw_kernel->kernel_entry_addr = (void *)vm_config->os_config.kernel_entry_addr;
}
int32_t vm_rawimage_loader(struct acrn_vm *vm)
int32_t rawimage_loader(struct acrn_vm *vm)
{
int32_t ret = 0;
uint64_t vgdt_gpa = 0x800;

4
hypervisor/boot/include/guest/vboot.h
View File

@ -12,10 +12,10 @@ int32_t init_vm_boot_info(struct acrn_vm *vm);
void load_sw_module(struct acrn_vm *vm, struct sw_module_info *sw_module);
#ifdef CONFIG_GUEST_KERNEL_BZIMAGE
int32_t vm_bzimage_loader(struct acrn_vm *vm);
int32_t bzimage_loader(struct acrn_vm *vm);
#endif
#ifdef CONFIG_GUEST_KERNEL_RAWIMAGE
int32_t vm_rawimage_loader(struct acrn_vm *vm);
int32_t rawimage_loader(struct acrn_vm *vm);
#endif

4
hypervisor/common/vm_load.c
View File

@ -32,12 +32,12 @@ int32_t prepare_os_image(struct acrn_vm *vm)
switch (vm->sw.kernel_type) {
#ifdef CONFIG_GUEST_KERNEL_BZIMAGE
case KERNEL_BZIMAGE:
ret = vm_bzimage_loader(vm);
ret = bzimage_loader(vm);
break;
#endif
#ifdef CONFIG_GUEST_KERNEL_RAWIMAGE
case KERNEL_RAWIMAGE:
ret = vm_rawimage_loader(vm);
ret = rawimage_loader(vm);
break;
#endif
default: