From: Marc Hartmayer Date: Thu, 24 Sep 2020 08:59:25 +0000 (+0200) Subject: pc-bios/s390-ccw: break loop if a null block number is reached X-Git-Tag: v5.2.0-rc0~70^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=468184ec9024f4f7b55247f70ec57554e8a500d7;p=thirdparty%2Fqemu.git pc-bios/s390-ccw: break loop if a null block number is reached 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 Signed-off-by: Marc Hartmayer Message-Id: <20200924085926.21709-3-mhartmay@linux.ibm.com> Signed-off-by: Thomas Huth --- diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c index 767bb612dbd..942fba3fa75 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; }