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

hv: add brackets to make operator expression more readable

Browse Source 
v1-v2:
Bypass this case:
When binary arithmetic operators of different precedence (e.g. '+'
and '*') are mixed in an expression, parentheses are added to the
sub-expressions using the operator with a higher precedence.

v1:
The operator precedence rules are complicated and it is easy to make a mistake.
So add brackets to make operator expression more readable.

Tracked-On: #861
Signed-off-by: Li, Fei1 <fei1.li@intel.com>
This commit is contained in:
Li, Fei1 2018-11-27 23:46:46 +08:00 committed by lijinxia
parent aefe9168d1
commit a1ac585b85
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hypervisor/arch/x86/io.c
View File

@ -259,9 +259,9 @@ hv_emulate_mmio(struct acrn_vcpu *vcpu, struct io_request *io_req)
base = mmio_handler->range_start;
end = mmio_handler->range_end;
if ((address + size <= base) || (address >= end)) {
if (((address + size) <= base) || (address >= end)) {
continue;
} else if (!((address >= base) && (address + size <= end))) {
} else if (!((address >= base) && ((address + size) <= end))) {
pr_fatal("Err MMIO, address:0x%llx, size:%x", address, size);
return -EIO;
} else {

2
hypervisor/arch/x86/trusty.c
View File

@ -118,7 +118,7 @@ static void create_secure_world_ept(struct acrn_vm *vm, uint64_t gpa_orig,
*/
dest_pdpte_p = pml4e_page_vaddr(sworld_pml4e);
src_pdpte_p = pml4e_page_vaddr(nworld_pml4e);
for (i = 0U; i < PTRS_PER_PDPTE - 1; i++) {
for (i = 0U; i < (PTRS_PER_PDPTE - 1UL); i++) {
pdpte = get_pgentry(src_pdpte_p);
if ((pdpte & table_present) != 0UL) {
pdpte &= ~EPT_EXE;

4
hypervisor/common/hypercall.c
View File

@ -652,9 +652,9 @@ static int32_t write_protect_page(struct acrn_vm *vm,const struct wp_data *wp)
vm->vm_id, wp->gpa, hpa);
base_paddr = get_hv_image_base();
if (((hpa <= base_paddr) && (hpa + CPU_PAGE_SIZE > base_paddr)) ||
if (((hpa <= base_paddr) && ((hpa + CPU_PAGE_SIZE) > base_paddr)) ||
((hpa >= base_paddr) &&
(hpa < base_paddr + CONFIG_HV_RAM_SIZE))) {
(hpa < (base_paddr + CONFIG_HV_RAM_SIZE)))) {
pr_err("%s: overlap the HV memory region.", __func__);
return -EINVAL;
}

6
hypervisor/debug/profiling.c
View File

@ -278,7 +278,7 @@ static int profiling_sbuf_put_variable(struct shared_buf *sbuf,
/* 2nd part */
to = (void *)sbuf + SBUF_HEAD_SIZE;
if (size - offset > 0U) {
if ((size - offset) > 0U) {
(void)memcpy_s(to, size - offset,
data + offset, size - offset);
}
@ -372,12 +372,12 @@ static int profiling_generate_data(int32_t collector, uint32_t type)
return 0;
}
for (i = 0U; i < ((DATA_HEADER_SIZE - 1U) / SEP_BUF_ENTRY_SIZE + 1U); i++) {
for (i = 0U; i < (((DATA_HEADER_SIZE - 1U) / SEP_BUF_ENTRY_SIZE) + 1U); i++) {
(void)sbuf_put((struct shared_buf *)sbuf,
(uint8_t *)&pkt_header + i * SEP_BUF_ENTRY_SIZE);
}
for (i = 0U; i < ((payload_size - 1U) / SEP_BUF_ENTRY_SIZE + 1U); i++) {
for (i = 0U; i < (((payload_size - 1U) / SEP_BUF_ENTRY_SIZE) + 1U); i++) {
(void)sbuf_put((struct shared_buf *)sbuf,
(uint8_t *)payload + i * SEP_BUF_ENTRY_SIZE);
}

2
hypervisor/lib/crypto/mbedtls/hkdf.c
View File

@ -167,7 +167,7 @@ int mbedtls_hkdf_expand( const mbedtls_md_info_t *md, const unsigned char *prk,
goto exit;
}
num_to_copy = i != n ? hash_len : okm_len - where;
num_to_copy = (i != n) ? hash_len : (okm_len - where);
memcpy_s( okm + where, num_to_copy, t, num_to_copy );
where += hash_len;
t_len = hash_len;

2
hypervisor/lib/sprintf.c
View File

@ -567,7 +567,7 @@ charmem(size_t cmd, const char *s_arg, uint32_t sz, struct snprint_param *param)
}
/* fill mode */
else {
n = (sz < param->sz - param->wrtn) ? sz : 0U;
n = (sz < (param->sz - param->wrtn)) ? sz : 0U;
param->wrtn += sz;
(void)memset(p, (uint8_t)*s, n);
}