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

hv: coding style: refine set_vcpuid_entries to one exit

Browse Source 
Fix procedure has more than one exit point.

Tracked-On: #861
Signed-off-by: Li, Fei1 <fei1.li@intel.com>
This commit is contained in:
Li, Fei1 2018-12-20 18:35:35 +08:00 committed by wenlingz
parent e218075c69
commit 09634d8215
1 changed files with 101 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
hypervisor/arch/x86/guest/vcpuid.c
View File

@ -190,9 +190,7 @@ int32_t set_vcpuid_entries(struct acrn_vm *vm)
entry.eax = 0x16U; entry.eax = 0x16U;
} }
result = set_vcpuid_entry(vm, &entry); result = set_vcpuid_entry(vm, &entry);
if (result != 0) { if (result == 0) {
return result;
}
limit = entry.eax; limit = entry.eax;
vm->vcpuid_level = limit; vm->vcpuid_level = limit;
@ -209,40 +207,44 @@ int32_t set_vcpuid_entries(struct acrn_vm *vm)
init_vcpuid_entry(i, 0U, CPUID_CHECK_SUBLEAF, &entry); init_vcpuid_entry(i, 0U, CPUID_CHECK_SUBLEAF, &entry);
result = set_vcpuid_entry(vm, &entry); result = set_vcpuid_entry(vm, &entry);
if (result != 0) { if (result == 0) {
return result;
}
times = entry.eax & 0xffUL; times = entry.eax & 0xffUL;
for (j = 1U; j < times; j++) { for (j = 1U; j < times; j++) {
init_vcpuid_entry(i, j, CPUID_CHECK_SUBLEAF, init_vcpuid_entry(i, j, CPUID_CHECK_SUBLEAF, &entry);
&entry);
result = set_vcpuid_entry(vm, &entry); result = set_vcpuid_entry(vm, &entry);
if (result != 0) { if (result != 0) {
return result; /* wants to break out of switch */
break;
}
} }
} }
break; break;
} }
case 0x04U: case 0x04U:
case 0x0dU:
for (j = 0U; ; j++) { for (j = 0U; ; j++) {
if ((i == 0x0dU) && (j == 64U)) { init_vcpuid_entry(i, j, CPUID_CHECK_SUBLEAF, &entry);
if (entry.eax == 0U) {
break; break;
} }
result = set_vcpuid_entry(vm, &entry);
if (result != 0) {
/* wants to break out of switch */
break;
}
}
break;
init_vcpuid_entry(i, j, CPUID_CHECK_SUBLEAF, case 0x0dU:
&entry); for (j = 0U; j < 64U; j++) {
if ((i == 0x04U) && (entry.eax == 0U)) { init_vcpuid_entry(i, j, CPUID_CHECK_SUBLEAF, &entry);
break; if (entry.eax == 0U) {
}
if ((i == 0x0dU) && (entry.eax == 0U)) {
continue; continue;
} }
result = set_vcpuid_entry(vm, &entry); result = set_vcpuid_entry(vm, &entry);
if (result != 0) { if (result != 0) {
return result; /* wants to break out of switch */
break;
} }
} }
break; break;
@ -262,41 +264,47 @@ int32_t set_vcpuid_entries(struct acrn_vm *vm)
init_vcpuid_entry(i, 0U, 0U, &entry); init_vcpuid_entry(i, 0U, 0U, &entry);
result = set_vcpuid_entry(vm, &entry); result = set_vcpuid_entry(vm, &entry);
if (result != 0) { if (result != 0) {
return result; /* break out of switch */
break;
} }
break; break;
} }
/* WARNING: do nothing between break out of switch and before this check */
if (result != 0) {
/* break out of for */
break;
}
} }
if (result == 0) {
init_vcpuid_entry(0x40000000U, 0U, 0U, &entry); init_vcpuid_entry(0x40000000U, 0U, 0U, &entry);
result = set_vcpuid_entry(vm, &entry); result = set_vcpuid_entry(vm, &entry);
if (result != 0) { if (result == 0) {
return result;
}
init_vcpuid_entry(0x40000010U, 0U, 0U, &entry); init_vcpuid_entry(0x40000010U, 0U, 0U, &entry);
result = set_vcpuid_entry(vm, &entry); result = set_vcpuid_entry(vm, &entry);
if (result != 0) {
return result;
} }
if (result == 0) {
init_vcpuid_entry(0x80000000U, 0U, 0U, &entry); init_vcpuid_entry(0x80000000U, 0U, 0U, &entry);
result = set_vcpuid_entry(vm, &entry); result = set_vcpuid_entry(vm, &entry);
if (result != 0) {
return result;
} }
if (result == 0) {
limit = entry.eax; limit = entry.eax;
vm->vcpuid_xlevel = limit; vm->vcpuid_xlevel = limit;
for (i = 0x80000001U; i <= limit; i++) { for (i = 0x80000001U; i <= limit; i++) {
init_vcpuid_entry(i, 0U, 0U, &entry); init_vcpuid_entry(i, 0U, 0U, &entry);
result = set_vcpuid_entry(vm, &entry); result = set_vcpuid_entry(vm, &entry);
if (result != 0) { if (result != 0) {
return result; break;
}
}
}
} }
} }
return 0; return result;
} }
void guest_cpuid(struct acrn_vcpu *vcpu, void guest_cpuid(struct acrn_vcpu *vcpu,