From aaa568ed9a4913d28aaff6da81a501064091a9f4 Mon Sep 17 00:00:00 2001 From: Victor Sun Date: Tue, 3 Aug 2021 16:23:45 +0800 Subject: [PATCH] HV: vm_load: refine vm_sw_loader API Change if condition to switch in vm_sw_loader() so that the sw loader could be compiled conditionally. Tracked-On: #6323 Signed-off-by: Victor Sun Acked-by: Eddie Dong --- hypervisor/common/vm_load.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hypervisor/common/vm_load.c b/hypervisor/common/vm_load.c index d9e9d8ba7..9e8104997 100644 --- a/hypervisor/common/vm_load.c +++ b/hypervisor/common/vm_load.c @@ -485,20 +485,20 @@ static int32_t vm_rawimage_loader(struct acrn_vm *vm) */ int32_t vm_sw_loader(struct acrn_vm *vm) { - int32_t ret = 0; + int32_t ret = -EINVAL; /* get primary vcpu */ struct acrn_vcpu *vcpu = vcpu_from_vid(vm, BSP_CPU_ID); - if (vm->sw.kernel_type == KERNEL_BZIMAGE) { - + switch (vm->sw.kernel_type) { + case KERNEL_BZIMAGE: ret = vm_bzimage_loader(vm); - - } else if (vm->sw.kernel_type == KERNEL_RAWIMAGE){ - + break; + case KERNEL_RAWIMAGE: ret = vm_rawimage_loader(vm); - - } else { + break; + default: ret = -EINVAL; + break; } if (ret == 0) {