hv: arch: fix 'Unused procedure parameter'

MISRA-C requires that there should be no unused parameters in
functions.

In some cases, we will keep the unused parameters.
vmexit handler is one example. It is used as function pointer.
Some of the vmexit handlers use the input parameter 'vcpu', some of
them don't. We still need to keep the unused parameters 'vcpu' for
those handlers don't use 'vcpu'.

This patch removes the unused parameters that is not being used
unconditionally.

v1 -> v2:
 * remove the non-implemented API 'vlapic_id_write_handler'

Tracked-On: #861
Signed-off-by: Shiqing Gao <shiqing.gao@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>

hypervisor/arch/x86/assign.c

@@ -678,9 +678,8 @@ END:
  * - currently, one phys_pin can only be held by one pin source (vPIC or
  *   vIOAPIC)
  */
-int ptdev_add_intx_remapping(struct vm *vm,
-			__unused uint16_t virt_bdf, __unused uint16_t phys_bdf,
-			uint8_t virt_pin, uint8_t phys_pin, bool pic_pin)
+int ptdev_add_intx_remapping(struct vm *vm, uint8_t virt_pin, uint8_t phys_pin,
+				bool pic_pin)
 {
 	struct ptdev_remapping_info *entry;
 

hypervisor/arch/x86/cpu.c

@@ -688,7 +688,7 @@ void stop_cpus(void)
 	}
 }
 
-void cpu_do_idle(__unused uint16_t pcpu_id)
+void cpu_do_idle(void)
 {
 	__asm __volatile("pause" ::: "memory");
 }

hypervisor/arch/x86/cpuid.c

@@ -86,8 +86,7 @@ static inline int set_vcpuid_entry(struct vm *vm,
 /**
  * initialization of virtual CPUID leaf
  */
-static void init_vcpuid_entry(__unused struct vm *vm,
-			uint32_t leaf, uint32_t subleaf,
+static void init_vcpuid_entry(uint32_t leaf, uint32_t subleaf,
 			uint32_t flags, struct vcpuid_entry *entry)
 {
 	entry->leaf = leaf;
@@ -180,7 +179,7 @@ int set_vcpuid_entries(struct vm *vm)
 	uint32_t limit;
 	uint32_t i, j;
 
-	init_vcpuid_entry(vm, 0U, 0U, 0U, &entry);
+	init_vcpuid_entry(0U, 0U, 0U, &entry);
 	if (boot_cpu_data.cpuid_level < 0x16U) {
 		/* The cpuid with zero leaf returns the max level.
 		 * Emulate that the 0x16U is supported */
@@ -204,8 +203,7 @@ int set_vcpuid_entries(struct vm *vm)
 		{
 			uint32_t times;
 
-			init_vcpuid_entry(vm, i, 0U,
-				CPUID_CHECK_SUBLEAF, &entry);
+			init_vcpuid_entry(i, 0U, CPUID_CHECK_SUBLEAF, &entry);
 			result = set_vcpuid_entry(vm, &entry);
 			if (result != 0) {
 				return result;
@@ -213,8 +211,8 @@ int set_vcpuid_entries(struct vm *vm)
 
 			times = entry.eax & 0xffUL;
 			for (j = 1U; j < times; j++) {
-				init_vcpuid_entry(vm, i, j,
-					CPUID_CHECK_SUBLEAF, &entry);
+				init_vcpuid_entry(i, j, CPUID_CHECK_SUBLEAF,
+						&entry);
 				result = set_vcpuid_entry(vm, &entry);
 				if (result != 0) {
 					return result;
@@ -230,8 +228,8 @@ int set_vcpuid_entries(struct vm *vm)
 					break;
 				}
 
-				init_vcpuid_entry(vm, i, j,
-					CPUID_CHECK_SUBLEAF, &entry);
+				init_vcpuid_entry(i, j, CPUID_CHECK_SUBLEAF,
+						&entry);
 				if ((i == 0x04U) && (entry.eax == 0U)) {
 					break;
 				}
@@ -257,7 +255,7 @@ int set_vcpuid_entries(struct vm *vm)
 		case 0x14U:
 			break;
 		default:
-			init_vcpuid_entry(vm, i, 0U, 0U, &entry);
+			init_vcpuid_entry(i, 0U, 0U, &entry);
 			result = set_vcpuid_entry(vm, &entry);
 			if (result != 0) {
 				return result;
@@ -266,19 +264,19 @@ int set_vcpuid_entries(struct vm *vm)
 		}
 	}
 
-	init_vcpuid_entry(vm, 0x40000000U, 0U, 0U, &entry);
+	init_vcpuid_entry(0x40000000U, 0U, 0U, &entry);
 	result = set_vcpuid_entry(vm, &entry);
 	if (result != 0) {
 		return result;
 	}
 
-	init_vcpuid_entry(vm, 0x40000010U, 0U, 0U, &entry);
+	init_vcpuid_entry(0x40000010U, 0U, 0U, &entry);
 	result = set_vcpuid_entry(vm, &entry);
 	if (result != 0) {
 		return result;
 	}
 
-	init_vcpuid_entry(vm, 0x80000000U, 0U, 0U, &entry);
+	init_vcpuid_entry(0x80000000U, 0U, 0U, &entry);
 	result = set_vcpuid_entry(vm, &entry);
 	if (result != 0) {
 		return result;
@@ -287,7 +285,7 @@ int set_vcpuid_entries(struct vm *vm)
 	limit = entry.eax;
 	vm->vcpuid_xlevel = limit;
 	for (i = 0x80000001U; i <= limit; i++) {
-		init_vcpuid_entry(vm, i, 0U, 0U, &entry);
+		init_vcpuid_entry(i, 0U, 0U, &entry);
 		result = set_vcpuid_entry(vm, &entry);
 		if (result != 0) {
 			return result;

hypervisor/arch/x86/guest/pm.c

@@ -134,8 +134,8 @@ static inline uint8_t get_slp_typx(uint32_t pm1_cnt)
 	return (uint8_t)((pm1_cnt & 0x1fffU) >> BIT_SLP_TYPx);
 }
 
-static uint32_t pm1ab_io_read(__unused struct vm_io_handler *hdlr,
-		__unused struct vm *vm, uint16_t addr, size_t width)
+static uint32_t pm1ab_io_read(__unused struct vm *vm, uint16_t addr,
+			size_t width)
 {
 	uint32_t val = pio_read(addr, width);
 
@@ -150,9 +150,8 @@ static uint32_t pm1ab_io_read(__unused struct vm_io_handler *hdlr,
 	return val;
 }
 
-static void pm1ab_io_write(__unused struct vm_io_handler *hdlr,
-		__unused struct vm *vm, uint16_t addr, size_t width,
-		uint32_t v)
+static void pm1ab_io_write(__unused struct vm *vm, uint16_t addr, size_t width,
+			uint32_t v)
 {
 	static uint32_t pm1a_cnt_ready = 0U;
 

hypervisor/arch/x86/guest/vlapic.c

@@ -85,11 +85,10 @@ vlapic_dump_isr(__unused struct acrn_vlapic *vlapic, __unused char *msg) {}
 static uint8_t apicv_apic_access_addr[CPU_PAGE_SIZE] __aligned(CPU_PAGE_SIZE);
 
 static int
-apicv_set_intr_ready(struct acrn_vlapic *vlapic, uint32_t vector,
-			__unused bool level);
+apicv_set_intr_ready(struct acrn_vlapic *vlapic, uint32_t vector);
 
 static int
-apicv_pending_intr(struct acrn_vlapic *vlapic, __unused uint32_t *vecptr);
+apicv_pending_intr(struct acrn_vlapic *vlapic);
 
 static void
 apicv_batch_set_tmr(struct acrn_vlapic *vlapic);
@@ -229,13 +228,6 @@ vlapic_ldr_write_handler(struct acrn_vlapic *vlapic)
 	dev_dbg(ACRN_DBG_LAPIC, "vlapic LDR set to %#x", lapic->ldr);
 }
 
-static void
-vlapic_id_write_handler(__unused struct acrn_vlapic *vlapic)
-{
-	/* Force APIC ID as readonly */
-	return;
-}
-
 static inline uint32_t
 vlapic_timer_divisor_shift(uint32_t dcr)
 {
@@ -490,7 +482,7 @@ vlapic_set_intr_ready(struct acrn_vlapic *vlapic, uint32_t vector, bool level)
 	}
 
 	if (is_apicv_intr_delivery_supported()) {
-		return apicv_set_intr_ready(vlapic, vector, level);
+		return apicv_set_intr_ready(vlapic, vector);
 	}
 
 	idx = vector >> 5U;
@@ -1239,7 +1231,7 @@ vlapic_pending_intr(struct acrn_vlapic *vlapic, uint32_t *vecptr)
 	struct lapic_reg *irrptr;
 
 	if (is_apicv_intr_delivery_supported()) {
-		return apicv_pending_intr(vlapic, vecptr);
+		return apicv_pending_intr(vlapic);
 	}
 
 	irrptr = &lapic->irr[0];
@@ -1492,7 +1484,7 @@ vlapic_write(struct acrn_vlapic *vlapic, uint32_t offset,
 	retval = 0;
 	switch (offset) {
 	case APIC_OFFSET_ID:
-		vlapic_id_write_handler(vlapic);
+		/* Force APIC ID as read only */
 		break;
 	case APIC_OFFSET_TPR:
 		vlapic_set_tpr(vlapic, data32 & 0xffU);
@@ -1995,7 +1987,7 @@ int vlapic_create(struct vcpu *vcpu)
 				DEFAULT_APIC_BASE, CPU_PAGE_SIZE);
 
 		ept_mr_add(vcpu->vm, pml4_page,
-			vlapic_apicv_get_apic_access_addr(vcpu->vm),
+			vlapic_apicv_get_apic_access_addr(),
 			DEFAULT_APIC_BASE, CPU_PAGE_SIZE,
 			EPT_WR | EPT_RD | EPT_UNCACHED);
 	}
@@ -2022,8 +2014,7 @@ void vlapic_free(struct vcpu *vcpu)
  * APIC-v functions
  * **/
 static int
-apicv_set_intr_ready(struct acrn_vlapic *vlapic, uint32_t vector,
-			__unused bool level)
+apicv_set_intr_ready(struct acrn_vlapic *vlapic, uint32_t vector)
 {
 	struct vlapic_pir_desc *pir_desc;
 	uint64_t mask;
@@ -2041,7 +2032,7 @@ apicv_set_intr_ready(struct acrn_vlapic *vlapic, uint32_t vector,
 }
 
 static int
-apicv_pending_intr(struct acrn_vlapic *vlapic, __unused uint32_t *vecptr)
+apicv_pending_intr(struct acrn_vlapic *vlapic)
 {
 	struct vlapic_pir_desc *pir_desc;
 	struct lapic_regs *lapic;
@@ -2104,7 +2095,7 @@ apicv_batch_set_tmr(struct acrn_vlapic *vlapic)
  *APIC-v: Get the HPA to APIC-access page
  * **/
 uint64_t
-vlapic_apicv_get_apic_access_addr(__unused struct vm *vm)
+vlapic_apicv_get_apic_access_addr(void)
 {
 	return hva2hpa(apicv_apic_access_addr);
 }
@@ -2278,7 +2269,7 @@ int apic_write_vmexit_handler(struct vcpu *vcpu)
 
 	switch (offset) {
 	case APIC_OFFSET_ID:
-		vlapic_id_write_handler(vlapic);
+		/* Force APIC ID as read only */
 		break;
 	case APIC_OFFSET_EOI:
 		vlapic_process_eoi(vlapic);

hypervisor/arch/x86/io.c

@@ -200,14 +200,14 @@ hv_emulate_pio(struct vcpu *vcpu, struct io_request *io_req)
 			break;
 		} else {
 			if (pio_req->direction == REQUEST_WRITE) {
-				handler->desc.io_write(handler, vm, port, size,
-					pio_req->value & mask);
+				handler->desc.io_write(vm, port, size,
+							pio_req->value & mask);
 
 				pr_dbg("IO write on port %04x, data %08x", port,
 					pio_req->value & mask);
 			} else {
-				pio_req->value = handler->desc.io_read(handler,
-						vm, port, size);
+				pio_req->value = handler->desc.io_read(vm, port,
+									size);
 
 				pr_dbg("IO read on port %04x, data %08x",
 					port, pio_req->value);

hypervisor/arch/x86/vmx.c

@@ -203,7 +203,7 @@ void exec_vmwrite16(uint32_t field, uint16_t value)
 	exec_vmwrite64(field, (uint64_t)value);
 }
 
-static void init_cr0_cr4_host_mask(__unused struct vcpu *vcpu)
+static void init_cr0_cr4_host_mask(void)
 {
 	static bool inited = false;
 	uint64_t fixed0, fixed1;
@@ -692,7 +692,7 @@ static void init_guest_state(struct vcpu *vcpu)
 	}
 }
 
-static void init_host_state(__unused struct vcpu *vcpu)
+static void init_host_state(void)
 {
 	uint16_t value16;
 	uint64_t value64;
@@ -968,7 +968,7 @@ static void init_exec_ctrl(struct vcpu *vcpu)
 	pr_dbg("VMX_PROC_VM_EXEC_CONTROLS2: 0x%x ", value32);
 
 	/*APIC-v, config APIC-access address*/
-	value64 = vlapic_apicv_get_apic_access_addr(vcpu->vm);
+	value64 = vlapic_apicv_get_apic_access_addr();
 	exec_vmwrite64(VMX_APIC_ACCESS_ADDR_FULL, value64);
 
 	/*APIC-v, config APIC virtualized page address*/
@@ -1043,7 +1043,7 @@ static void init_exec_ctrl(struct vcpu *vcpu)
 	/* Natural-width */
 	pr_dbg("Natural-width*********");
 
-	init_cr0_cr4_host_mask(vcpu);
+	init_cr0_cr4_host_mask();
 
 	/* The CR3 target registers work in concert with VMX_CR3_TARGET_COUNT
 	 * field. Using these registers guest CR3 access can be managed. i.e.,
@@ -1097,7 +1097,7 @@ static void init_entry_ctrl(__unused struct vcpu *vcpu)
 	exec_vmwrite32(VMX_ENTRY_INSTR_LENGTH, 0U);
 }
 
-static void init_exit_ctrl(__unused struct vcpu *vcpu)
+static void init_exit_ctrl(void)
 {
 	uint32_t value32;
 
@@ -1156,10 +1156,10 @@ void init_vmcs(struct vcpu *vcpu)
 	exec_vmptrld((void *)&vmcs_pa);
 
 	/* Initialize the Virtual Machine Control Structure (VMCS) */
-	init_host_state(vcpu);
+	init_host_state();
 	/* init exec_ctrl needs to run before init_guest_state */
 	init_exec_ctrl(vcpu);
 	init_guest_state(vcpu);
 	init_entry_ctrl(vcpu);
-	init_exit_ctrl(vcpu);
+	init_exit_ctrl();
 }