Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-09 01:50:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

s390x/event-facility.c: remove unneeded labels

Browse Source 
'out' label from write_event_mask() 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.

CC: Cornelia Huck <cohuck@redhat.com>
CC: Thomas Huth <thuth@redhat.com>
CC: Halil Pasic <pasic@linux.ibm.com>
CC: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20200108144607.878862-1-danielhb413@gmail.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Daniel Henrique Barboza 2020-01-08 11:46:07 -03:00 committed by Cornelia Huck
parent 65569bbf37
commit 9208270b6b
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/s390x/event-facility.c
View File

@ -182,11 +182,11 @@ static void write_event_data(SCLPEventFacility *ef, SCCB *sccb)
{ {
if (sccb->h.function_code != SCLP_FC_NORMAL_WRITE) { if (sccb->h.function_code != SCLP_FC_NORMAL_WRITE) {
sccb->h.response_code = cpu_to_be16(SCLP_RC_INVALID_FUNCTION); sccb->h.response_code = cpu_to_be16(SCLP_RC_INVALID_FUNCTION);
goto out; return;
} }
if (be16_to_cpu(sccb->h.length) < 8) { if (be16_to_cpu(sccb->h.length) < 8) {
sccb->h.response_code = cpu_to_be16(SCLP_RC_INSUFFICIENT_SCCB_LENGTH); sccb->h.response_code = cpu_to_be16(SCLP_RC_INSUFFICIENT_SCCB_LENGTH);
goto out; return;
} }
/* first do a sanity check of the write events */ /* first do a sanity check of the write events */
sccb->h.response_code = cpu_to_be16(write_event_length_check(sccb)); 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 = sccb->h.response_code =
cpu_to_be16(handle_sccb_write_events(ef, sccb)); cpu_to_be16(handle_sccb_write_events(ef, sccb));
} }
out:
return;
} }
static uint16_t handle_sccb_read_events(SCLPEventFacility *ef, SCCB *sccb, 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) { if (be16_to_cpu(sccb->h.length) != SCCB_SIZE) {
sccb->h.response_code = cpu_to_be16(SCLP_RC_INSUFFICIENT_SCCB_LENGTH); 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) { switch (sccb->h.function_code) {
case SCLP_UNCONDITIONAL_READ: 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; break;
case SCLP_SELECTIVE_READ: 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, copy_mask((uint8_t *)&sclp_active_selection_mask, (uint8_t *)&red->mask,
sizeof(sclp_active_selection_mask), ef->mask_length); sizeof(sclp_active_selection_mask), ef->mask_length);
sclp_active_selection_mask = be64_to_cpu(sclp_active_selection_mask); 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)) { (sclp_active_selection_mask & ~sclp_cp_receive_mask)) {
sccb->h.response_code = sccb->h.response_code =
cpu_to_be16(SCLP_RC_INVALID_SELECTION_MASK); 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; break;
default: default:
sccb->h.response_code = cpu_to_be16(SCLP_RC_INVALID_FUNCTION); 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) 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) || if (!mask_length || (mask_length > SCLP_EVENT_MASK_LEN_MAX) ||
((mask_length != 4) && !ef->allow_all_mask_sizes)) { ((mask_length != 4) && !ef->allow_all_mask_sizes)) {
sccb->h.response_code = cpu_to_be16(SCLP_RC_INVALID_MASK_LENGTH); 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); sccb->h.response_code = cpu_to_be16(SCLP_RC_NORMAL_COMPLETION);
ef->mask_length = mask_length; ef->mask_length = mask_length;
out:
return;
} }
/* qemu object creation and initialization functions */ /* qemu object creation and initialization functions */