From: Janosch Frank <frankja@linux.ibm.com>
To: Pierre Morel <pmorel@linux.ibm.com>, kvm@vger.kernel.org
Cc: linux-s390@vger.kernel.org, david@redhat.com, thuth@redhat.com,
cohuck@redhat.com, imbrenda@linux.ibm.com
Subject: Re: [kvm-unit-tests PATCH v1 2/5] s390x: css: simplifications of the tests
Date: Mon, 1 Feb 2021 13:22:52 +0100 [thread overview]
Message-ID: <0069eb2c-7b9c-1582-c86f-0c68a147d608@linux.ibm.com> (raw)
In-Reply-To: <10f3108b-c1fe-7da9-7153-803690d311d4@linux.ibm.com>
On 2/1/21 1:15 PM, Pierre Morel wrote:
>
>
> On 2/1/21 11:11 AM, Janosch Frank wrote:
>> On 1/29/21 3:34 PM, Pierre Morel wrote:
>
> ...snip...
>
>>> diff --git a/lib/s390x/css_lib.c b/lib/s390x/css_lib.c
>>> index fe05021..f300969 100644
>>> --- a/lib/s390x/css_lib.c
>>> +++ b/lib/s390x/css_lib.c
>>> @@ -118,6 +118,31 @@ out:
>>> return schid;
>>> }
>>>
>>> +/*
>>> + * css_enable: enable the subchannel with the specified ISC
>>
>> enabled or enable?
>
> Forgot to change the cut and paste :(
>
> /*
> * css_enabled: report if the sub channel is enabled
>
>>
>> I.e. do you test if it is enabled or do you want to enable it.
>>
>>> + * @schid: Subchannel Identifier
>>> + * Return value:
>>> + * true if the subchannel is enabled
>>> + * false otherwise
>>> + */
>>> +bool css_enabled(int schid)
>>> +{
>>> + struct pmcw *pmcw = &schib.pmcw;
>>> + int cc;
>>> +
>>> + cc = stsch(schid, &schib);
>>> + if (cc) {
>>> + report_info("stsch: updating sch %08x failed with cc=%d",
>>> + schid, cc);
>>> + return false;
>>> + }
>>> +
>>> + if (!(pmcw->flags & PMCW_ENABLE)) {
>>> + report_info("stsch: sch %08x not enabled", schid);
>>> + return 0;
>>
>> Please stay with true/false or change the return type to int and use ints.
>
> yes
>
>>
>>> + }
>>> + return true;
>>> +}
>
> ...snip...
>
>>> @@ -129,16 +120,21 @@ static void test_sense(void)
>>> report_info("reserved 0x%02x cu_type 0x%04x cu_model 0x%02x dev_type 0x%04x dev_model 0x%02x",
>>> senseid->reserved, senseid->cu_type, senseid->cu_model,
>>> senseid->dev_type, senseid->dev_model);
>>> + report_info("cu_type expected 0x%04x got 0x%04x", (uint16_t)cu_type,
>>> + senseid->cu_type);
>>>
>>> - report(senseid->cu_type == cu_type, "cu_type expected 0x%04x got 0x%04x",
>>> - (uint16_t)cu_type, senseid->cu_type);
>>> + retval = senseid->cu_type == cu_type;
>>>
>>> error:
>>> free_io_mem(ccw, sizeof(*ccw));
>>> error_ccw:
>>> free_io_mem(senseid, sizeof(*senseid));
>>> -error_senseid:
>>> - unregister_io_int_func(css_irq_io);
>>> + return retval;
>>
>> Could you return senseid->cu_type == cu_type here?
>
> It would work for the current code and DEFAULT_CU_TYPE.
> But I do not think it is a good idea due to the goto we have in error
> case before I find that it makes the code less understandable.
>
> Other opinion?
That's why I asked, it wasn't a direct suggestion.
I'm not a big fan of the ret/retval naming but the function is short so
it should be ok.
>
> Thanks for the comments,
> Pierre
>
next prev parent reply other threads:[~2021-02-01 12:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1611930869-25745-1-git-send-email-pmorel@linux.ibm.com>
[not found] ` <1611930869-25745-4-git-send-email-pmorel@linux.ibm.com>
2021-02-02 11:48 ` [kvm-unit-tests PATCH v1 3/5] s390x: css: implementing Set CHannel Monitor Cornelia Huck
2021-02-02 16:15 ` Pierre Morel
2021-02-02 17:32 ` Thomas Huth
2021-02-03 10:09 ` Pierre Morel
[not found] ` <1611930869-25745-6-git-send-email-pmorel@linux.ibm.com>
2021-02-02 11:52 ` [kvm-unit-tests PATCH v1 5/5] s390x: css: testing measurement block format 1 Cornelia Huck
[not found] ` <1611930869-25745-2-git-send-email-pmorel@linux.ibm.com>
2021-02-01 10:01 ` [kvm-unit-tests PATCH v1 1/5] s390x: css: Store CSS Characteristics Janosch Frank
2021-02-01 12:09 ` Pierre Morel
2021-02-02 11:11 ` Cornelia Huck
2021-02-02 14:19 ` Pierre Morel
2021-02-02 17:25 ` Thomas Huth
2021-02-03 10:12 ` Pierre Morel
[not found] ` <1611930869-25745-3-git-send-email-pmorel@linux.ibm.com>
2021-02-01 10:11 ` [kvm-unit-tests PATCH v1 2/5] s390x: css: simplifications of the tests Janosch Frank
2021-02-01 12:15 ` Pierre Morel
2021-02-01 12:22 ` Janosch Frank [this message]
2021-02-02 11:23 ` Cornelia Huck
2021-02-02 14:39 ` Pierre Morel
2021-02-02 17:29 ` Thomas Huth
2021-02-03 10:10 ` Pierre Morel
[not found] ` <1611930869-25745-5-git-send-email-pmorel@linux.ibm.com>
2021-02-02 17:35 ` [kvm-unit-tests PATCH v1 4/5] s390x: css: SCHM tests format 0 Thomas Huth
2021-02-03 10:09 ` Pierre Morel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0069eb2c-7b9c-1582-c86f-0c68a147d608@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pmorel@linux.ibm.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).