From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Janosch Frank <frankja@linux.ibm.com>, qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, cohuck@redhat.com, thuth@redhat.com,
david@redhat.com
Subject: Re: [PATCH v3 1/9] pc-bios: s390x: cio.c cleanup and compile fix
Date: Wed, 27 May 2020 10:24:40 +0200 [thread overview]
Message-ID: <78361bb8-5ec5-05f9-4460-76a086c06832@de.ibm.com> (raw)
In-Reply-To: <20200527074920.43669-2-frankja@linux.ibm.com>
On 27.05.20 09:49, Janosch Frank wrote:
> Let's initialize the structs at the beginning to ease reading and also
> zeroing all other fields. This also makes the compiler stop
> complaining about sense_id_ccw.flags being ored into when it's not
> initialized.
>
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
> Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Reviewed-by: David Hildenbrand <david@redhat.com>
> ---
> pc-bios/s390-ccw/cio.c | 40 ++++++++++++++++++++++------------------
> 1 file changed, 22 insertions(+), 18 deletions(-)
>
> diff --git a/pc-bios/s390-ccw/cio.c b/pc-bios/s390-ccw/cio.c
> index 339ec5fbe7..dbae1e240e 100644
> --- a/pc-bios/s390-ccw/cio.c
> +++ b/pc-bios/s390-ccw/cio.c
> @@ -49,13 +49,13 @@ void enable_subchannel(SubChannelId schid)
>
> uint16_t cu_type(SubChannelId schid)
> {
> - Ccw1 sense_id_ccw;
> SenseId sense_data;
> -
> - sense_id_ccw.cmd_code = CCW_CMD_SENSE_ID;
> - sense_id_ccw.cda = ptr2u32(&sense_data);
> - sense_id_ccw.count = sizeof(sense_data);
> - sense_id_ccw.flags |= CCW_FLAG_SLI;
> + Ccw1 sense_id_ccw = {
> + .cmd_code = CCW_CMD_SENSE_ID,
> + .count = sizeof(sense_data),
> + .flags = CCW_FLAG_SLI,
> + .cda = ptr2u32(&sense_data),
> + };
nitpicking, since you change the order anyway you _could_ swap count and flag
to match the order of struct Ccw. Only necessary when redoing.
>
> if (do_cio(schid, CU_TYPE_UNKNOWN, ptr2u32(&sense_id_ccw), CCW_FMT1)) {
> panic("Failed to run SenseID CCw\n");
> @@ -67,13 +67,13 @@ uint16_t cu_type(SubChannelId schid)
> int basic_sense(SubChannelId schid, uint16_t cutype, void *sense_data,
> uint16_t data_size)
> {
> - Ccw1 senseCcw;
> + Ccw1 senseCcw = {
> + .cmd_code = CCW_CMD_BASIC_SENSE,
> + .count = data_size,
> + .cda = ptr2u32(sense_data),
> + };
> Irb irb;
>
> - senseCcw.cmd_code = CCW_CMD_BASIC_SENSE;
> - senseCcw.cda = ptr2u32(sense_data);
> - senseCcw.count = data_size;
> -
here it is fine, due to the lack of flags.
Was this actually a bug before that senseCcw.flags was
not zeroed out?
[...]
Other than that
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
next prev parent reply other threads:[~2020-05-27 8:25 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 7:49 [PATCH v3 0/9] pc-bios: s390x: Cleanup part 1 Janosch Frank
2020-05-27 7:49 ` [PATCH v3 1/9] pc-bios: s390x: cio.c cleanup and compile fix Janosch Frank
2020-05-27 8:24 ` Christian Borntraeger [this message]
2020-05-27 8:34 ` Janosch Frank
2020-05-27 7:49 ` [PATCH v3 2/9] pc-bios: s390x: Consolidate timing functions into time.h Janosch Frank
2020-05-27 8:36 ` Christian Borntraeger
2020-05-27 8:41 ` Janosch Frank
2020-05-27 7:49 ` [PATCH v3 3/9] pc-bios: s390x: Move sleep and yield to helper.h Janosch Frank
2020-05-27 8:34 ` Christian Borntraeger
2020-05-27 8:35 ` Janosch Frank
2020-05-27 7:49 ` [PATCH v3 4/9] pc-bios: s390x: Get rid of magic offsets into the lowcore Janosch Frank
2020-05-27 8:50 ` Christian Borntraeger
2020-05-27 11:23 ` Janosch Frank
2020-05-27 7:49 ` [PATCH v3 5/9] pc-bios: s390x: Rename and use PSW_MASK_ZMODE constant Janosch Frank
2020-05-27 7:49 ` [PATCH v3 6/9] pc-bios: s390x: Use PSW masks where possible and introduce PSW_MASK_SHORT_ADDR Janosch Frank
2020-05-27 7:49 ` [PATCH v3 7/9] pc-bios: s390x: Move panic() into header and add infinite loop Janosch Frank
2020-05-27 7:49 ` [PATCH v3 8/9] pc-bios: s390x: Use ebcdic2ascii table Janosch Frank
2020-05-27 7:49 ` [PATCH v3 9/9] pc-bios: s390x: Make u32 ptr check explicit Janosch Frank
2020-05-27 10:30 ` [PATCH v3 0/9] pc-bios: s390x: Cleanup part 1 no-reply
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=78361bb8-5ec5-05f9-4460-76a086c06832@de.ibm.com \
--to=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--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).