github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-01 17:52:26 +00:00
Code Issues Projects Releases Wiki Activity

hv: vpic: fix "Procedure has more than one exit point"

Browse Source 
IEC 61508,ISO 26262 standards highly recommend single-exit rule.

Reduce the count of the "return entries".
Fix the violations which is comply with the cases list below:
1.Function has 2 return entries.
2.The first return entry is used to return the error code of
checking variable whether is valid.

Fix the violations in "if else" format.

Tracked-On: #861
Signed-off-by: Huihuang Shi <huihuang.shi@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Huihuang Shi 2018-11-29 09:43:42 +08:00 committed by lijinxia
parent 17a6d9446e
commit 667e0444a9
1 changed files with 112 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
hypervisor/dm/vpic.c
View File

@ -35,12 +35,15 @@ static void vpic_set_pinstate(struct acrn_vpic *vpic, uint8_t pin, uint8_t level
static inline bool master_pic(const struct acrn_vpic *vpic, struct i8259_reg_state *i8259) static inline bool master_pic(const struct acrn_vpic *vpic, struct i8259_reg_state *i8259)
{ {
bool ret;
if (i8259 == &vpic->i8259[0]) { if (i8259 == &vpic->i8259[0]) {
return true; ret = true;
} else { } else {
return false; ret = false;
} }
return ret;
} }
static inline uint8_t vpic_get_highest_isrpin(const struct i8259_reg_state *i8259) static inline uint8_t vpic_get_highest_isrpin(const struct i8259_reg_state *i8259)
@ -207,8 +210,10 @@ static void vpic_notify_intr(struct acrn_vpic *vpic)
} }
} }
static int vpic_icw1(const struct acrn_vpic *vpic, struct i8259_reg_state *i8259, uint8_t val) static int32_t vpic_icw1(const struct acrn_vpic *vpic, struct i8259_reg_state *i8259, uint8_t val)
{ {
int32_t ret;
dev_dbg(ACRN_DBG_PIC, "vm 0x%x: i8259 icw1 0x%x\n", dev_dbg(ACRN_DBG_PIC, "vm 0x%x: i8259 icw1 0x%x\n",
vpic->vm, val); vpic->vm, val);
@ -224,17 +229,16 @@ static int vpic_icw1(const struct acrn_vpic *vpic, struct i8259_reg_state *i8259
if ((val & ICW1_SNGL) != 0) { if ((val & ICW1_SNGL) != 0) {
dev_dbg(ACRN_DBG_PIC, "vpic cascade mode required\n"); dev_dbg(ACRN_DBG_PIC, "vpic cascade mode required\n");
return -1; ret = -1;
} } else if ((val & ICW1_IC4) == 0U) {
if ((val & ICW1_IC4) == 0U) {
dev_dbg(ACRN_DBG_PIC, "vpic icw4 required\n"); dev_dbg(ACRN_DBG_PIC, "vpic icw4 required\n");
return -1; ret = -1;
} else {
i8259->icw_num++;
ret = 0;
} }
i8259->icw_num++; return ret;
return 0;
} }
static int vpic_icw2(const struct acrn_vpic *vpic, struct i8259_reg_state *i8259, uint8_t val) static int vpic_icw2(const struct acrn_vpic *vpic, struct i8259_reg_state *i8259, uint8_t val)
@ -259,17 +263,18 @@ static int vpic_icw3(const struct acrn_vpic *vpic, struct i8259_reg_state *i8259
return 0; return 0;
} }
static int vpic_icw4(const struct acrn_vpic *vpic, struct i8259_reg_state *i8259, uint8_t val) static int32_t vpic_icw4(const struct acrn_vpic *vpic, struct i8259_reg_state *i8259, uint8_t val)
{ {
int32_t ret;
dev_dbg(ACRN_DBG_PIC, "vm 0x%x: i8259 icw4 0x%x\n", dev_dbg(ACRN_DBG_PIC, "vm 0x%x: i8259 icw4 0x%x\n",
vpic->vm, val); vpic->vm, val);
if ((val & ICW4_8086) == 0U) { if ((val & ICW4_8086) == 0U) {
dev_dbg(ACRN_DBG_PIC, dev_dbg(ACRN_DBG_PIC,
"vpic microprocessor mode required\n"); "vpic microprocessor mode required\n");
return -1; ret = -1;
} } else {
if ((val & ICW4_AEOI) != 0U) { if ((val & ICW4_AEOI) != 0U) {
i8259->aeoi = true; i8259->aeoi = true;
} }
@ -286,8 +291,10 @@ static int vpic_icw4(const struct acrn_vpic *vpic, struct i8259_reg_state *i8259
i8259->icw_num = 0U; i8259->icw_num = 0U;
i8259->ready = true; i8259->ready = true;
ret = 0;
}
return 0; return ret;
} }
static int vpic_ocw1(const struct acrn_vpic *vpic, struct i8259_reg_state *i8259, uint8_t val) static int vpic_ocw1(const struct acrn_vpic *vpic, struct i8259_reg_state *i8259, uint8_t val)
@ -405,10 +412,7 @@ static void vpic_set_pinstate(struct acrn_vpic *vpic, uint8_t pin,
uint8_t old_lvl; uint8_t old_lvl;
bool lvl_trigger; bool lvl_trigger;
if (pin >= NR_VPIC_PINS_TOTAL) { if (pin < NR_VPIC_PINS_TOTAL) {
return;
}
i8259 = &vpic->i8259[pin >> 3U]; i8259 = &vpic->i8259[pin >> 3U];
old_lvl = i8259->pin_state[pin & 0x7U]; old_lvl = i8259->pin_state[pin & 0x7U];
if (level != 0U) { if (level != 0U) {
@ -434,6 +438,7 @@ static void vpic_set_pinstate(struct acrn_vpic *vpic, uint8_t pin,
dev_dbg(ACRN_DBG_PIC, "pic pin%hhu: %s, ignored\n", dev_dbg(ACRN_DBG_PIC, "pic pin%hhu: %s, ignored\n",
pin, (level != 0U) ? "asserted" : "deasserted"); pin, (level != 0U) ? "asserted" : "deasserted");
} }
}
} }
/** /**
@ -547,13 +552,11 @@ void vpic_pending_intr(struct acrn_vm *vm, uint32_t *vecptr)
*/ */
if (pin >= NR_VPIC_PINS_PER_CHIP) { if (pin >= NR_VPIC_PINS_PER_CHIP) {
*vecptr = VECTOR_INVALID; *vecptr = VECTOR_INVALID;
spinlock_release(&(vpic->lock)); } else {
return;
}
*vecptr = i8259->irq_base + pin; *vecptr = i8259->irq_base + pin;
dev_dbg(ACRN_DBG_PIC, "Got pending vector 0x%x\n", *vecptr); dev_dbg(ACRN_DBG_PIC, "Got pending vector 0x%x\n", *vecptr);
}
spinlock_release(&(vpic->lock)); spinlock_release(&(vpic->lock));
} }
@ -698,24 +701,25 @@ static int vpic_write(struct acrn_vpic *vpic, struct i8259_reg_state *i8259,
return error; return error;
} }
static int vpic_master_handler(struct acrn_vm *vm, bool in, uint16_t port, static int32_t vpic_master_handler(struct acrn_vm *vm, bool in, uint16_t port,
size_t bytes, uint32_t *eax) size_t bytes, uint32_t *eax)
{ {
struct acrn_vpic *vpic; struct acrn_vpic *vpic;
struct i8259_reg_state *i8259; struct i8259_reg_state *i8259;
int32_t ret;
vpic = vm_pic(vm); vpic = vm_pic(vm);
i8259 = &vpic->i8259[0]; i8259 = &vpic->i8259[0];
if (bytes != 1U) { if (bytes != 1U) {
return -1; ret = -1;
} else if (in) {
ret = vpic_read(vpic, i8259, port, eax);
} else {
ret = vpic_write(vpic, i8259, port, eax);
} }
if (in) { return ret;
return vpic_read(vpic, i8259, port, eax);
}
return vpic_write(vpic, i8259, port, eax);
} }
static uint32_t vpic_master_io_read(struct acrn_vm *vm, uint16_t addr, size_t width) static uint32_t vpic_master_io_read(struct acrn_vm *vm, uint16_t addr, size_t width)
@ -740,24 +744,25 @@ static void vpic_master_io_write(struct acrn_vm *vm, uint16_t addr, size_t width
} }
} }
static int vpic_slave_handler(struct acrn_vm *vm, bool in, uint16_t port, static int32_t vpic_slave_handler(struct acrn_vm *vm, bool in, uint16_t port,
size_t bytes, uint32_t *eax) size_t bytes, uint32_t *eax)
{ {
struct acrn_vpic *vpic; struct acrn_vpic *vpic;
struct i8259_reg_state *i8259; struct i8259_reg_state *i8259;
int32_t ret;
vpic = vm_pic(vm); vpic = vm_pic(vm);
i8259 = &vpic->i8259[1]; i8259 = &vpic->i8259[1];
if (bytes != 1U) { if (bytes != 1U) {
return -1; ret = -1;
} else if (in) {
ret = vpic_read(vpic, i8259, port, eax);
} else {
ret = vpic_write(vpic, i8259, port, eax);
} }
if (in) { return ret;
return vpic_read(vpic, i8259, port, eax);
}
return vpic_write(vpic, i8259, port, eax);
} }
static uint32_t vpic_slave_io_read(struct acrn_vm *vm, uint16_t addr, size_t width) static uint32_t vpic_slave_io_read(struct acrn_vm *vm, uint16_t addr, size_t width)
@ -782,19 +787,17 @@ static void vpic_slave_io_write(struct acrn_vm *vm, uint16_t addr, size_t width,
} }
} }
static int vpic_elc_handler(struct acrn_vm *vm, bool in, uint16_t port, size_t bytes, static int32_t vpic_elc_handler(struct acrn_vm *vm, bool in, uint16_t port, size_t bytes,
uint32_t *eax) uint32_t *eax)
{ {
struct acrn_vpic *vpic; struct acrn_vpic *vpic;
bool is_master; bool is_master;
int32_t ret;
vpic = vm_pic(vm); vpic = vm_pic(vm);
is_master = (port == IO_ELCR1); is_master = (port == IO_ELCR1);
if (bytes != 1U) { if (bytes == 1U) {
return -1;
}
spinlock_obtain(&(vpic->lock)); spinlock_obtain(&(vpic->lock));
if (in) { if (in) {
@ -822,8 +825,12 @@ static int vpic_elc_handler(struct acrn_vm *vm, bool in, uint16_t port, size_t b
} }
spinlock_release(&(vpic->lock)); spinlock_release(&(vpic->lock));
ret = 0;
} else {
ret = -1;
}
return 0; return ret;
} }
static uint32_t vpic_elc_io_read(struct acrn_vm *vm, uint16_t addr, size_t width) static uint32_t vpic_elc_io_read(struct acrn_vm *vm, uint16_t addr, size_t width)