From: Janosch Frank <frankja@linux.ibm.com>
To: qemu-devel@nongnu.org
Cc: borntraeger@de.ibm.com, qemu-s390x@nongnu.org, cohuck@redhat.com,
david@redhat.com
Subject: [PATCH v2 1/9] pc-bios: s390x: cio.c cleanup and compile fix
Date: Thu, 14 May 2020 08:37:21 -0400 [thread overview]
Message-ID: <20200514123729.156283-2-frankja@linux.ibm.com> (raw)
In-Reply-To: <20200514123729.156283-1-frankja@linux.ibm.com>
Let's initialize the structs at the beginning to ease reading and also
zeroing all other fields. This also makes the compiler stop
compalining 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>
---
pc-bios/s390-ccw/cio.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/pc-bios/s390-ccw/cio.c b/pc-bios/s390-ccw/cio.c
index 339ec5fbe7..63301ebb58 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),
+ };
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;
-
return __do_cio(schid, ptr2u32(&senseCcw), CCW_FMT1, &irb);
}
@@ -314,7 +314,13 @@ static void print_irb_err(Irb *irb)
*/
static int __do_cio(SubChannelId schid, uint32_t ccw_addr, int fmt, Irb *irb)
{
- CmdOrb orb = {};
+ CmdOrb orb = {
+ .fmt = fmt,
+ .pfch = 1, /* QEMU's cio implementation requires prefetch */
+ .c64 = 1, /* QEMU's cio implementation requires 64-bit idaws */
+ .lpm = 0xFF, /* All paths allowed */
+ .cpa = ccw_addr,
+ };
int rc;
IPL_assert(fmt == 0 || fmt == 1, "Invalid ccw format");
@@ -324,12 +330,6 @@ static int __do_cio(SubChannelId schid, uint32_t ccw_addr, int fmt, Irb *irb)
IPL_assert(ccw_addr <= 0xFFFFFF - 8, "Invalid ccw address");
}
- orb.fmt = fmt;
- orb.pfch = 1; /* QEMU's cio implementation requires prefetch */
- orb.c64 = 1; /* QEMU's cio implementation requires 64-bit idaws */
- orb.lpm = 0xFF; /* All paths allowed */
- orb.cpa = ccw_addr;
-
rc = ssch(schid, &orb);
if (rc == 1 || rc == 2) {
/* Subchannel status pending or busy. Eat status and ask for retry. */
--
2.25.1
next prev parent reply other threads:[~2020-05-14 12:39 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-14 12:37 [PATCH v2 0/9] pc-bios: s390x: Cleanup part 1 Janosch Frank
2020-05-14 12:37 ` Janosch Frank [this message]
2020-05-18 11:52 ` [PATCH v2 1/9] pc-bios: s390x: cio.c cleanup and compile fix David Hildenbrand
2020-05-18 12:02 ` Janosch Frank
2020-05-20 19:37 ` Thomas Huth
2020-05-14 12:37 ` [PATCH v2 2/9] pc-bios: s390x: Consolidate timing functions into time.h Janosch Frank
2020-05-18 12:01 ` David Hildenbrand
2020-05-18 12:09 ` Janosch Frank
2020-05-18 12:45 ` David Hildenbrand
2020-05-20 19:53 ` Thomas Huth
2020-05-25 12:20 ` Janosch Frank
2020-05-14 12:37 ` [PATCH v2 3/9] pc-bios: s390x: Get rid of magic offsets into the lowcore Janosch Frank
2020-05-18 12:46 ` David Hildenbrand
2020-05-20 19:57 ` Thomas Huth
2020-05-14 12:37 ` [PATCH v2 4/9] pc-bios: s390x: Rename and use PSW_MASK_ZMODE constant Janosch Frank
2020-05-21 5:44 ` Thomas Huth
2020-05-21 5:47 ` Thomas Huth
2020-05-25 12:03 ` Janosch Frank
2020-05-14 12:37 ` [PATCH v2 5/9] pc-bios: s390x: Use PSW masks where possible Janosch Frank
2020-05-21 5:50 ` Thomas Huth
2020-05-25 12:08 ` Janosch Frank
2020-05-14 12:37 ` [PATCH v2 6/9] pc-bios: s390x: Move panic() into header and add infinite loop Janosch Frank
2020-05-21 5:53 ` Thomas Huth
2020-05-14 12:37 ` [PATCH v2 7/9] pc-bios: s390x: Use ebcdic2ascii table Janosch Frank
2020-05-21 5:56 ` Thomas Huth
2020-05-14 12:37 ` [PATCH v2 8/9] pc-bios: s390x: Replace 0x00 with 0x0 or 0 Janosch Frank
2020-05-18 12:47 ` David Hildenbrand
2020-05-21 6:01 ` Thomas Huth
2020-05-14 12:37 ` [PATCH v2 9/9] pc-bios: s390x: Make u32 ptr check explicit Janosch Frank
2020-05-21 6:03 ` Thomas Huth
2020-05-14 18:43 ` [PATCH v2 0/9] pc-bios: s390x: Cleanup part 1 no-reply
2020-05-20 11:52 ` Cornelia Huck
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=20200514123729.156283-2-frankja@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
/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).