HV: coding style cleanup for TRACE_2L & TRACE_4I usage

yonghuah · lijinxia · commit b83112016592 · 2018-07-16T10:32:14.000+08:00
to align the data type of parameters

Signed-off-by: Yonghua Huang &lt;yonghua.huang@intel.com&gt;
diff --git a/hypervisor/arch/x86/io.c b/hypervisor/arch/x86/io.c
@@ -73,8 +73,8 @@ int io_instr_vmexit_handler(struct vcpu *vcpu)
 	direction = VM_EXIT_IO_INSTRUCTION_ACCESS_DIRECTION(exit_qual);
 	mask = 0xfffffffful >> (32 - 8 * sz);
 
-	TRACE_4I(TRACE_VMEXIT_IO_INSTRUCTION, port, direction, sz,
-		cur_context_idx);
+	TRACE_4I(TRACE_VMEXIT_IO_INSTRUCTION, port, (uint32_t)direction, sz,
+		(uint32_t)cur_context_idx);
 
 	for (handler = vm->arch_vm.io_handler;
 			handler; handler = handler->next) {
diff --git a/hypervisor/arch/x86/timer.c b/hypervisor/arch/x86/timer.c
@@ -20,7 +20,7 @@ static void run_timer(struct timer *timer)
 		timer->func(timer->priv_data);
 	}
 
-	TRACE_2L(TRACE_TIMER_ACTION_PCKUP, timer->fire_tsc, 0);
+	TRACE_2L(TRACE_TIMER_ACTION_PCKUP, timer->fire_tsc, 0UL);
 }
 
 /* run in interrupt context */
@@ -95,7 +95,7 @@ int add_timer(struct timer *timer)
 		update_physical_timer(cpu_timer);
 	}
 
-	TRACE_2L(TRACE_TIMER_ACTION_ADDED, timer->fire_tsc, 0);
+	TRACE_2L(TRACE_TIMER_ACTION_ADDED, timer->fire_tsc, 0UL);
 	return 0;
 
 }
diff --git a/hypervisor/arch/x86/virq.c b/hypervisor/arch/x86/virq.c
@@ -310,7 +310,7 @@ int interrupt_window_vmexit_handler(struct vcpu *vcpu)
 {
 	int value32;
 
-	TRACE_2L(TRACE_VMEXIT_INTERRUPT_WINDOW, 0, 0);
+	TRACE_2L(TRACE_VMEXIT_INTERRUPT_WINDOW, 0UL, 0UL);
 
 	if (vcpu == NULL)
 		return -1;
@@ -353,7 +353,7 @@ int external_interrupt_vmexit_handler(struct vcpu *vcpu)
 
 	vcpu_retain_rip(vcpu);
 
-	TRACE_2L(TRACE_VMEXIT_EXTERNAL_INTERRUPT, ctx.vector, 0);
+	TRACE_2L(TRACE_VMEXIT_EXTERNAL_INTERRUPT, ctx.vector, 0UL);
 
 	return 0;
 }
@@ -490,7 +490,7 @@ int exception_vmexit_handler(struct vcpu *vcpu)
 	int status = 0;
 
 	if (vcpu == NULL) {
-		TRACE_4I(TRACE_VMEXIT_EXCEPTION_OR_NMI, 0, 0, 0, 0);
+		TRACE_4I(TRACE_VMEXIT_EXCEPTION_OR_NMI, 0U, 0U, 0U, 0U);
 		status = -EINVAL;
 	}
 
@@ -533,7 +533,7 @@ int exception_vmexit_handler(struct vcpu *vcpu)
 	}
 
 	TRACE_4I(TRACE_VMEXIT_EXCEPTION_OR_NMI,
-			exception_vector, int_err_code, 2, 0);
+			exception_vector, int_err_code, 2U, 0U);
 
 	return status;
 }
diff --git a/hypervisor/arch/x86/vmexit.c b/hypervisor/arch/x86/vmexit.c
@@ -213,7 +213,7 @@ static int unhandled_vmexit_handler(struct vcpu *vcpu)
 
 	/* while(1); */
 
-	TRACE_2L(TRACE_VMEXIT_UNHANDLED, vcpu->arch_vcpu.exit_reason, 0);
+	TRACE_2L(TRACE_VMEXIT_UNHANDLED, vcpu->arch_vcpu.exit_reason, 0UL);
 
 	return 0;
 }
diff --git a/hypervisor/common/hv_main.c b/hypervisor/common/hv_main.c
@@ -62,7 +62,7 @@ void vcpu_thread(struct vcpu *vcpu)
 			per_cpu(vmexit_time, vcpu->pcpu_id)[basic_exit_reason]
 				+= (vmexit_end - vmexit_begin);
 		}
-		TRACE_2L(TRACE_VM_ENTER, 0, 0);
+		TRACE_2L(TRACE_VM_ENTER, 0UL, 0UL);
 
 		/* Restore guest TSC_AUX */
 		if (vcpu->launched) {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ static void run_timer(struct timer *timer)`
`20`	`20`	`timer->func(timer->priv_data);`
`21`	`21`	`}`
`22`	`22`
`23`		`- TRACE_2L(TRACE_TIMER_ACTION_PCKUP, timer->fire_tsc, 0);`
	`23`	`+ TRACE_2L(TRACE_TIMER_ACTION_PCKUP, timer->fire_tsc, 0UL);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`/* run in interrupt context */`
`@@ -95,7 +95,7 @@ int add_timer(struct timer *timer)`
`95`	`95`	`update_physical_timer(cpu_timer);`
`96`	`96`	`}`
`97`	`97`
`98`		`- TRACE_2L(TRACE_TIMER_ACTION_ADDED, timer->fire_tsc, 0);`
	`98`	`+ TRACE_2L(TRACE_TIMER_ACTION_ADDED, timer->fire_tsc, 0UL);`
`99`	`99`	`return 0;`
`100`	`100`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ int interrupt_window_vmexit_handler(struct vcpu *vcpu)`
`310`	`310`	`{`
`311`	`311`	`int value32;`
`312`	`312`
`313`		`- TRACE_2L(TRACE_VMEXIT_INTERRUPT_WINDOW, 0, 0);`
	`313`	`+ TRACE_2L(TRACE_VMEXIT_INTERRUPT_WINDOW, 0UL, 0UL);`
`314`	`314`
`315`	`315`	`if (vcpu == NULL)`
`316`	`316`	`return -1;`
`@@ -353,7 +353,7 @@ int external_interrupt_vmexit_handler(struct vcpu *vcpu)`
`353`	`353`
`354`	`354`	`vcpu_retain_rip(vcpu);`
`355`	`355`
`356`		`- TRACE_2L(TRACE_VMEXIT_EXTERNAL_INTERRUPT, ctx.vector, 0);`
	`356`	`+ TRACE_2L(TRACE_VMEXIT_EXTERNAL_INTERRUPT, ctx.vector, 0UL);`
`357`	`357`
`358`	`358`	`return 0;`
`359`	`359`	`}`
`@@ -490,7 +490,7 @@ int exception_vmexit_handler(struct vcpu *vcpu)`
`490`	`490`	`int status = 0;`
`491`	`491`
`492`	`492`	`if (vcpu == NULL) {`
`493`		`- TRACE_4I(TRACE_VMEXIT_EXCEPTION_OR_NMI, 0, 0, 0, 0);`
	`493`	`+ TRACE_4I(TRACE_VMEXIT_EXCEPTION_OR_NMI, 0U, 0U, 0U, 0U);`
`494`	`494`	`status = -EINVAL;`
`495`	`495`	`}`
`496`	`496`
`@@ -533,7 +533,7 @@ int exception_vmexit_handler(struct vcpu *vcpu)`
`533`	`533`	`}`
`534`	`534`
`535`	`535`	`TRACE_4I(TRACE_VMEXIT_EXCEPTION_OR_NMI,`
`536`		`- exception_vector, int_err_code, 2, 0);`
	`536`	`+ exception_vector, int_err_code, 2U, 0U);`
`537`	`537`
`538`	`538`	`return status;`
`539`	`539`	`}`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ static int unhandled_vmexit_handler(struct vcpu *vcpu)`
`213`	`213`
`214`	`214`	`/* while(1); */`
`215`	`215`
`216`		`- TRACE_2L(TRACE_VMEXIT_UNHANDLED, vcpu->arch_vcpu.exit_reason, 0);`
	`216`	`+ TRACE_2L(TRACE_VMEXIT_UNHANDLED, vcpu->arch_vcpu.exit_reason, 0UL);`
`217`	`217`
`218`	`218`	`return 0;`
`219`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ void vcpu_thread(struct vcpu *vcpu)`
`62`	`62`	`per_cpu(vmexit_time, vcpu->pcpu_id)[basic_exit_reason]`
`63`	`63`	`+= (vmexit_end - vmexit_begin);`
`64`	`64`	`}`
`65`		`- TRACE_2L(TRACE_VM_ENTER, 0, 0);`
	`65`	`+ TRACE_2L(TRACE_VM_ENTER, 0UL, 0UL);`
`66`	`66`
`67`	`67`	`/* Restore guest TSC_AUX */`
`68`	`68`	`if (vcpu->launched) {`