* Halil Pasic <pa...@linux.vnet.ibm.com> [2017-10-17 16:04:51 +0200]:
> Simplify the error handling of the cSCH. Let the code detecting the
> condition tell (in a less ambiguous way) how it's to be handled. No
> changes in behavior.
>
> Signed-off-by: Halil Pasic <pa...@linux.vnet.ibm.com>
> ---
[...]
> diff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c
> index 4ad07e9181..fd659e77a5 100644
> --- a/target/s390x/ioinst.c
> +++ b/target/s390x/ioinst.c
> @@ -60,8 +60,6 @@ void ioinst_handle_csch(S390CPU *cpu, uint64_t reg1)
> {
> int cssid, ssid, schid, m;
> SubchDev *sch;
> - int ret = -ENODEV;
> - int cc;
>
> if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid)) {
> program_interrupt(&cpu->env, PGM_OPERAND, 4);
> @@ -69,15 +67,11 @@ void ioinst_handle_csch(S390CPU *cpu, uint64_t reg1)
> }
> trace_ioinst_sch_id("csch", cssid, ssid, schid);
> sch = css_find_subch(m, cssid, ssid, schid);
> - if (sch && css_subch_visible(sch)) {
> - ret = css_do_csch(sch);
> - }
> - if (ret == -ENODEV) {
> - cc = 3;
> - } else {
> - cc = 0;
> + if (!sch || !css_subch_visible(sch)) {
> + setcc(cpu, 3);
Same question here.
> + return;
> }
> - setcc(cpu, cc);
> + setcc(cpu, css_do_csch(sch));
> }
>
> void ioinst_handle_hsch(S390CPU *cpu, uint64_t reg1)
> --
> 2.13.5
>
If we agree to replace 3 with IOINST_CC_NOT_OPERATIONAL, maybe Conny
could fix it. Or we can do that in a following cleanup patch?
W/ or w/o the fix, for now:
Reviewed-by: Dong Jia Shi <bjsdj...@linux.vnet.ibm.com>
--
Dong Jia Shi
