From b38629b85e00385d8ae9ce7800ab68ed87ac85e2 Mon Sep 17 00:00:00 2001 From: Shiqing Gao Date: Mon, 3 Dec 2018 13:29:01 +0800 Subject: [PATCH] hv: fix 'Space missing before or after binary operator' This patch adds the necessary space before or after binary operator. v1 -> v2: * minor fix related to integer [i - 1] ====> [i - 1U] Tracked-On: #861 Signed-off-by: Shiqing Gao --- hypervisor/arch/x86/guest/guest.c | 3 +-- hypervisor/arch/x86/guest/vlapic.c | 6 +++--- hypervisor/arch/x86/trusty.c | 3 +-- hypervisor/arch/x86/vmx.c | 2 +- hypervisor/boot/sbl/abl_seed_parse.c | 2 +- hypervisor/common/vm_load.c | 2 +- hypervisor/include/lib/bits.h | 4 ++-- hypervisor/lib/sprintf.c | 3 +-- hypervisor/lib/string.c | 5 ++--- 9 files changed, 13 insertions(+), 17 deletions(-) diff --git a/hypervisor/arch/x86/guest/guest.c b/hypervisor/arch/x86/guest/guest.c index 5ea81ba27..b81c7a6cc 100644 --- a/hypervisor/arch/x86/guest/guest.c +++ b/hypervisor/arch/x86/guest/guest.c @@ -468,8 +468,7 @@ void init_e820(void) struct multiboot_mmap *mmap = (struct multiboot_mmap *) hpa2hva((uint64_t)mbi->mi_mmap_addr); - e820_entries = mbi->mi_mmap_length/ - sizeof(struct multiboot_mmap); + e820_entries = mbi->mi_mmap_length / sizeof(struct multiboot_mmap); if (e820_entries > E820_MAX_ENTRIES) { pr_err("Too many E820 entries %d\n", e820_entries); diff --git a/hypervisor/arch/x86/guest/vlapic.c b/hypervisor/arch/x86/guest/vlapic.c index 6131277b5..6ca5061f5 100644 --- a/hypervisor/arch/x86/guest/vlapic.c +++ b/hypervisor/arch/x86/guest/vlapic.c @@ -2339,9 +2339,9 @@ apicv_batch_set_tmr(const struct acrn_vlapic *vlapic) e = 256U; while (s < e) { - val = ptr[(s/TMR_STEP_LEN) + 1].v; + val = ptr[(s / TMR_STEP_LEN) + 1].v; val <<= TMR_STEP_LEN; - val |= ptr[s/TMR_STEP_LEN].v; + val |= ptr[s / TMR_STEP_LEN].v; exec_vmwrite64(vmx_eoi_exit(s), val); s += EOI_STEP_LEN; @@ -2393,7 +2393,7 @@ vlapic_apicv_inject_pir(struct acrn_vlapic *vlapic) irr[i * 2U].v |= (uint32_t)val; irr[(i * 2U) + 1U].v |= (uint32_t)(val >> 32U); - pirbase = 64U*i; + pirbase = 64U * i; pirval = val; } } diff --git a/hypervisor/arch/x86/trusty.c b/hypervisor/arch/x86/trusty.c index f02d83402..b5956ad75 100644 --- a/hypervisor/arch/x86/trusty.c +++ b/hypervisor/arch/x86/trusty.c @@ -310,8 +310,7 @@ static inline uint32_t get_max_svn_index(void) uint32_t i, max_svn_idx = 0U; for (i = 1U; i < g_key_info.num_seeds; i++) { - if (g_key_info.dseed_list[i].cse_svn > - g_key_info.dseed_list[i-1].cse_svn) { + if (g_key_info.dseed_list[i].cse_svn > g_key_info.dseed_list[i - 1U].cse_svn) { max_svn_idx = i; } } diff --git a/hypervisor/arch/x86/vmx.c b/hypervisor/arch/x86/vmx.c index ce0053b81..843b280f6 100644 --- a/hypervisor/arch/x86/vmx.c +++ b/hypervisor/arch/x86/vmx.c @@ -802,7 +802,7 @@ static void init_exec_ctrl(struct acrn_vcpu *vcpu) value32 = check_vmx_ctrl(MSR_IA32_VMX_PROCBASED_CTLS, VMX_PROCBASED_CTLS_TSC_OFF | /* VMX_PROCBASED_CTLS_RDTSC | */ - VMX_PROCBASED_CTLS_TPR_SHADOW| + VMX_PROCBASED_CTLS_TPR_SHADOW | VMX_PROCBASED_CTLS_IO_BITMAP | VMX_PROCBASED_CTLS_MSR_BITMAP | VMX_PROCBASED_CTLS_SECONDARY); diff --git a/hypervisor/boot/sbl/abl_seed_parse.c b/hypervisor/boot/sbl/abl_seed_parse.c index 780f521b5..63f83448a 100644 --- a/hypervisor/boot/sbl/abl_seed_parse.c +++ b/hypervisor/boot/sbl/abl_seed_parse.c @@ -22,7 +22,7 @@ struct dev_sec_info { struct abl_seed_info seed_list[ABL_SEED_LIST_MAX]; }; -static const char *dev_sec_info_arg= "dev_sec_info.param_addr="; +static const char *dev_sec_info_arg = "dev_sec_info.param_addr="; static void parse_seed_list_abl(void *param_addr) { diff --git a/hypervisor/common/vm_load.c b/hypervisor/common/vm_load.c index 58759a1e8..9b64eac85 100644 --- a/hypervisor/common/vm_load.c +++ b/hypervisor/common/vm_load.c @@ -50,7 +50,7 @@ static void prepare_bsp_gdt(struct acrn_vm *vm) return; } else { gdt_base_hva = hpa2hva(gdt_base_hpa); - gdt_len = ((size_t)boot_context.gdt.limit + 1U)/sizeof(uint8_t); + gdt_len = ((size_t)boot_context.gdt.limit + 1U) / sizeof(uint8_t); (void )memcpy_s(gdt_base_hva, gdt_len, hpa2hva(boot_context.gdt.base), gdt_len); } diff --git a/hypervisor/include/lib/bits.h b/hypervisor/include/lib/bits.h index 38bc4e524..57f88695a 100644 --- a/hypervisor/include/lib/bits.h +++ b/hypervisor/include/lib/bits.h @@ -235,7 +235,7 @@ build_bitmap_clear(bitmap32_clear_lock, "l", uint32_t, BUS_LOCK) static inline bool bitmap_test(uint16_t nr_arg, const volatile uint64_t *addr) { uint16_t nr; - int32_t ret=0; + int32_t ret = 0; nr = nr_arg & 0x3fU; asm volatile("btq %q2,%1\n\tsbbl %0, %0" : "=r" (ret) @@ -247,7 +247,7 @@ static inline bool bitmap_test(uint16_t nr_arg, const volatile uint64_t *addr) static inline bool bitmap32_test(uint16_t nr_arg, const volatile uint32_t *addr) { uint16_t nr; - int32_t ret=0; + int32_t ret = 0; nr = nr_arg & 0x1fU; asm volatile("btl %2,%1\n\tsbbl %0, %0" : "=r" (ret) diff --git a/hypervisor/lib/sprintf.c b/hypervisor/lib/sprintf.c index f382db47f..8947dc7ec 100644 --- a/hypervisor/lib/sprintf.c +++ b/hypervisor/lib/sprintf.c @@ -267,8 +267,7 @@ static void print_pow2(struct print_param *param, mask = (1UL << shift) - 1UL; /* determine digit translation table */ - digits = ((param->vars.flags & PRINT_FLAG_UPPER) != 0U) ? - &upper_hex_digits : &lower_hex_digits; + digits = ((param->vars.flags & PRINT_FLAG_UPPER) != 0U) ? &upper_hex_digits : &lower_hex_digits; /* apply mask for short/char */ v &= param->vars.mask; diff --git a/hypervisor/lib/string.c b/hypervisor/lib/string.c index bba94ddad..6a1ef1644 100644 --- a/hypervisor/lib/string.c +++ b/hypervisor/lib/string.c @@ -417,8 +417,7 @@ int strncmp(const char *s1_arg, const char *s2_arg, size_t n_arg) * Pointer to the first occurrence of str2 in str1, * or return null if not found. */ -char *strstr_s (const char *str1, size_t maxlen1, - const char *str2, size_t maxlen2) +char *strstr_s(const char *str1, size_t maxlen1, const char *str2, size_t maxlen2) { size_t len1, len2; size_t i; @@ -447,7 +446,7 @@ char *strstr_s (const char *str1, size_t maxlen1, } while (len1 >= len2) { - for (i=0U; i