qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 7/8] pc-bios: s390x: Replace 0x00 with 0x0 or 0
Date: Tue, 24 Mar 2020 11:08:46 -0400	[thread overview]
Message-ID: <20200324150847.10476-8-frankja@linux.ibm.com> (raw)
In-Reply-To: <20200324150847.10476-1-frankja@linux.ibm.com>

0x00 looks odd, time to replace it with 0 or 0x0 (for pointers).

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
---
 pc-bios/s390-ccw/dasd-ipl.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pc-bios/s390-ccw/dasd-ipl.c b/pc-bios/s390-ccw/dasd-ipl.c
index b932531e6f838405..764ee89e92e3ae8d 100644
--- a/pc-bios/s390-ccw/dasd-ipl.c
+++ b/pc-bios/s390-ccw/dasd-ipl.c
@@ -98,18 +98,18 @@ static int run_dynamic_ccw_program(SubChannelId schid, uint16_t cutype,
 
 static void make_readipl(void)
 {
-    Ccw0 *ccwIplRead = (Ccw0 *)0x00;
+    Ccw0 *ccwIplRead = (Ccw0 *)0x0;
 
     /* Create Read IPL ccw at address 0 */
     ccwIplRead->cmd_code = CCW_CMD_READ_IPL;
-    ccwIplRead->cda = 0x00; /* Read into address 0x00 in main memory */
+    ccwIplRead->cda = 0x0; /* Read into address 0x00 in main memory */
     ccwIplRead->chain = 0; /* Chain flag */
     ccwIplRead->count = 0x18; /* Read 0x18 bytes of data */
 }
 
 static void run_readipl(SubChannelId schid, uint16_t cutype)
 {
-    if (do_cio(schid, cutype, 0x00, CCW_FMT0)) {
+    if (do_cio(schid, cutype, 0x0, CCW_FMT0)) {
         panic("dasd-ipl: Failed to run Read IPL channel program\n");
     }
 }
@@ -133,10 +133,10 @@ static void check_ipl2(uint32_t ipl2_addr)
 {
     Ccw0 *ccw = u32toptr(ipl2_addr);
 
-    if (ipl2_addr == 0x00) {
+    if (ipl2_addr == 0) {
         panic("IPL2 address invalid. Is this disk really bootable?\n");
     }
-    if (ccw->cmd_code == 0x00) {
+    if (ccw->cmd_code == 0) {
         panic("IPL2 ccw data invalid. Is this disk really bootable?\n");
     }
 }
@@ -161,7 +161,7 @@ static void ipl1_fixup(void)
     memcpy(ccwRead, (void *)0x08, 16);
 
     /* Disable chaining so we don't TIC to IPL2 channel program */
-    ccwRead->chain = 0x00;
+    ccwRead->chain = 0;
 
     ccwSeek->cmd_code = CCW_CMD_DASD_SEEK;
     ccwSeek->cda = ptr2u32(seekData);
@@ -206,7 +206,7 @@ static void run_ipl2(SubChannelId schid, uint16_t cutype, uint32_t addr)
  */
 void dasd_ipl(SubChannelId schid, uint16_t cutype)
 {
-    PSWLegacy *pswl = (PSWLegacy *) 0x00;
+    PSWLegacy *pswl = (PSWLegacy *) 0x0;
     uint32_t ipl2_addr;
 
     /* Construct Read IPL CCW and run it to read IPL1 from boot disk */
-- 
2.25.1



  parent reply	other threads:[~2020-03-24 15:14 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-24 15:08 [PATCH 0/8] pc-bios: s390x: Cleanup part 1 Janosch Frank
2020-03-24 15:08 ` [PATCH 1/8] pc-bios: s390x: Consolidate timing functions into time.h Janosch Frank
2020-03-27 10:21   ` David Hildenbrand
2020-03-24 15:08 ` [PATCH 2/8] pc-bios: s390x: Get rid of magic offsets into the lowcore Janosch Frank
2020-03-27 10:25   ` David Hildenbrand
2020-03-27 10:33     ` Janosch Frank
2020-03-24 15:08 ` [PATCH 3/8] pc-bios: s390x: Rename and use PSW_MASK_ZMODE constant Janosch Frank
2020-04-30 15:29   ` David Hildenbrand
2020-03-24 15:08 ` [PATCH 4/8] pc-bios: s390x: Use PSW masks where possible Janosch Frank
2020-04-30 15:34   ` David Hildenbrand
2020-03-24 15:08 ` [PATCH 5/8] pc-bios: s390x: Move panic() into header and add infinite loop Janosch Frank
2020-04-07  7:25   ` Cornelia Huck
2020-05-14 11:27     ` Janosch Frank
2020-05-14 11:49       ` Cornelia Huck
2020-04-30 15:42   ` David Hildenbrand
2020-05-04  6:46     ` Janosch Frank
2020-05-04  7:37       ` David Hildenbrand
2020-03-24 15:08 ` [PATCH 6/8] pc-bios: s390x: Use ebcdic2ascii table Janosch Frank
2020-04-30 15:35   ` David Hildenbrand
2020-03-24 15:08 ` Janosch Frank [this message]
2020-04-30 15:36   ` [PATCH 7/8] pc-bios: s390x: Replace 0x00 with 0x0 or 0 David Hildenbrand
2020-05-14 11:32     ` Janosch Frank
2020-03-24 15:08 ` [PATCH 8/8] pc-bios: s390x: Make u32 ptr check explicit Janosch Frank
2020-04-30 15:37   ` David Hildenbrand
2020-03-24 17:02 ` [PATCH 0/8] pc-bios: s390x: Cleanup part 1 no-reply
2020-04-29 12:11 ` Janosch Frank
2020-04-30 14:50   ` David Hildenbrand
2020-05-14 10:59     ` Cornelia Huck
2020-05-14 11:20       ` Janosch Frank

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=20200324150847.10476-8-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).