File 0206-pc-bios-s390-ccw-break-loop-if-a-nu.patch of Package qemu-testsuite

Overview Repositories Revisions Requests Users Attributes Meta

File 0206-pc-bios-s390-ccw-break-loop-if-a-nu.patch of Package qemu-testsuite (Revision 0f51cfd1901be114af9a69d703c0611c)

Currently displaying revision 0f51cfd1901be114af9a69d703c0611c , Show latest

From: Marc Hartmayer <mhartmay@linux.ibm.com>
Date: Thu, 24 Sep 2020 10:59:25 +0200
Subject: pc-bios/s390-ccw: break loop if a null block number is reached

Git-commit: 468184ec9024f4f7b55247f70ec57554e8a500d7
References: bsc#1183979

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>
Signed-off-by: Bruce Rogers <brogers@suse.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 ba6b25fb982cca53e1f8bab1f344..fd72714de4997947dc0063f8c183 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;
         }

Places

File 0206-pc-bios-s390-ccw-break-loop-if-a-nu.patch of Package qemu-testsuite (Revision 0f51cfd1901be114af9a69d703c0611c)

Places