qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
	qemu-s390x@nongnu.org, Cornelia Huck <cohuck@redhat.com>,
	Marc Hartmayer <mhartmay@linux.ibm.com>,
	Janosch Frank <frankja@linux.ibm.com>
Subject: [PULL 10/16] pc-bios/s390-ccw: break loop if a null block number is reached
Date: Tue,  6 Oct 2020 20:31:16 +0200	[thread overview]
Message-ID: <20201006183122.155609-11-thuth@redhat.com> (raw)
In-Reply-To: <20201006183122.155609-1-thuth@redhat.com>

From: Marc Hartmayer <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>
Message-Id: <20200924085926.21709-3-mhartmay@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.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 767bb612db..942fba3fa7 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.18.2



  parent reply	other threads:[~2020-10-06 18:40 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-06 18:31 [PULL 00/16] s390-ccw bios update Thomas Huth
2020-10-06 18:31 ` [PULL 01/16] pc-bios/s390-ccw/Makefile: Compile with -std=gnu99, -fwrapv and -fno-common Thomas Huth
2020-10-06 18:31 ` [PULL 02/16] pc-bios/s390-ccw: Move ipl-related code from main() into a separate function Thomas Huth
2020-10-06 18:31 ` [PULL 03/16] pc-bios/s390-ccw: Introduce ENODEV define and remove guards of others Thomas Huth
2020-10-06 18:31 ` [PULL 04/16] pc-bios/s390-ccw: Move the inner logic of find_subch() to a separate function Thomas Huth
2020-10-06 18:31 ` [PULL 05/16] pc-bios/s390-ccw: Do not bail out early if not finding a SCSI disk Thomas Huth
2020-10-06 18:31 ` [PULL 06/16] pc-bios/s390-ccw: Scan through all devices if no boot device specified Thomas Huth
2020-10-06 18:31 ` [PULL 07/16] pc-bios/s390-ccw: Allow booting in case the first virtio-blk disk is bad Thomas Huth
2020-10-06 18:31 ` [PULL 08/16] pc-bios/s390-ccw/main: Remove superfluous call to enable_subchannel() Thomas Huth
2020-10-06 18:31 ` [PULL 09/16] pc-bios/s390-ccw: fix off-by-one error Thomas Huth
2020-10-06 18:31 ` Thomas Huth [this message]
2020-10-06 18:31 ` [PULL 11/16] pc-bios: s390x: Fix bootmap.c zipl component entry data handling Thomas Huth
2020-10-06 18:31 ` [PULL 12/16] pc-bios: s390x: Save PSW rework Thomas Huth
2020-10-06 18:31 ` [PULL 13/16] pc-bios: s390x: Use reset PSW if avaliable Thomas Huth
2020-10-06 18:31 ` [PULL 14/16] pc-bios: s390x: Go into disabled wait when encountering a PGM exception Thomas Huth
2020-10-06 18:31 ` [PULL 15/16] pc-bios/s390: Update the s390-ccw bios binaries Thomas Huth
2020-10-06 18:31 ` [PULL 16/16] tests/qtest/cdrom: Add more s390x-related boot tests Thomas Huth
2020-10-07  5:59 ` [PULL 00/16] s390-ccw bios update Christian Borntraeger
2020-10-08 10:32 ` Peter Maydell

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=20201006183122.155609-11-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=borntraeger@de.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=frankja@linux.ibm.com \
    --cc=mhartmay@linux.ibm.com \
    --cc=peter.maydell@linaro.org \
    --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).