From 8100b1dd560865b9a03423026f521de7693a5bf2 Mon Sep 17 00:00:00 2001 From: "Zhou, Wu" Date: Tue, 10 Aug 2021 15:58:41 +0800 Subject: [PATCH] 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 Acked-by: Eddie Dong --- hypervisor/boot/guest/bzimage_loader.c | 2 +- hypervisor/boot/guest/rawimage_loader.c | 2 +- hypervisor/boot/include/guest/vboot.h | 4 ++-- hypervisor/common/vm_load.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hypervisor/boot/guest/bzimage_loader.c b/hypervisor/boot/guest/bzimage_loader.c index f84958a92..56f03af5e 100644 --- a/hypervisor/boot/guest/bzimage_loader.c +++ b/hypervisor/boot/guest/bzimage_loader.c @@ -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 */ diff --git a/hypervisor/boot/guest/rawimage_loader.c b/hypervisor/boot/guest/rawimage_loader.c index 46d3fcd9a..b8c865efe 100644 --- a/hypervisor/boot/guest/rawimage_loader.c +++ b/hypervisor/boot/guest/rawimage_loader.c @@ -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; diff --git a/hypervisor/boot/include/guest/vboot.h b/hypervisor/boot/include/guest/vboot.h index c696265f6..960ee474e 100644 --- a/hypervisor/boot/include/guest/vboot.h +++ b/hypervisor/boot/include/guest/vboot.h @@ -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 diff --git a/hypervisor/common/vm_load.c b/hypervisor/common/vm_load.c index 7aab36037..a2c480bbb 100644 --- a/hypervisor/common/vm_load.c +++ b/hypervisor/common/vm_load.c @@ -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: