From: Marc Hartmayer <mhartmay@linux.ibm.com>
To: <qemu-devel@nongnu.org>
Cc: Janosch Frank <frankja@linux.ibm.com>,
qemu-s390x <qemu-s390x@nongnu.org>,
Thomas Huth <thuth@redhat.com>,
"Collin L. Walling" <walling@linux.ibm.com>,
David Hildenbrand <david@redhat.com>
Subject: [PATCH 2/3] pc-bios/s390-ccw: break loop if a null block number is reached
Date: Thu, 24 Sep 2020 10:59:25 +0200 [thread overview]
Message-ID: <20200924085926.21709-3-mhartmay@linux.ibm.com> (raw)
In-Reply-To: <20200924085926.21709-1-mhartmay@linux.ibm.com>
Break the loop if `cur_block_nr` is a null block number because this
means that the end of chunk is reached. In this case we will try to
boot the default entry.
Fixes: ba831b25262a ("s390-ccw: read stage2 boot loader data to find menu")
Reviewed-by: Collin Walling <walling@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
---
pc-bios/s390-ccw/bootmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index 0d29dceaa3cc..08f16c5595a3 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -192,7 +192,7 @@ static int eckd_get_boot_menu_index(block_number_t s1b_block_nr)
for (i = 0; i < STAGE2_BLK_CNT_MAX; i++) {
cur_block_nr = eckd_block_num(&s1b->seek[i].chs);
- if (!cur_block_nr) {
+ if (!cur_block_nr || is_null_block_number(cur_block_nr)) {
break;
}
--
2.25.4
next prev parent reply other threads:[~2020-09-24 9:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-24 8:59 [PATCH 0/3] pc-bios: s390x: fix corner cases in booting from ECKD Marc Hartmayer
2020-09-24 8:59 ` [PATCH 1/3] pc-bios/s390-ccw: fix off-by-one error Marc Hartmayer
2020-09-24 10:02 ` Philippe Mathieu-Daudé
2020-09-24 14:09 ` Marc Hartmayer
2020-09-24 11:43 ` Thomas Huth
2020-09-24 8:59 ` Marc Hartmayer [this message]
2020-09-24 11:49 ` [PATCH 2/3] pc-bios/s390-ccw: break loop if a null block number is reached Thomas Huth
2020-09-24 14:10 ` Marc Hartmayer
2020-09-24 8:59 ` [PATCH 3/3] pc-bios/s390-ccw: Update s390-ccw.img bios binary Marc Hartmayer
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=20200924085926.21709-3-mhartmay@linux.ibm.com \
--to=mhartmay@linux.ibm.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=thuth@redhat.com \
--cc=walling@linux.ibm.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).