github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-21 16:57:20 +00:00
Code Issues Projects Releases Wiki Activity

hv: fix '(void) missing for discarded return value'

Browse Source 
MISRA-C requires that the function call in which the returned
value is discarded shall be clearly indicated using (void).

This patch fixes the violations related to the following
function calls.
- instr_check_gva
- vlapic_set_local_intr
- prepare_vm
- enter_s3
- emulate_instruction
- ptdev_intx_pin_remap
- register_mmio_emulation_handler

v1 -> v2:
 * discard the return value of enter_s3

Tracked-On: #861
Signed-off-by: Shiqing Gao <shiqing.gao@intel.com>
This commit is contained in:
Shiqing Gao
2018-11-14 15:22:45 +08:00
committed by lijinxia
parent a646fcf761
commit 6971cc832a
7 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hypervisor/arch/x86/cpu.c
View File

@@ -513,7 +513,7 @@ static void bsp_boot_post(void)
exec_vmxon_instr(BOOT_CPU_ID);
prepare_vm(BOOT_CPU_ID);
(void)prepare_vm(BOOT_CPU_ID);
default_idle();
@@ -583,7 +583,7 @@ static void cpu_secondary_post(void)
exec_vmxon_instr(get_cpu_id());
#ifdef CONFIG_PARTITION_MODE
prepare_vm(get_cpu_id());
(void)prepare_vm(get_cpu_id());
#endif
default_idle();

5
hypervisor/arch/x86/guest/instr_emul.c
View File

@@ -2293,7 +2293,10 @@ int decode_instruction(struct acrn_vcpu *vcpu)
return retval;
}
} else {
instr_check_gva(vcpu, emul_ctxt, cpu_mode);
retval = instr_check_gva(vcpu, emul_ctxt, cpu_mode);
if (retval < 0) {
return retval;
}
}
return (int)(emul_ctxt->vie.opsize);

2
hypervisor/arch/x86/io.c
View File

@@ -83,7 +83,7 @@ void emulate_mmio_post(const struct acrn_vcpu *vcpu, const struct io_request *io
if (mmio_req->direction == REQUEST_READ) {
/* Emulate instruction and update vcpu register set */
emulate_instruction(vcpu);
(void)emulate_instruction(vcpu);
}
}

7
hypervisor/arch/x86/pm.c
View File

@@ -123,8 +123,7 @@ void do_acpi_s3(struct acrn_vm *vm, uint32_t pm1a_cnt_val,
}
}
int enter_s3(struct acrn_vm *vm, uint32_t pm1a_cnt_val,
uint32_t pm1b_cnt_val)
void enter_s3(struct acrn_vm *vm, uint32_t pm1a_cnt_val, uint32_t pm1b_cnt_val)
{
uint64_t pmain_entry_saved;
uint32_t guest_wakeup_vec32;
@@ -135,7 +134,7 @@ int enter_s3(struct acrn_vm *vm, uint32_t pm1a_cnt_val,
if (vm->pm.sx_state_data == NULL) {
pr_err("No Sx state info avaiable. No Sx support");
host_enter_s3_success = 0U;
return -1;
return;
}
pause_vm(vm); /* pause vm0 before suspend system */
@@ -193,5 +192,5 @@ int enter_s3(struct acrn_vm *vm, uint32_t pm1a_cnt_val,
/* jump back to vm */
resume_vm_from_s3(vm, guest_wakeup_vec32);
return 0;
return;
}