github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-05 02:40:37 +00:00
Code Issues Projects Releases Wiki Activity

hv: coding style: refine initialize_trusty to one exit

Browse Source 
1) Move data copy out of initialize_trusty
2) Fix procedure has more than one exit point

Tracked-On: #2120
Signed-off-by: Li, Fei1 <fei1.li@intel.com>
This commit is contained in:
Li, Fei1
2018-12-19 23:41:29 +08:00
committed by Eddie Dong
parent 8a55f03823
commit 1dca17cd29
3 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hypervisor/common/trusty_hypercall.c
View File

@@ -67,6 +67,7 @@ int32_t hcall_world_switch(struct acrn_vcpu *vcpu)
int32_t hcall_initialize_trusty(struct acrn_vcpu *vcpu, uint64_t param)
{
int32_t ret = 0;
struct trusty_boot_param boot_param;
if (vcpu->vm->sworld_control.flag.supported == 0UL) {
pr_err("Secure World is not supported!\n");
@@ -78,7 +79,11 @@ int32_t hcall_initialize_trusty(struct acrn_vcpu *vcpu, uint64_t param)
pr_err("%s, must initialize Trusty from Normal World!\n", __func__);
ret = -EPERM;
} else {
if (!initialize_trusty(vcpu, param)) {
(void)memset(&boot_param, 0U, sizeof(boot_param));
if (copy_from_gpa(vcpu->vm, &boot_param, param, sizeof(boot_param)) != 0) {
pr_err("%s: Unable to copy trusty_boot_param\n", __func__);
ret = -EFAULT;
} else if (!initialize_trusty(vcpu, &boot_param)) {
ret = -ENODEV;
} else {
vcpu->vm->sworld_control.flag.active = 1UL;