s390x/event-facility.c: remove unneeded labels
PATCH v2 1/1 s390x/event-facility.c: remove unneeded labels
'out' label from write_event_mask() and and write_event_data() can be replaced by 'return'.
The 'out' label from read_event_data() can also be replaced. However, as suggested by Cornelia Huck, instead of simply replacing the 'out' label, let's also change the code flow a bit to make it clearer that sccb events are always handled regardless of the mask for unconditional reads, while selective reads are handled if the mask is valid.
---
This is the v2 of patch 37 sent in the series:
https://patchwork.kernel.org/cover/11319771/
after this review from Cornelia:
https://patchwork.kernel.org/patch/11319847/#23088037
hw/s390x/event-facility.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-)
hw/s390x/event-facility.c +12 -21
@@ -182,11 +182,11 @@ static void write_event_data(SCLPEventFacility *ef, SCCB *sccb) {if (sccb->h.function_code !=SCLP_FC_NORMAL_WRITE ) { sccb->h.response_code =cpu_to_be16 (SCLP_RC_INVALID_FUNCTION ); - goto out; +return ; }if (be16_to_cpu (sccb->h.length) <8 ) { sccb->h.response_code =cpu_to_be16 (SCLP_RC_INSUFFICIENT_SCCB_LENGTH ); - goto out; +return ; }/* first do a sanity check of the write events */ sccb->h.response_code =cpu_to_be16 (write_event_length_check (sccb));
@@ -196,9 +196,6 @@ static void write_event_data(SCLPEventFacility *ef, SCCB *sccb) sccb->h.response_code =cpu_to_be16 (handle_sccb_write_events (ef, sccb)); } - -out: -return ; } static uint16_t handle_sccb_read_events(SCLPEventFacility *ef, SCCB *sccb,
@@ -262,17 +259,18 @@ static void read_event_data(SCLPEventFacility *ef, SCCB *sccb)if (be16_to_cpu (sccb->h.length) !=SCCB_SIZE ) { sccb->h.response_code =cpu_to_be16 (SCLP_RC_INSUFFICIENT_SCCB_LENGTH ); - goto out; +return ; } - sclp_cp_receive_mask = ef->receive_mask; - -/* get active selection mask */ switch (sccb->h.function_code) {case SCLP_UNCONDITIONAL_READ : - sclp_active_selection_mask = sclp_cp_receive_mask; + sccb->h.response_code =cpu_to_be16 ( +handle_sccb_read_events (ef, sccb, ef->receive_mask));break ;case SCLP_SELECTIVE_READ : +/* get active selection mask */ + sclp_cp_receive_mask = ef->receive_mask; +copy_mask ((uint8_t *)&sclp_active_selection_mask, (uint8_t *)&red->mask,sizeof (sclp_active_selection_mask), ef->mask_length); sclp_active_selection_mask =be64_to_cpu (sclp_active_selection_mask);
@@ -280,18 +278,14 @@ static void read_event_data(SCLPEventFacility *ef, SCCB *sccb) (sclp_active_selection_mask & ~sclp_cp_receive_mask)) { sccb->h.response_code = cpu_to_be16(SCLP_RC_INVALID_SELECTION_MASK); - goto out; + } else { + sccb->h.response_code =cpu_to_be16 ( +handle_sccb_read_events (ef, sccb, sclp_active_selection_mask)); }break ;default : sccb->h.response_code =cpu_to_be16 (SCLP_RC_INVALID_FUNCTION ); - goto out; } - sccb->h.response_code =cpu_to_be16 ( -handle_sccb_read_events (ef, sccb, sclp_active_selection_mask)); - -out: -return ; }static void write_event_mask (SCLPEventFacility *ef,SCCB *sccb)
@@ -303,7 +297,7 @@ static void write_event_mask(SCLPEventFacility *ef, SCCB *sccb)if (!mask_length || (mask_length >SCLP_EVENT_MASK_LEN_MAX ) || ((mask_length !=4 ) && !ef->allow_all_mask_sizes)) { sccb->h.response_code =cpu_to_be16 (SCLP_RC_INVALID_MASK_LENGTH ); - goto out; +return ; }/*
@@ -328,9 +322,6 @@ static void write_event_mask(SCLPEventFacility *ef, SCCB *sccb) sccb->h.response_code =cpu_to_be16 (SCLP_RC_NORMAL_COMPLETION ); ef->mask_length = mask_length; - -out: -return ; }/* qemu object creation and initialization functions */
Signature · 1 line
2.24.1
Quoted 10 lines · Daniel Henrique Barboza
'out' label from
write_event_mask()and andwrite_event_data()can be replaced by 'return'.The 'out' label from
read_event_data()can also be replaced. However, as suggested by Cornelia Huck, instead of simply replacing the 'out' label, let's also change the code flow a bit to make it clearer that sccb events are always handled regardless of the mask for unconditional reads, while selective reads are handled if the mask is valid.
Quoted 5 lines
CC Cornelia Huck <[email protected]>CC Thomas Huth <[email protected]>CC Halil Pasic <[email protected]>CC Christian Borntraeger <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>
Wow, that cleans up quite a bit of goto-spaghetti-code!
Cornelia Huck
AppliedQuoted 1 line · On Wed, 8 Jan 2020 11:46:07 -0300 Daniel Henrique Barboza…
'out' label from
write_event_mask()and andwrite_event_data()
s/and and/and/
Quoted 18 lines
can be replaced by 'return'.
The 'out' label from
read_event_data()can also be replaced. However, as suggested by Cornelia Huck, instead of simply replacing the 'out' label, let's also change the code flow a bit to make it clearer that sccb events are always handled regardless of the mask for unconditional reads, while selective reads are handled if the mask is valid.CC Cornelia Huck <[email protected]>CC Thomas Huth <[email protected]>CC Halil Pasic <[email protected]>CC Christian Borntraeger <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>---
This is the v2 of patch 37 sent in the series:
Quoted 8 lines
https://patchwork.kernel.org/cover/11319771/
after this review from Cornelia:
https://patchwork.kernel.org/patch/11319847/#23088037
hw/s390x/event-facility.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-)
Thanks, applied.