Skip to content

Commit b38629b

Browse files
shiqinggwenlingz
authored andcommitted
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 <shiqing.gao@intel.com>
1 parent e32b2b4 commit b38629b

File tree

9 files changed

+13
-17
lines changed

9 files changed

+13
-17
lines changed

hypervisor/arch/x86/guest/guest.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,8 +468,7 @@ void init_e820(void)
468468
struct multiboot_mmap *mmap =
469469
(struct multiboot_mmap *)
470470
hpa2hva((uint64_t)mbi->mi_mmap_addr);
471-
e820_entries = mbi->mi_mmap_length/
472-
sizeof(struct multiboot_mmap);
471+
e820_entries = mbi->mi_mmap_length / sizeof(struct multiboot_mmap);
473472
if (e820_entries > E820_MAX_ENTRIES) {
474473
pr_err("Too many E820 entries %d\n",
475474
e820_entries);

hypervisor/arch/x86/guest/vlapic.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2339,9 +2339,9 @@ apicv_batch_set_tmr(const struct acrn_vlapic *vlapic)
23392339
e = 256U;
23402340

23412341
while (s < e) {
2342-
val = ptr[(s/TMR_STEP_LEN) + 1].v;
2342+
val = ptr[(s / TMR_STEP_LEN) + 1].v;
23432343
val <<= TMR_STEP_LEN;
2344-
val |= ptr[s/TMR_STEP_LEN].v;
2344+
val |= ptr[s / TMR_STEP_LEN].v;
23452345
exec_vmwrite64(vmx_eoi_exit(s), val);
23462346

23472347
s += EOI_STEP_LEN;
@@ -2393,7 +2393,7 @@ vlapic_apicv_inject_pir(struct acrn_vlapic *vlapic)
23932393
irr[i * 2U].v |= (uint32_t)val;
23942394
irr[(i * 2U) + 1U].v |= (uint32_t)(val >> 32U);
23952395

2396-
pirbase = 64U*i;
2396+
pirbase = 64U * i;
23972397
pirval = val;
23982398
}
23992399
}

hypervisor/arch/x86/trusty.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,7 @@ static inline uint32_t get_max_svn_index(void)
310310
uint32_t i, max_svn_idx = 0U;
311311

312312
for (i = 1U; i < g_key_info.num_seeds; i++) {
313-
if (g_key_info.dseed_list[i].cse_svn >
314-
g_key_info.dseed_list[i-1].cse_svn) {
313+
if (g_key_info.dseed_list[i].cse_svn > g_key_info.dseed_list[i - 1U].cse_svn) {
315314
max_svn_idx = i;
316315
}
317316
}

hypervisor/arch/x86/vmx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ static void init_exec_ctrl(struct acrn_vcpu *vcpu)
802802
value32 = check_vmx_ctrl(MSR_IA32_VMX_PROCBASED_CTLS,
803803
VMX_PROCBASED_CTLS_TSC_OFF |
804804
/* VMX_PROCBASED_CTLS_RDTSC | */
805-
VMX_PROCBASED_CTLS_TPR_SHADOW|
805+
VMX_PROCBASED_CTLS_TPR_SHADOW |
806806
VMX_PROCBASED_CTLS_IO_BITMAP |
807807
VMX_PROCBASED_CTLS_MSR_BITMAP |
808808
VMX_PROCBASED_CTLS_SECONDARY);

hypervisor/boot/sbl/abl_seed_parse.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ struct dev_sec_info {
2222
struct abl_seed_info seed_list[ABL_SEED_LIST_MAX];
2323
};
2424

25-
static const char *dev_sec_info_arg= "dev_sec_info.param_addr=";
25+
static const char *dev_sec_info_arg = "dev_sec_info.param_addr=";
2626

2727
static void parse_seed_list_abl(void *param_addr)
2828
{

hypervisor/common/vm_load.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static void prepare_bsp_gdt(struct acrn_vm *vm)
5050
return;
5151
} else {
5252
gdt_base_hva = hpa2hva(gdt_base_hpa);
53-
gdt_len = ((size_t)boot_context.gdt.limit + 1U)/sizeof(uint8_t);
53+
gdt_len = ((size_t)boot_context.gdt.limit + 1U) / sizeof(uint8_t);
5454

5555
(void )memcpy_s(gdt_base_hva, gdt_len, hpa2hva(boot_context.gdt.base), gdt_len);
5656
}

hypervisor/include/lib/bits.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ build_bitmap_clear(bitmap32_clear_lock, "l", uint32_t, BUS_LOCK)
235235
static inline bool bitmap_test(uint16_t nr_arg, const volatile uint64_t *addr)
236236
{
237237
uint16_t nr;
238-
int32_t ret=0;
238+
int32_t ret = 0;
239239
nr = nr_arg & 0x3fU;
240240
asm volatile("btq %q2,%1\n\tsbbl %0, %0"
241241
: "=r" (ret)
@@ -247,7 +247,7 @@ static inline bool bitmap_test(uint16_t nr_arg, const volatile uint64_t *addr)
247247
static inline bool bitmap32_test(uint16_t nr_arg, const volatile uint32_t *addr)
248248
{
249249
uint16_t nr;
250-
int32_t ret=0;
250+
int32_t ret = 0;
251251
nr = nr_arg & 0x1fU;
252252
asm volatile("btl %2,%1\n\tsbbl %0, %0"
253253
: "=r" (ret)

hypervisor/lib/sprintf.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,7 @@ static void print_pow2(struct print_param *param,
267267
mask = (1UL << shift) - 1UL;
268268

269269
/* determine digit translation table */
270-
digits = ((param->vars.flags & PRINT_FLAG_UPPER) != 0U) ?
271-
&upper_hex_digits : &lower_hex_digits;
270+
digits = ((param->vars.flags & PRINT_FLAG_UPPER) != 0U) ? &upper_hex_digits : &lower_hex_digits;
272271

273272
/* apply mask for short/char */
274273
v &= param->vars.mask;

hypervisor/lib/string.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -417,8 +417,7 @@ int strncmp(const char *s1_arg, const char *s2_arg, size_t n_arg)
417417
* Pointer to the first occurrence of str2 in str1,
418418
* or return null if not found.
419419
*/
420-
char *strstr_s (const char *str1, size_t maxlen1,
421-
const char *str2, size_t maxlen2)
420+
char *strstr_s(const char *str1, size_t maxlen1, const char *str2, size_t maxlen2)
422421
{
423422
size_t len1, len2;
424423
size_t i;
@@ -447,7 +446,7 @@ char *strstr_s (const char *str1, size_t maxlen1,
447446
}
448447

449448
while (len1 >= len2) {
450-
for (i=0U; i<len2; i++) {
449+
for (i = 0U; i < len2; i++) {
451450
if (str1[i] != str2[i]) {
452451
break;
453452
}

0 commit comments

Comments
 (0)