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

HV: remove multiple return statement in get_vcpu_paging_mode() routine

Browse Source 
To meet MISRA, remove multiple return in get_vcpu_paging_mode() routine.

Tracked-On: #861
Signed-off-by: Chaohong guo <chaohong.guo@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Chaohong guo 2018-12-20 12:22:31 +08:00 committed by wenlingz
parent b4b9ac593a
commit 63eecf084e
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hypervisor/arch/x86/guest/guest.c
View File

@ -47,23 +47,26 @@ uint64_t vcpumask2pcpumask(struct acrn_vm *vm, uint64_t vdmask)
enum vm_paging_mode get_vcpu_paging_mode(struct acrn_vcpu *vcpu)
{
enum vm_cpu_mode cpu_mode;
enum vm_paging_mode ret;
cpu_mode = get_vcpu_mode(vcpu);
if (cpu_mode == CPU_MODE_REAL) {
return PAGING_MODE_0_LEVEL;
}
else if (cpu_mode == CPU_MODE_PROTECTED) {
ret = PAGING_MODE_0_LEVEL;
} else if (cpu_mode == CPU_MODE_PROTECTED) {
if (is_pae(vcpu)) {
return PAGING_MODE_3_LEVEL;
ret = PAGING_MODE_3_LEVEL;
} else if (is_paging_enabled(vcpu)) {
ret = PAGING_MODE_2_LEVEL;
} else {
ret = PAGING_MODE_0_LEVEL;
}
else if (is_paging_enabled(vcpu)) {
return PAGING_MODE_2_LEVEL;
}
return PAGING_MODE_0_LEVEL;
} else { /* compatibility or 64bit mode */
return PAGING_MODE_4_LEVEL;
ret = PAGING_MODE_4_LEVEL;
}
return ret;
}
/* TODO: Add code to check for Revserved bits, SMAP and PKE when do translation