github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 12:42:54 +00:00
Code Issues Projects Releases Wiki Activity

hv: tursty_hypercall: fix "Procedure has more than one exit point"

Browse Source 
Misra C requires Function must have only 1 return entry.
Fixed it by use "if ... else ..." format.

Tracked-On: #861
Signed-off-by: Huihuang Shi <huihuang.shi@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Huihuang Shi 2018-12-26 15:50:59 +08:00 committed by wenlingz
parent 5aa7e29f0b
commit 2d3f510dbe
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
hypervisor/common/trusty_hypercall.c
View File

@ -26,28 +26,26 @@
int32_t hcall_world_switch(struct acrn_vcpu *vcpu) int32_t hcall_world_switch(struct acrn_vcpu *vcpu)
{ {
int32_t next_world_id = !(vcpu->arch.cur_context); int32_t next_world_id = !(vcpu->arch.cur_context);
int32_t ret;
if (next_world_id >= NR_WORLD) { if (next_world_id >= NR_WORLD) {
dev_dbg(ACRN_DBG_TRUSTY_HYCALL, dev_dbg(ACRN_DBG_TRUSTY_HYCALL,
"%s world_id %d exceed max number of Worlds\n", "%s world_id %d exceed max number of Worlds\n",
__func__, next_world_id); __func__, next_world_id);
return -EINVAL; ret = -EINVAL;
} } else if (vcpu->vm->sworld_control.flag.supported == 0UL) {
if (vcpu->vm->sworld_control.flag.supported == 0UL) {
dev_dbg(ACRN_DBG_TRUSTY_HYCALL, dev_dbg(ACRN_DBG_TRUSTY_HYCALL,
"Secure World is not supported!\n"); "Secure World is not supported!\n");
return -EPERM; ret = -EPERM;
} } else if (vcpu->vm->sworld_control.flag.active == 0UL) {
if (vcpu->vm->sworld_control.flag.active == 0UL) {
dev_dbg(ACRN_DBG_TRUSTY_HYCALL, dev_dbg(ACRN_DBG_TRUSTY_HYCALL,
"Trusty is not initialized!\n"); "Trusty is not initialized!\n");
return -EPERM; ret = -EPERM;
} else {
switch_world(vcpu, next_world_id);
ret = 0;
} }
return ret;
switch_world(vcpu, next_world_id);
return 0;
} }
/** /**
@ -103,30 +101,29 @@ int32_t hcall_initialize_trusty(struct acrn_vcpu *vcpu, uint64_t param)
int32_t hcall_save_restore_sworld_ctx(struct acrn_vcpu *vcpu) int32_t hcall_save_restore_sworld_ctx(struct acrn_vcpu *vcpu)
{ {
struct acrn_vm *vm = vcpu->vm; struct acrn_vm *vm = vcpu->vm;
int32_t ret = 0;
if (vm->sworld_control.flag.supported == 0UL) { if (vm->sworld_control.flag.supported == 0UL) {
dev_dbg(ACRN_DBG_TRUSTY_HYCALL, dev_dbg(ACRN_DBG_TRUSTY_HYCALL,
"Secure World is not supported!\n"); "Secure World is not supported!\n");
return -EPERM; ret = -EPERM;
} } else if (!is_vcpu_bsp(vcpu)) {
/* Currently, Secure World is only running on vCPU0 */
/* Currently, Secure World is only running on vCPU0 */
if (!is_vcpu_bsp(vcpu)) {
dev_dbg(ACRN_DBG_TRUSTY_HYCALL, dev_dbg(ACRN_DBG_TRUSTY_HYCALL,
"This hypercall is only allowed from vcpu0!"); "This hypercall is only allowed from vcpu0!");
return -EPERM; ret = -EPERM;
}
if (vm->sworld_control.flag.active != 0UL) {
save_sworld_context(vcpu);
vm->sworld_control.flag.ctx_saved = 1UL;
} else { } else {
if (vm->sworld_control.flag.ctx_saved != 0UL) { if (vm->sworld_control.flag.active != 0UL) {
restore_sworld_context(vcpu); save_sworld_context(vcpu);
vm->sworld_control.flag.ctx_saved = 0UL; vm->sworld_control.flag.ctx_saved = 1UL;
vm->sworld_control.flag.active = 1UL; } else {
if (vm->sworld_control.flag.ctx_saved != 0UL) {
restore_sworld_context(vcpu);
vm->sworld_control.flag.ctx_saved = 0UL;
vm->sworld_control.flag.active = 1UL;
}
} }
} }
return 0; return ret;
} }