HV: Fix missing brackets for MISRA C Violations

Patch 5 of 7
Added changes to make sure Misra C violations are fixed
for rules 11S and 12S.

Signed-off-by: Arindam Roy <arindam.roy@intel.com>

Author: rarindam

hypervisor/arch/x86/softirq.c

@@ -47,22 +47,25 @@ void exec_softirq(void)
 	if (cpu_id >= phys_cpu_num)
 		return;
 
-	if (((*bitmap) & SOFTIRQ_MASK) == 0UL)
+	if (((*bitmap) & SOFTIRQ_MASK) == 0UL) {
 		return;
+	}
 
 	/* Disable softirq
 	 * SOFTIRQ_ATOMIC bit = 0 means softirq already in execution
 	 */
-	if (!bitmap_test_and_clear(SOFTIRQ_ATOMIC, bitmap))
+	if (!bitmap_test_and_clear(SOFTIRQ_ATOMIC, bitmap)) {
 		return;
+	}
 
 again:
 	CPU_IRQ_ENABLE();
 
 	while (1) {
 		softirq_id = ffs64(*bitmap);
-		if ((softirq_id == INVALID_BIT_INDEX) || (softirq_id >= SOFTIRQ_MAX))
+		if ((softirq_id == INVALID_BIT_INDEX) || (softirq_id >= SOFTIRQ_MAX)) {
 			break;
+		}
 
 		bitmap_clear(softirq_id, bitmap);
 
@@ -81,8 +84,9 @@ void exec_softirq(void)
 
 	CPU_IRQ_DISABLE();
 
-	if (((*bitmap) & SOFTIRQ_MASK) != 0U)
+	if (((*bitmap) & SOFTIRQ_MASK) != 0U) {
 		goto again;
+	}
 
 	enable_softirq(cpu_id);
 }

hypervisor/arch/x86/timer.c

@@ -16,8 +16,9 @@ uint32_t tsc_khz = 0U;
 static void run_timer(struct timer *timer)
 {
 	/* deadline = 0 means stop timer, we should skip */
-	if ((timer->func != NULL) && timer->fire_tsc != 0UL)
+	if ((timer->func != NULL) && timer->fire_tsc != 0UL) {
 		timer->func(timer->priv_data);
+	}
 
 	TRACE_2L(TRACE_TIMER_ACTION_PCKUP, timer->fire_tsc, 0);
 }
@@ -54,17 +55,20 @@ static void __add_timer(struct per_cpu_timers *cpu_timer,
 	prev = &cpu_timer->timer_list;
 	list_for_each(pos, &cpu_timer->timer_list) {
 		tmp = list_entry(pos, struct timer, node);
-		if (tmp->fire_tsc < tsc)
+		if (tmp->fire_tsc < tsc) {
 			prev = &tmp->node;
-		else
+		}
+		else {
 			break;
+		}
 	}
 
 	list_add(&timer->node, prev);
 
-	if (need_update != NULL)
+	if (need_update != NULL) {
 		/* update the physical timer if we're on the timer_list head */
 		*need_update = (prev == &cpu_timer->timer_list);
+	}
 }
 
 int add_timer(struct timer *timer)
@@ -73,20 +77,23 @@ int add_timer(struct timer *timer)
 	uint16_t pcpu_id;
 	bool need_update;
 
-	if (timer == NULL || timer->func == NULL || timer->fire_tsc == 0UL)
+	if (timer == NULL || timer->func == NULL || timer->fire_tsc == 0UL) {
 		return -EINVAL;
+	}
 
 	/* limit minimal periodic timer cycle period */
-	if (timer->mode == TICK_MODE_PERIODIC)
+	if (timer->mode == TICK_MODE_PERIODIC) {
 		timer->period_in_cycle = max(timer->period_in_cycle,
 				us_to_ticks(MIN_TIMER_PERIOD_US));
+	}
 
 	pcpu_id  = get_cpu_id();
 	cpu_timer = &per_cpu(cpu_timers, pcpu_id);
 	__add_timer(cpu_timer, timer, &need_update);
 
-	if (need_update)
+	if (need_update) {
 		update_physical_timer(cpu_timer);
+	}
 
 	TRACE_2L(TRACE_TIMER_ACTION_ADDED, timer->fire_tsc, 0);
 	return 0;
@@ -95,8 +102,9 @@ int add_timer(struct timer *timer)
 
 void del_timer(struct timer *timer)
 {
-	if ((timer != NULL) && !list_empty(&timer->node))
+	if ((timer != NULL) && !list_empty(&timer->node)) {
 		list_del_init(&timer->node);
+	}
 }
 
 static int request_timer_irq(uint16_t pcpu_id,
@@ -105,8 +113,9 @@ static int request_timer_irq(uint16_t pcpu_id,
 {
 	struct dev_handler_node *node = NULL;
 
-	if (pcpu_id >= phys_cpu_num)
+	if (pcpu_id >= phys_cpu_num) {
 		return -EINVAL;
+	}
 
 	if (per_cpu(timer_node, pcpu_id) != NULL) {
 		pr_err("CPU%d timer isr already added", pcpu_id);
@@ -165,8 +174,9 @@ void timer_cleanup(void)
 {
 	uint16_t pcpu_id = get_cpu_id();
 
-	if (per_cpu(timer_node, pcpu_id) != NULL)
+	if (per_cpu(timer_node, pcpu_id) != NULL) {
 		unregister_handler_common(per_cpu(timer_node, pcpu_id));
+	}
 
 	per_cpu(timer_node, pcpu_id) = NULL;
 }
@@ -202,8 +212,9 @@ void timer_softirq(uint16_t pcpu_id)
 				timer->fire_tsc += timer->period_in_cycle;
 				__add_timer(cpu_timer, timer, NULL);
 			}
-		} else
+		} else {
 			break;
+		}
 	}
 
 	/* update nearest timer */
@@ -276,9 +287,10 @@ static uint64_t native_calibrate_tsc(void)
 		cpuid(0x15, &eax_denominator, &ebx_numerator,
 			&ecx_hz, &reserved);
 
-		if (eax_denominator != 0U && ebx_numerator != 0U)
+		if (eax_denominator != 0U && ebx_numerator != 0U) {
 			return (uint64_t) ecx_hz *
 				ebx_numerator / eax_denominator;
+		}
 	}
 
 	return 0;
@@ -288,8 +300,9 @@ void calibrate_tsc(void)
 {
 	uint64_t tsc_hz;
 	tsc_hz = native_calibrate_tsc();
-	if (tsc_hz == 0U)
+	if (tsc_hz == 0U) {
 		tsc_hz = pit_calibrate_tsc(CAL_MS);
+	}
 	tsc_khz = (uint32_t)(tsc_hz / 1000UL);
 	printf("%s, tsc_khz=%lu\n", __func__, tsc_khz);
 }