fix parted of "missing for discarded return value"

Shawnshh · lijinxia · commit 977c4b20b5f8 · 2018-06-19T16:21:45.000+08:00
MISRA C required that return value should be used, missing for it should
add "(void)" prefix before the function call.
Some function can be declared without return value to avoid this problem.

Signed-off-by: Huihuang Shi &lt;huihuang.shi@intel.com&gt;
Acked-by: Eddie Dong &lt;eddie.dong@intel.com&gt;
diff --git a/hypervisor/arch/x86/assign.c b/hypervisor/arch/x86/assign.c
@@ -967,7 +967,7 @@ static void get_entry_info(struct ptdev_remapping_info *entry, char *type,
 	}
 }
 
-int get_ptdev_info(char *str, int str_max)
+void get_ptdev_info(char *str, int str_max)
 {
 	struct ptdev_remapping_info *entry;
 	int len, size = str_max;
@@ -1014,5 +1014,4 @@ int get_ptdev_info(char *str, int str_max)
 	spinlock_release(&ptdev_lock);
 
 	snprintf(str, size, "\r\n");
-	return 0;
 }
diff --git a/hypervisor/arch/x86/guest/vcpu.c b/hypervisor/arch/x86/guest/vcpu.c
@@ -237,7 +237,7 @@ int shutdown_vcpu(__unused struct vcpu *vcpu)
 	return 0;
 }
 
-int destroy_vcpu(struct vcpu *vcpu)
+void destroy_vcpu(struct vcpu *vcpu)
 {
 	ASSERT(vcpu != NULL, "Incorrect arguments");
 
@@ -254,8 +254,6 @@ int destroy_vcpu(struct vcpu *vcpu)
 	per_cpu(ever_run_vcpu, vcpu->pcpu_id) = NULL;
 	free_pcpu(vcpu->pcpu_id);
 	free(vcpu);
-
-	return 0;
 }
 
 /* NOTE:
diff --git a/hypervisor/arch/x86/guest/vioapic.c b/hypervisor/arch/x86/guest/vioapic.c
@@ -606,7 +606,7 @@ bool vioapic_get_rte(struct vm *vm, int pin, void *rte)
 		return false;
 }
 
-int get_vioapic_info(char *str, int str_max, int vmid)
+void get_vioapic_info(char *str, int str_max, int vmid)
 {
 	int pin, len, size = str_max, vector, delmode;
 	uint64_t rte;
@@ -650,5 +650,4 @@ int get_vioapic_info(char *str, int str_max, int vmid)
 	}
 END:
 	snprintf(str, size, "\r\n");
-	return 0;
 }
diff --git a/hypervisor/arch/x86/guest/vm.c b/hypervisor/arch/x86/guest/vm.c
@@ -260,20 +260,18 @@ int start_vm(struct vm *vm)
  * DM only pause vm for shutdown/reboot. If we need to
  * extend the pause vm for DM, this API should be extended.
  */
-int pause_vm(struct vm *vm)
+void pause_vm(struct vm *vm)
 {
 	int i;
 	struct vcpu *vcpu = NULL;
 
 	if (vm->state == VM_PAUSED)
-		return 0;
+		return;
 
 	vm->state = VM_PAUSED;
 
 	foreach_vcpu(i, vm, vcpu)
 		pause_vcpu(vcpu, VCPU_ZOMBIE);
-
-	return 0;
 }
 
 int vm_resume(struct vm *vm)
diff --git a/hypervisor/arch/x86/interrupt.c b/hypervisor/arch/x86/interrupt.c
@@ -94,7 +94,7 @@ static bool vcpu_pending_request(struct vcpu *vcpu)
 	return vcpu->arch_vcpu.pending_req != 0;
 }
 
-int vcpu_make_request(struct vcpu *vcpu, int eventid)
+void vcpu_make_request(struct vcpu *vcpu, int eventid)
 {
 	bitmap_set(eventid, &vcpu->arch_vcpu.pending_req);
 	/*
@@ -108,8 +108,6 @@ int vcpu_make_request(struct vcpu *vcpu, int eventid)
 	 */
 	if ((int)get_cpu_id() != vcpu->pcpu_id)
 		send_single_ipi(vcpu->pcpu_id, VECTOR_NOTIFY_VCPU);
-
-	return 0;
 }
 
 static int vcpu_do_pending_event(struct vcpu *vcpu)
@@ -223,7 +221,8 @@ int vcpu_queue_exception(struct vcpu *vcpu, uint32_t vector,
 	if (prev_vector == IDT_DF &&
 		new_class != EXCEPTION_CLASS_BENIGN) {
 		/* triple fault happen - shutdwon mode */
-		return vcpu_make_request(vcpu, ACRN_REQUEST_TRP_FAULT);
+		vcpu_make_request(vcpu, ACRN_REQUEST_TRP_FAULT);
+		return 0;
 	} else if ((prev_class == EXCEPTION_CLASS_CONT &&
 			new_class == EXCEPTION_CLASS_CONT) ||
 			(prev_class == EXCEPTION_CLASS_PF &&
@@ -281,20 +280,21 @@ static int vcpu_inject_lo_exception(struct vcpu *vcpu)
 	return 0;
 }
 
-int vcpu_inject_extint(struct vcpu *vcpu)
+void vcpu_inject_extint(struct vcpu *vcpu)
 {
-	return vcpu_make_request(vcpu, ACRN_REQUEST_EXTINT);
+	vcpu_make_request(vcpu, ACRN_REQUEST_EXTINT);
 }
 
-int vcpu_inject_nmi(struct vcpu *vcpu)
+void vcpu_inject_nmi(struct vcpu *vcpu)
 {
-	return vcpu_make_request(vcpu, ACRN_REQUEST_NMI);
+	vcpu_make_request(vcpu, ACRN_REQUEST_NMI);
 }
 
 int vcpu_inject_gp(struct vcpu *vcpu, uint32_t err_code)
 {
 	vcpu_queue_exception(vcpu, IDT_GP, err_code);
-	return vcpu_make_request(vcpu, ACRN_REQUEST_EXCP);
+	vcpu_make_request(vcpu, ACRN_REQUEST_EXCP);
+	return 0;
 }
 
 int vcpu_inject_pf(struct vcpu *vcpu, uint64_t addr, uint32_t err_code)
@@ -304,7 +304,8 @@ int vcpu_inject_pf(struct vcpu *vcpu, uint64_t addr, uint32_t err_code)
 
 	cur_context->cr2 = addr;
 	vcpu_queue_exception(vcpu, IDT_PF, err_code);
-	return vcpu_make_request(vcpu, ACRN_REQUEST_EXCP);
+	vcpu_make_request(vcpu, ACRN_REQUEST_EXCP);
+	return 0;
 }
 
 int interrupt_window_vmexit_handler(struct vcpu *vcpu)
diff --git a/hypervisor/arch/x86/intr_lapic.c b/hypervisor/arch/x86/intr_lapic.c
@@ -316,10 +316,9 @@ void resume_lapic(void)
 	restore_lapic(&saved_lapic_regs);
 }
 
-int send_lapic_eoi(void)
+void send_lapic_eoi(void)
 {
 	write_lapic_reg32(LAPIC_EOI_REGISTER, 0);
-	return 0;
 }
 
 static void wait_for_delivery(void)
diff --git a/hypervisor/arch/x86/irq.c b/hypervisor/arch/x86/irq.c
@@ -686,7 +686,7 @@ pri_register_handler(uint32_t irq,
 	return common_register_handler(irq, &info);
 }
 
-int get_cpu_interrupt_info(char *str, int str_max)
+void get_cpu_interrupt_info(char *str, int str_max)
 {
 	int pcpu_id;
 	uint32_t irq, vector, len, size = str_max;
@@ -727,5 +727,4 @@ int get_cpu_interrupt_info(char *str, int str_max)
 		}
 	}
 	snprintf(str, size, "\r\n");
-	return 0;
 }
diff --git a/hypervisor/arch/x86/timer.c b/hypervisor/arch/x86/timer.c
@@ -171,7 +171,7 @@ void timer_cleanup(void)
 	per_cpu(timer_node, pcpu_id) = NULL;
 }
 
-int timer_softirq(int pcpu_id)
+void timer_softirq(int pcpu_id)
 {
 	struct per_cpu_timers *cpu_timer;
 	struct timer *timer;
@@ -207,7 +207,6 @@ int timer_softirq(int pcpu_id)
 
 	/* update nearest timer */
 	update_physical_timer(cpu_timer);
-	return 0;
 }
 
 void check_tsc(void)
diff --git a/hypervisor/arch/x86/vtd.c b/hypervisor/arch/x86/vtd.c
@@ -649,20 +649,18 @@ static void dmar_set_root_table(struct dmar_drhd_rt *dmar_uint)
 	IOMMU_UNLOCK(dmar_uint);
 }
 
-static int dmar_fault_event_mask(struct dmar_drhd_rt *dmar_uint)
+static void dmar_fault_event_mask(struct dmar_drhd_rt *dmar_uint)
 {
 	IOMMU_LOCK(dmar_uint);
 	iommu_write32(dmar_uint, DMAR_FECTL_REG, DMA_FECTL_IM);
 	IOMMU_UNLOCK(dmar_uint);
-	return 0;
 }
 
-static int dmar_fault_event_unmask(struct dmar_drhd_rt *dmar_uint)
+static void dmar_fault_event_unmask(struct dmar_drhd_rt *dmar_uint)
 {
 	IOMMU_LOCK(dmar_uint);
 	iommu_write32(dmar_uint, DMAR_FECTL_REG, 0);
 	IOMMU_UNLOCK(dmar_uint);
-	return 0;
 }
 
 static void dmar_fault_msi_write(struct dmar_drhd_rt *dmar_uint,
diff --git a/hypervisor/common/hv_main.c b/hypervisor/common/hv_main.c
@@ -141,7 +141,7 @@ int hv_main(int cpu_id)
 	return 0;
 }
 
-int get_vmexit_profile(char *str, int str_max)
+void get_vmexit_profile(char *str, int str_max)
 {
 	int cpu, i, len, size = str_max;
 
@@ -173,5 +173,4 @@ int get_vmexit_profile(char *str, int str_max)
 		}
 	}
 	snprintf(str, size, "\r\n");
-	return 0;
 }
diff --git a/hypervisor/common/io_request.c b/hypervisor/common/io_request.c
@@ -146,7 +146,7 @@ static void _get_req_info_(struct vhm_request *req, int *id, char *type,
 	}
 }
 
-int get_req_info(char *str, int str_max)
+void get_req_info(char *str, int str_max)
 {
 	int i, len, size = str_max, client_id;
 	union vhm_request_buffer *req_buf;
@@ -189,5 +189,4 @@ int get_req_info(char *str, int str_max)
 	}
 	spinlock_release(&vm_list_lock);
 	snprintf(str, size, "\r\n");
-	return 0;
 }
diff --git a/hypervisor/debug/console.c b/hypervisor/debug/console.c
@@ -19,14 +19,12 @@ uint32_t get_serial_handle(void)
 	return serial_handle;
 }
 
-static int print_char(char x)
+static void print_char(char x)
 {
 	serial_puts(serial_handle, &x, 1);
 
 	if (x == '\n')
 		serial_puts(serial_handle, "\r", 1);
-
-	return 0;
 }
 
 int console_init(void)
@@ -44,8 +42,10 @@ int console_putc(int ch)
 
 	spinlock_obtain(&lock);
 
-	if (serial_handle != SERIAL_INVALID_HANDLE)
-		res = print_char(ch);
+	if (serial_handle != SERIAL_INVALID_HANDLE) {
+		print_char(ch);
+		res = 0;
+	}
 
 	spinlock_release(&lock);
 
diff --git a/hypervisor/debug/vuart.c b/hypervisor/debug/vuart.c
@@ -61,7 +61,7 @@ static void fifo_init(struct fifo *fifo, int sz)
 	fifo_reset(fifo);
 }
 
-static char fifo_putchar(struct fifo *fifo, char ch)
+static void fifo_putchar(struct fifo *fifo, char ch)
 {
 	fifo->buf[fifo->windex] = ch;
 	if (fifo->num < fifo->size) {
@@ -71,7 +71,6 @@ static char fifo_putchar(struct fifo *fifo, char ch)
 		fifo->rindex = (fifo->rindex + 1) % fifo->size;
 		fifo->windex = (fifo->windex + 1) % fifo->size;
 	}
-	return 0;
 }
 
 static char fifo_getchar(struct fifo *fifo)
diff --git a/hypervisor/include/arch/x86/guest/guest.h b/hypervisor/include/arch/x86/guest/guest.h
@@ -35,7 +35,7 @@ enum {
 struct vhm_request;
 
 int acrn_insert_request_wait(struct vcpu *vcpu, struct vhm_request *req);
-int get_req_info(char *str, int str_max);
+void get_req_info(char *str, int str_max);
 
 /*
  * VCPU related APIs
diff --git a/hypervisor/include/arch/x86/guest/vcpu.h b/hypervisor/include/arch/x86/guest/vcpu.h
@@ -260,7 +260,7 @@ struct vcpu* get_ever_run_vcpu(int pcpu_id);
 int create_vcpu(int cpu_id, struct vm *vm, struct vcpu **rtn_vcpu_handle);
 int start_vcpu(struct vcpu *vcpu);
 int shutdown_vcpu(struct vcpu *vcpu);
-int destroy_vcpu(struct vcpu *vcpu);
+void destroy_vcpu(struct vcpu *vcpu);
 
 void reset_vcpu(struct vcpu *vcpu);
 void pause_vcpu(struct vcpu *vcpu, enum vcpu_state new_state);
diff --git a/hypervisor/include/arch/x86/guest/vioapic.h b/hypervisor/include/arch/x86/guest/vioapic.h
@@ -53,5 +53,5 @@ bool	vioapic_get_rte(struct vm *vm, int pin, void *rte);
 int	vioapic_mmio_access_handler(struct vcpu *vcpu, struct mem_io *mmio,
 		void *handler_private_data);
 
-int get_vioapic_info(char *str, int str_max, int vmid);
+void get_vioapic_info(char *str, int str_max, int vmid);
 #endif
diff --git a/hypervisor/include/arch/x86/guest/vm.h b/hypervisor/include/arch/x86/guest/vm.h
@@ -170,7 +170,7 @@ struct vm_description {
 };
 
 int shutdown_vm(struct vm *vm);
-int pause_vm(struct vm *vm);
+void pause_vm(struct vm *vm);
 int start_vm(struct vm *vm);
 int create_vm(struct vm_description *vm_desc, struct vm **vm);
 int prepare_vm0(void);
diff --git a/hypervisor/include/arch/x86/irq.h b/hypervisor/include/arch/x86/irq.h
@@ -135,7 +135,7 @@ normal_register_handler(uint32_t irq,
 		const char *name);
 void unregister_handler_common(struct dev_handler_node *node);
 
-int get_cpu_interrupt_info(char *str, int str_max);
+void get_cpu_interrupt_info(char *str, int str_max);
 
 void setup_notification(void);
 
@@ -157,11 +157,11 @@ extern spurious_handler_t spurious_handler;
 #define HV_ARCH_VCPU_BLOCKED_BY_MOVSS       (1<<1)
 #define HV_ARCH_VCPU_BLOCKED_BY_STI         (1<<0)
 
-int vcpu_inject_extint(struct vcpu *vcpu);
-int vcpu_inject_nmi(struct vcpu *vcpu);
+void vcpu_inject_extint(struct vcpu *vcpu);
+void vcpu_inject_nmi(struct vcpu *vcpu);
 int vcpu_inject_gp(struct vcpu *vcpu, uint32_t err_code);
 int vcpu_inject_pf(struct vcpu *vcpu, uint64_t addr, uint32_t err_code);
-int vcpu_make_request(struct vcpu *vcpu, int eventid);
+void vcpu_make_request(struct vcpu *vcpu, int eventid);
 int vcpu_queue_exception(struct vcpu *vcpu, uint32_t vector, uint32_t err_code);
 
 int exception_vmexit_handler(struct vcpu *vcpu);
diff --git a/hypervisor/include/arch/x86/lapic.h b/hypervisor/include/arch/x86/lapic.h
@@ -159,7 +159,7 @@ void write_lapic_reg32(uint32_t offset, uint32_t value);
 void save_lapic(struct lapic_regs *regs);
 int early_init_lapic(void);
 int init_lapic(uint32_t cpu_id);
-int send_lapic_eoi(void);
+void send_lapic_eoi(void);
 uint32_t get_cur_lapic_id(void);
 int send_startup_ipi(enum intr_cpu_startup_shorthand cpu_startup_shorthand,
 		uint32_t cpu_startup_dest,
diff --git a/hypervisor/include/arch/x86/timer.h b/hypervisor/include/arch/x86/timer.h
@@ -54,7 +54,7 @@ static inline void initialize_timer(struct timer *timer,
 int add_timer(struct timer *timer);
 void del_timer(struct timer *timer);
 
-int timer_softirq(int pcpu_id);
+void timer_softirq(int pcpu_id);
 void timer_init(void);
 void timer_cleanup(void);
 void check_tsc(void);
diff --git a/hypervisor/include/arch/x86/vmexit.h b/hypervisor/include/arch/x86/vmexit.h
@@ -16,7 +16,7 @@ int vmexit_handler(struct vcpu *vcpu);
 int vmcall_vmexit_handler(struct vcpu *vcpu);
 int cpuid_vmexit_handler(struct vcpu *vcpu);
 int cr_access_vmexit_handler(struct vcpu *vcpu);
-int get_vmexit_profile(char *str, int str_max);
+void get_vmexit_profile(char *str, int str_max);
 
 #define VM_EXIT_QUALIFICATION_BIT_MASK(exit_qual, MSB, LSB)   \
 	(exit_qual & (((1UL << (MSB+1))-1) - ((1UL << (LSB))-1)))
diff --git a/hypervisor/include/common/ptdev.h b/hypervisor/include/common/ptdev.h
@@ -70,7 +70,7 @@ extern spinlock_t softirq_dev_lock;
 void ptdev_softirq(int cpu);
 void ptdev_init(void);
 void ptdev_release_all_entries(struct vm *vm);
-int get_ptdev_info(char *str, int str_max);
+void get_ptdev_info(char *str, int str_max);
 
 struct ptdev_remapping_info *ptdev_dequeue_softirq(void);
 struct ptdev_remapping_info *alloc_entry(struct vm *vm,
diff --git a/hypervisor/include/lib/spinlock.h b/hypervisor/include/lib/spinlock.h
@@ -19,18 +19,16 @@ typedef struct _spinlock {
 } spinlock_t;
 
 /* Function prototypes */
-int spinlock_init(spinlock_t *lock);
-int spinlock_obtain(spinlock_t *lock);
+void spinlock_init(spinlock_t *lock);
+void spinlock_obtain(spinlock_t *lock);
 
-static inline int spinlock_release(spinlock_t *lock)
+static inline void spinlock_release(spinlock_t *lock)
 {
 	/* Increment tail of queue */
 	asm volatile ("   lock incl %[tail]\n"
 				:
 				: [tail] "m" (lock->tail)
 				: "cc", "memory");
-
-	return 0;
 }
 
 #else /* ASSEMBLER */
diff --git a/hypervisor/lib/spinlock.c b/hypervisor/lib/spinlock.c

Original file line number	Diff line number	Diff line change
`@@ -967,7 +967,7 @@ static void get_entry_info(struct ptdev_remapping_info entry, char type,`
`967`	`967`	`}`
`968`	`968`	`}`
`969`	`969`
`970`		`-int get_ptdev_info(char *str, int str_max)`
	`970`	`+void get_ptdev_info(char *str, int str_max)`
`971`	`971`	`{`
`972`	`972`	`struct ptdev_remapping_info *entry;`
`973`	`973`	`int len, size = str_max;`
`@@ -1014,5 +1014,4 @@ int get_ptdev_info(char *str, int str_max)`
`1014`	`1014`	`spinlock_release(&ptdev_lock);`
`1015`	`1015`
`1016`	`1016`	`snprintf(str, size, "\r\n");`
`1017`		`- return 0;`
`1018`	`1017`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ int shutdown_vcpu(__unused struct vcpu *vcpu)`
`237`	`237`	`return 0;`
`238`	`238`	`}`
`239`	`239`
`240`		`-int destroy_vcpu(struct vcpu *vcpu)`
	`240`	`+void destroy_vcpu(struct vcpu *vcpu)`
`241`	`241`	`{`
`242`	`242`	`ASSERT(vcpu != NULL, "Incorrect arguments");`
`243`	`243`
`@@ -254,8 +254,6 @@ int destroy_vcpu(struct vcpu *vcpu)`
`254`	`254`	`per_cpu(ever_run_vcpu, vcpu->pcpu_id) = NULL;`
`255`	`255`	`free_pcpu(vcpu->pcpu_id);`
`256`	`256`	`free(vcpu);`
`257`		`-`
`258`		`- return 0;`
`259`	`257`	`}`
`260`	`258`
`261`	`259`	`/* NOTE:`
Original file line number	Diff line number	Diff line change
`@@ -606,7 +606,7 @@ bool vioapic_get_rte(struct vm vm, int pin, void rte)`
`606`	`606`	`return false;`
`607`	`607`	`}`
`608`	`608`
`609`		`-int get_vioapic_info(char *str, int str_max, int vmid)`
	`609`	`+void get_vioapic_info(char *str, int str_max, int vmid)`
`610`	`610`	`{`
`611`	`611`	`int pin, len, size = str_max, vector, delmode;`
`612`	`612`	`uint64_t rte;`
`@@ -650,5 +650,4 @@ int get_vioapic_info(char *str, int str_max, int vmid)`
`650`	`650`	`}`
`651`	`651`	`END:`
`652`	`652`	`snprintf(str, size, "\r\n");`
`653`		`- return 0;`
`654`	`653`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ static bool vcpu_pending_request(struct vcpu *vcpu)`
`94`	`94`	`return vcpu->arch_vcpu.pending_req != 0;`
`95`	`95`	`}`
`96`	`96`
`97`		`-int vcpu_make_request(struct vcpu *vcpu, int eventid)`
	`97`	`+void vcpu_make_request(struct vcpu *vcpu, int eventid)`
`98`	`98`	`{`
`99`	`99`	`bitmap_set(eventid, &vcpu->arch_vcpu.pending_req);`
`100`	`100`	`/*`
`@@ -108,8 +108,6 @@ int vcpu_make_request(struct vcpu *vcpu, int eventid)`
`108`	`108`	`*/`
`109`	`109`	`if ((int)get_cpu_id() != vcpu->pcpu_id)`
`110`	`110`	`send_single_ipi(vcpu->pcpu_id, VECTOR_NOTIFY_VCPU);`
`111`		`-`
`112`		`- return 0;`
`113`	`111`	`}`
`114`	`112`
`115`	`113`	`static int vcpu_do_pending_event(struct vcpu *vcpu)`
`@@ -223,7 +221,8 @@ int vcpu_queue_exception(struct vcpu *vcpu, uint32_t vector,`
`223`	`221`	`if (prev_vector == IDT_DF &&`
`224`	`222`	`new_class != EXCEPTION_CLASS_BENIGN) {`
`225`	`223`	`/* triple fault happen - shutdwon mode */`
`226`		`- return vcpu_make_request(vcpu, ACRN_REQUEST_TRP_FAULT);`
	`224`	`+ vcpu_make_request(vcpu, ACRN_REQUEST_TRP_FAULT);`
	`225`	`+ return 0;`
`227`	`226`	`} else if ((prev_class == EXCEPTION_CLASS_CONT &&`
`228`	`227`	`new_class == EXCEPTION_CLASS_CONT) \|\|`
`229`	`228`	`(prev_class == EXCEPTION_CLASS_PF &&`
`@@ -281,20 +280,21 @@ static int vcpu_inject_lo_exception(struct vcpu *vcpu)`
`281`	`280`	`return 0;`
`282`	`281`	`}`
`283`	`282`
`284`		`-int vcpu_inject_extint(struct vcpu *vcpu)`
	`283`	`+void vcpu_inject_extint(struct vcpu *vcpu)`
`285`	`284`	`{`
`286`		`- return vcpu_make_request(vcpu, ACRN_REQUEST_EXTINT);`
	`285`	`+ vcpu_make_request(vcpu, ACRN_REQUEST_EXTINT);`
`287`	`286`	`}`
`288`	`287`
`289`		`-int vcpu_inject_nmi(struct vcpu *vcpu)`
	`288`	`+void vcpu_inject_nmi(struct vcpu *vcpu)`
`290`	`289`	`{`
`291`		`- return vcpu_make_request(vcpu, ACRN_REQUEST_NMI);`
	`290`	`+ vcpu_make_request(vcpu, ACRN_REQUEST_NMI);`
`292`	`291`	`}`
`293`	`292`
`294`	`293`	`int vcpu_inject_gp(struct vcpu *vcpu, uint32_t err_code)`
`295`	`294`	`{`
`296`	`295`	`vcpu_queue_exception(vcpu, IDT_GP, err_code);`
`297`		`- return vcpu_make_request(vcpu, ACRN_REQUEST_EXCP);`
	`296`	`+ vcpu_make_request(vcpu, ACRN_REQUEST_EXCP);`
	`297`	`+ return 0;`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`int vcpu_inject_pf(struct vcpu *vcpu, uint64_t addr, uint32_t err_code)`
`@@ -304,7 +304,8 @@ int vcpu_inject_pf(struct vcpu *vcpu, uint64_t addr, uint32_t err_code)`
`304`	`304`
`305`	`305`	`cur_context->cr2 = addr;`
`306`	`306`	`vcpu_queue_exception(vcpu, IDT_PF, err_code);`
`307`		`- return vcpu_make_request(vcpu, ACRN_REQUEST_EXCP);`
	`307`	`+ vcpu_make_request(vcpu, ACRN_REQUEST_EXCP);`
	`308`	`+ return 0;`
`308`	`309`	`}`
`309`	`310`
`310`	`311`	`int interrupt_window_vmexit_handler(struct vcpu *vcpu)`
Original file line number	Diff line number	Diff line change
`@@ -316,10 +316,9 @@ void resume_lapic(void)`
`316`	`316`	`restore_lapic(&saved_lapic_regs);`
`317`	`317`	`}`
`318`	`318`
`319`		`-int send_lapic_eoi(void)`
	`319`	`+void send_lapic_eoi(void)`
`320`	`320`	`{`
`321`	`321`	`write_lapic_reg32(LAPIC_EOI_REGISTER, 0);`
`322`		`- return 0;`
`323`	`322`	`}`
`324`	`323`
`325`	`324`	`static void wait_for_delivery(void)`
Original file line number	Diff line number	Diff line change
`@@ -686,7 +686,7 @@ pri_register_handler(uint32_t irq,`
`686`	`686`	`return common_register_handler(irq, &info);`
`687`	`687`	`}`
`688`	`688`
`689`		`-int get_cpu_interrupt_info(char *str, int str_max)`
	`689`	`+void get_cpu_interrupt_info(char *str, int str_max)`
`690`	`690`	`{`
`691`	`691`	`int pcpu_id;`
`692`	`692`	`uint32_t irq, vector, len, size = str_max;`
`@@ -727,5 +727,4 @@ int get_cpu_interrupt_info(char *str, int str_max)`
`727`	`727`	`}`
`728`	`728`	`}`
`729`	`729`	`snprintf(str, size, "\r\n");`
`730`		`- return 0;`
`731`	`730`	`}`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ void timer_cleanup(void)`
`171`	`171`	`per_cpu(timer_node, pcpu_id) = NULL;`
`172`	`172`	`}`
`173`	`173`
`174`		`-int timer_softirq(int pcpu_id)`
	`174`	`+void timer_softirq(int pcpu_id)`
`175`	`175`	`{`
`176`	`176`	`struct per_cpu_timers *cpu_timer;`
`177`	`177`	`struct timer *timer;`
`@@ -207,7 +207,6 @@ int timer_softirq(int pcpu_id)`
`207`	`207`
`208`	`208`	`/* update nearest timer */`
`209`	`209`	`update_physical_timer(cpu_timer);`
`210`		`- return 0;`
`211`	`210`	`}`
`212`	`211`
`213`	`212`	`void check_tsc(void)`
Original file line number	Diff line number	Diff line change
`@@ -649,20 +649,18 @@ static void dmar_set_root_table(struct dmar_drhd_rt *dmar_uint)`
`649`	`649`	`IOMMU_UNLOCK(dmar_uint);`
`650`	`650`	`}`
`651`	`651`
`652`		`-static int dmar_fault_event_mask(struct dmar_drhd_rt *dmar_uint)`
	`652`	`+static void dmar_fault_event_mask(struct dmar_drhd_rt *dmar_uint)`
`653`	`653`	`{`
`654`	`654`	`IOMMU_LOCK(dmar_uint);`
`655`	`655`	`iommu_write32(dmar_uint, DMAR_FECTL_REG, DMA_FECTL_IM);`
`656`	`656`	`IOMMU_UNLOCK(dmar_uint);`
`657`		`- return 0;`
`658`	`657`	`}`
`659`	`658`
`660`		`-static int dmar_fault_event_unmask(struct dmar_drhd_rt *dmar_uint)`
	`659`	`+static void dmar_fault_event_unmask(struct dmar_drhd_rt *dmar_uint)`
`661`	`660`	`{`
`662`	`661`	`IOMMU_LOCK(dmar_uint);`
`663`	`662`	`iommu_write32(dmar_uint, DMAR_FECTL_REG, 0);`
`664`	`663`	`IOMMU_UNLOCK(dmar_uint);`
`665`		`- return 0;`
`666`	`664`	`}`
`667`	`665`
`668`	`666`	`static void dmar_fault_msi_write(struct dmar_drhd_rt *dmar_uint,`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ int hv_main(int cpu_id)`
`141`	`141`	`return 0;`
`142`	`142`	`}`
`143`	`143`
`144`		`-int get_vmexit_profile(char *str, int str_max)`
	`144`	`+void get_vmexit_profile(char *str, int str_max)`
`145`	`145`	`{`
`146`	`146`	`int cpu, i, len, size = str_max;`
`147`	`147`
`@@ -173,5 +173,4 @@ int get_vmexit_profile(char *str, int str_max)`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`	`snprintf(str, size, "\r\n");`
`176`		`- return 0;`
`177`	`176`	`}`