Skip to content

Commit 51c75e9

Browse files
shiqingglijinxia
authored andcommitted
hv: treewide: fix 'Function prototype/defn param type mismatch'
Fix the parameter type mismatch between API declaration and definition. Signed-off-by: Shiqing Gao <shiqing.gao@intel.com> Acked-by: Eddie Dong <eddie.dong@intel.com>
1 parent cf8fd8c commit 51c75e9

File tree

9 files changed

+27
-25
lines changed

9 files changed

+27
-25
lines changed

hypervisor/arch/x86/guest/vlapic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static int
8282
apicv_set_intr_ready(struct acrn_vlapic *vlapic, uint32_t vector, bool level);
8383

8484
static int
85-
apicv_pending_intr(struct acrn_vlapic *vlapic, uint32_t *vecptr);
85+
apicv_pending_intr(struct acrn_vlapic *vlapic, __unused uint32_t *vecptr);
8686

8787
static void
8888
apicv_set_tmr(struct acrn_vlapic *vlapic, uint32_t vector, bool level);

hypervisor/boot/include/acpi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct acpi_table_header {
2828
uint32_t asl_compiler_revision;
2929
};
3030

31-
uint16_t parse_madt(uint8_t *lapic_id_base);
31+
uint16_t parse_madt(uint8_t lapic_id_array[MAX_PCPU_NUM]);
3232

3333
void *get_dmar_table(void);
3434
#endif /* !ACPI_H */

hypervisor/debug/shell_internal.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -127,23 +127,23 @@ struct shell_cmd {
127127
#define SHELL_CMD_TRIGGER_CRASH_HELP "trigger crash"
128128

129129
/* Global function prototypes */
130-
int shell_show_req_info(int argc, char **argv);
131-
int shell_cmd_help(int argc, char **argv);
132-
int shell_list_vm(int argc, char **argv);
133-
int shell_list_vcpu(int argc, char **argv);
130+
int shell_show_req_info(__unused int argc, __unused char **argv);
131+
int shell_cmd_help(__unused int argc, __unused char **argv);
132+
int shell_list_vm(__unused int argc, __unused char **argv);
133+
int shell_list_vcpu(__unused int argc, __unused char **argv);
134134
int shell_pause_vcpu(int argc, char **argv);
135135
int shell_resume_vcpu(int argc, char **argv);
136136
int shell_vcpu_dumpreg(int argc, char **argv);
137137
int shell_vcpu_dumpmem(int argc, char **argv);
138138
int shell_to_sos_console(int argc, char **argv);
139-
int shell_show_cpu_int(int argc, char **argv);
140-
int shell_show_ptdev_info(int argc, char **argv);
141-
int shell_reboot(int argc, char **argv);
139+
int shell_show_cpu_int(__unused int argc, __unused char **argv);
140+
int shell_show_ptdev_info(__unused int argc, __unused char **argv);
141+
int shell_reboot(__unused int argc, __unused char **argv);
142142
int shell_show_vioapic_info(int argc, char **argv);
143-
int shell_show_ioapic_info(int argc, char **argv);
144-
int shell_show_vmexit_profile(int argc, char **argv);
143+
int shell_show_ioapic_info(__unused int argc, __unused char **argv);
144+
int shell_show_vmexit_profile(__unused int argc, __unused char **argv);
145145
int shell_dump_logbuf(int argc, char **argv);
146-
int shell_get_loglevel(int argc, char **argv);
146+
int shell_get_loglevel(__unused int argc, __unused char **argv);
147147
int shell_set_loglevel(int argc, char **argv);
148148
int shell_cpuid(int argc, char **argv);
149149
struct shell_cmd *shell_find_cmd(const char *cmd);

hypervisor/include/arch/x86/assign.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ int ptdev_intx_pin_remap(struct vm *vm, struct ptdev_intx_info *info);
1717
int ptdev_add_intx_remapping(struct vm *vm, uint16_t virt_bdf,
1818
uint16_t phys_bdf, uint8_t virt_pin, uint8_t phys_pin, bool pic_pin);
1919
void ptdev_remove_intx_remapping(struct vm *vm, uint8_t virt_pin, bool pic_pin);
20-
int ptdev_add_msix_remapping(struct vm *vm, uint16_t virt_bdf,
21-
uint16_t phys_bdf, uint32_t vector_count);
20+
int ptdev_add_msix_remapping(struct vm *vm, __unused uint16_t virt_bdf,
21+
__unused uint16_t phys_bdf, uint32_t vector_count);
2222
void ptdev_remove_msix_remapping(struct vm *vm, uint16_t virt_bdf,
2323
uint32_t vector_count);
2424

hypervisor/include/arch/x86/guest/vioapic.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ void vioapic_mmio_read(struct vm *vm, uint64_t gpa, uint32_t *rval);
5252
uint8_t vioapic_pincount(struct vm *vm);
5353
void vioapic_process_eoi(struct vm *vm, uint32_t vector);
5454
bool vioapic_get_rte(struct vm *vm, uint8_t pin, union ioapic_rte *rte);
55-
int vioapic_mmio_access_handler(struct vcpu *vcpu, struct io_request *io_req,
56-
void *handler_private_data);
55+
int vioapic_mmio_access_handler(struct vcpu *vcpu,
56+
struct io_request *io_req, __unused void *handler_private_data);
5757

5858
#ifdef HV_DEBUG
5959
void get_vioapic_info(char *str_arg, int str_max, uint16_t vmid);

hypervisor/include/arch/x86/guest/vlapic.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ void
112112
vlapic_apicv_batch_set_tmr(struct acrn_vlapic *vlapic);
113113

114114
int vlapic_mmio_access_handler(struct vcpu *vcpu, struct io_request *io_req,
115-
void *handler_private_data);
115+
__unused void *handler_private_data);
116116

117117
uint32_t vlapic_get_id(struct acrn_vlapic *vlapic);
118118
uint8_t vlapic_get_apicid(struct acrn_vlapic *vlapic);
@@ -123,13 +123,13 @@ void vlapic_init(struct acrn_vlapic *vlapic);
123123
void vlapic_reset(struct acrn_vlapic *vlapic);
124124
void vlapic_restore(struct acrn_vlapic *vlapic, struct lapic_regs *regs);
125125
bool vlapic_enabled(struct acrn_vlapic *vlapic);
126-
uint64_t apicv_get_apic_access_addr(struct vm *vm);
126+
uint64_t apicv_get_apic_access_addr(__unused struct vm *vm);
127127
uint64_t apicv_get_apic_page_addr(struct acrn_vlapic *vlapic);
128128
void apicv_inject_pir(struct acrn_vlapic *vlapic);
129129
int apic_access_vmexit_handler(struct vcpu *vcpu);
130130
int apic_write_vmexit_handler(struct vcpu *vcpu);
131131
int veoi_vmexit_handler(struct vcpu *vcpu);
132-
int tpr_below_threshold_vmexit_handler(struct vcpu *vcpu);
132+
int tpr_below_threshold_vmexit_handler(__unused struct vcpu *vcpu);
133133

134134
void calcvdest(struct vm *vm, uint64_t *dmask, uint32_t dest, bool phys);
135135
#endif /* _VLAPIC_H_ */

hypervisor/include/arch/x86/irq.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,12 @@ struct intr_excp_ctx {
4848
uint64_t ss;
4949
};
5050

51-
int handle_level_interrupt_common(struct irq_desc *desc, void *handler_data);
52-
int common_handler_edge(struct irq_desc *desc, void *handler_data);
53-
int common_dev_handler_level(struct irq_desc *desc, void *handler_data);
54-
int quick_handler_nolock(struct irq_desc *desc, void *handler_data);
51+
int handle_level_interrupt_common(struct irq_desc *desc,
52+
__unused void *handler_data);
53+
int common_handler_edge(struct irq_desc *desc, __unused void *handler_data);
54+
int common_dev_handler_level(struct irq_desc *desc,
55+
__unused void *handler_data);
56+
int quick_handler_nolock(struct irq_desc *desc, __unused void *handler_data);
5557

5658
void init_default_irqs(uint16_t cpu);
5759

hypervisor/include/arch/x86/mmu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ int ept_mr_del(struct vm *vm, uint64_t *pml4_page,
391391
uint64_t gpa, uint64_t size);
392392

393393
int ept_violation_vmexit_handler(struct vcpu *vcpu);
394-
int ept_misconfig_vmexit_handler(struct vcpu *vcpu);
394+
int ept_misconfig_vmexit_handler(__unused struct vcpu *vcpu);
395395

396396
#endif /* ASSEMBLER not defined */
397397

hypervisor/include/debug/logmsg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
extern uint32_t console_loglevel;
3131
extern uint32_t mem_loglevel;
32-
void init_logmsg(uint32_t mem_size, uint32_t flags);
32+
void init_logmsg(__unused uint32_t mem_size, uint32_t flags);
3333
void print_logmsg_buffer(uint16_t pcpu_id);
3434
void do_logmsg(uint32_t severity, const char *fmt, ...);
3535

0 commit comments

Comments
 (0)