mirror of
https://github.com/projectacrn/acrn-hypervisor.git
synced 2025-06-22 21:47:22 +00:00
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>
This commit is contained in:
parent
e32b2b4c11
commit
b38629b85e
@ -468,8 +468,7 @@ void init_e820(void)
|
|||||||
struct multiboot_mmap *mmap =
|
struct multiboot_mmap *mmap =
|
||||||
(struct multiboot_mmap *)
|
(struct multiboot_mmap *)
|
||||||
hpa2hva((uint64_t)mbi->mi_mmap_addr);
|
hpa2hva((uint64_t)mbi->mi_mmap_addr);
|
||||||
e820_entries = mbi->mi_mmap_length/
|
e820_entries = mbi->mi_mmap_length / sizeof(struct multiboot_mmap);
|
||||||
sizeof(struct multiboot_mmap);
|
|
||||||
if (e820_entries > E820_MAX_ENTRIES) {
|
if (e820_entries > E820_MAX_ENTRIES) {
|
||||||
pr_err("Too many E820 entries %d\n",
|
pr_err("Too many E820 entries %d\n",
|
||||||
e820_entries);
|
e820_entries);
|
||||||
|
@ -2339,9 +2339,9 @@ apicv_batch_set_tmr(const struct acrn_vlapic *vlapic)
|
|||||||
e = 256U;
|
e = 256U;
|
||||||
|
|
||||||
while (s < e) {
|
while (s < e) {
|
||||||
val = ptr[(s/TMR_STEP_LEN) + 1].v;
|
val = ptr[(s / TMR_STEP_LEN) + 1].v;
|
||||||
val <<= TMR_STEP_LEN;
|
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);
|
exec_vmwrite64(vmx_eoi_exit(s), val);
|
||||||
|
|
||||||
s += EOI_STEP_LEN;
|
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].v |= (uint32_t)val;
|
||||||
irr[(i * 2U) + 1U].v |= (uint32_t)(val >> 32U);
|
irr[(i * 2U) + 1U].v |= (uint32_t)(val >> 32U);
|
||||||
|
|
||||||
pirbase = 64U*i;
|
pirbase = 64U * i;
|
||||||
pirval = val;
|
pirval = val;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -310,8 +310,7 @@ static inline uint32_t get_max_svn_index(void)
|
|||||||
uint32_t i, max_svn_idx = 0U;
|
uint32_t i, max_svn_idx = 0U;
|
||||||
|
|
||||||
for (i = 1U; i < g_key_info.num_seeds; i++) {
|
for (i = 1U; i < g_key_info.num_seeds; i++) {
|
||||||
if (g_key_info.dseed_list[i].cse_svn >
|
if (g_key_info.dseed_list[i].cse_svn > g_key_info.dseed_list[i - 1U].cse_svn) {
|
||||||
g_key_info.dseed_list[i-1].cse_svn) {
|
|
||||||
max_svn_idx = i;
|
max_svn_idx = i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -802,7 +802,7 @@ static void init_exec_ctrl(struct acrn_vcpu *vcpu)
|
|||||||
value32 = check_vmx_ctrl(MSR_IA32_VMX_PROCBASED_CTLS,
|
value32 = check_vmx_ctrl(MSR_IA32_VMX_PROCBASED_CTLS,
|
||||||
VMX_PROCBASED_CTLS_TSC_OFF |
|
VMX_PROCBASED_CTLS_TSC_OFF |
|
||||||
/* VMX_PROCBASED_CTLS_RDTSC | */
|
/* VMX_PROCBASED_CTLS_RDTSC | */
|
||||||
VMX_PROCBASED_CTLS_TPR_SHADOW|
|
VMX_PROCBASED_CTLS_TPR_SHADOW |
|
||||||
VMX_PROCBASED_CTLS_IO_BITMAP |
|
VMX_PROCBASED_CTLS_IO_BITMAP |
|
||||||
VMX_PROCBASED_CTLS_MSR_BITMAP |
|
VMX_PROCBASED_CTLS_MSR_BITMAP |
|
||||||
VMX_PROCBASED_CTLS_SECONDARY);
|
VMX_PROCBASED_CTLS_SECONDARY);
|
||||||
|
@ -22,7 +22,7 @@ struct dev_sec_info {
|
|||||||
struct abl_seed_info seed_list[ABL_SEED_LIST_MAX];
|
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)
|
static void parse_seed_list_abl(void *param_addr)
|
||||||
{
|
{
|
||||||
|
@ -50,7 +50,7 @@ static void prepare_bsp_gdt(struct acrn_vm *vm)
|
|||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
gdt_base_hva = hpa2hva(gdt_base_hpa);
|
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);
|
(void )memcpy_s(gdt_base_hva, gdt_len, hpa2hva(boot_context.gdt.base), gdt_len);
|
||||||
}
|
}
|
||||||
|
@ -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)
|
static inline bool bitmap_test(uint16_t nr_arg, const volatile uint64_t *addr)
|
||||||
{
|
{
|
||||||
uint16_t nr;
|
uint16_t nr;
|
||||||
int32_t ret=0;
|
int32_t ret = 0;
|
||||||
nr = nr_arg & 0x3fU;
|
nr = nr_arg & 0x3fU;
|
||||||
asm volatile("btq %q2,%1\n\tsbbl %0, %0"
|
asm volatile("btq %q2,%1\n\tsbbl %0, %0"
|
||||||
: "=r" (ret)
|
: "=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)
|
static inline bool bitmap32_test(uint16_t nr_arg, const volatile uint32_t *addr)
|
||||||
{
|
{
|
||||||
uint16_t nr;
|
uint16_t nr;
|
||||||
int32_t ret=0;
|
int32_t ret = 0;
|
||||||
nr = nr_arg & 0x1fU;
|
nr = nr_arg & 0x1fU;
|
||||||
asm volatile("btl %2,%1\n\tsbbl %0, %0"
|
asm volatile("btl %2,%1\n\tsbbl %0, %0"
|
||||||
: "=r" (ret)
|
: "=r" (ret)
|
||||||
|
@ -267,8 +267,7 @@ static void print_pow2(struct print_param *param,
|
|||||||
mask = (1UL << shift) - 1UL;
|
mask = (1UL << shift) - 1UL;
|
||||||
|
|
||||||
/* determine digit translation table */
|
/* determine digit translation table */
|
||||||
digits = ((param->vars.flags & PRINT_FLAG_UPPER) != 0U) ?
|
digits = ((param->vars.flags & PRINT_FLAG_UPPER) != 0U) ? &upper_hex_digits : &lower_hex_digits;
|
||||||
&upper_hex_digits : &lower_hex_digits;
|
|
||||||
|
|
||||||
/* apply mask for short/char */
|
/* apply mask for short/char */
|
||||||
v &= param->vars.mask;
|
v &= param->vars.mask;
|
||||||
|
@ -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,
|
* Pointer to the first occurrence of str2 in str1,
|
||||||
* or return null if not found.
|
* or return null if not found.
|
||||||
*/
|
*/
|
||||||
char *strstr_s (const char *str1, size_t maxlen1,
|
char *strstr_s(const char *str1, size_t maxlen1, const char *str2, size_t maxlen2)
|
||||||
const char *str2, size_t maxlen2)
|
|
||||||
{
|
{
|
||||||
size_t len1, len2;
|
size_t len1, len2;
|
||||||
size_t i;
|
size_t i;
|
||||||
@ -447,7 +446,7 @@ char *strstr_s (const char *str1, size_t maxlen1,
|
|||||||
}
|
}
|
||||||
|
|
||||||
while (len1 >= len2) {
|
while (len1 >= len2) {
|
||||||
for (i=0U; i<len2; i++) {
|
for (i = 0U; i < len2; i++) {
|
||||||
if (str1[i] != str2[i]) {
|
if (str1[i] != str2[i]) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user