|
 |
1072c8 |
From 56ae2d8a1ee3a35e2eed4f4baa61f97184189b47 Mon Sep 17 00:00:00 2001
|
|
|
a6baaf |
From: Thomas Huth <thuth@redhat.com>
|
|
|
1072c8 |
Date: Tue, 18 May 2021 13:51:24 -0400
|
|
|
1072c8 |
Subject: [PATCH 4/5] pc-bios/s390-ccw: break loop if a null block number is
|
|
|
a6baaf |
reached
|
|
|
1072c8 |
MIME-Version: 1.0
|
|
|
1072c8 |
Content-Type: text/plain; charset=UTF-8
|
|
|
1072c8 |
Content-Transfer-Encoding: 8bit
|
|
|
a6baaf |
|
|
|
a6baaf |
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
|
1072c8 |
Message-id: <20210518135125.191329-3-thuth@redhat.com>
|
|
|
1072c8 |
Patchwork-id: 101549
|
|
|
1072c8 |
O-Subject: [RHEL-8.5.0 qemu-kvm PATCH 2/3] pc-bios/s390-ccw: break loop if a null block number is reached
|
|
|
1072c8 |
Bugzilla: 1942880
|
|
|
1072c8 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
1072c8 |
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
a6baaf |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
a6baaf |
|
|
|
a6baaf |
Break the loop if `cur_block_nr` is a null block number because this
|
|
|
a6baaf |
means that the end of chunk is reached. In this case we will try to
|
|
|
a6baaf |
boot the default entry.
|
|
|
a6baaf |
|
|
|
a6baaf |
Fixes: ba831b25262a ("s390-ccw: read stage2 boot loader data to find menu")
|
|
|
a6baaf |
Reviewed-by: Collin Walling <walling@linux.ibm.com>
|
|
|
a6baaf |
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
|
|
|
a6baaf |
Message-Id: <20200924085926.21709-3-mhartmay@linux.ibm.com>
|
|
|
a6baaf |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
a6baaf |
(cherry picked from commit 468184ec9024f4f7b55247f70ec57554e8a500d7)
|
|
|
1072c8 |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
a6baaf |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
a6baaf |
---
|
|
|
a6baaf |
pc-bios/s390-ccw/bootmap.c | 2 +-
|
|
|
a6baaf |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
a6baaf |
|
|
|
a6baaf |
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
|
|
|
a6baaf |
index bb6e003270..624f524331 100644
|
|
|
a6baaf |
--- a/pc-bios/s390-ccw/bootmap.c
|
|
|
a6baaf |
+++ b/pc-bios/s390-ccw/bootmap.c
|
|
|
a6baaf |
@@ -192,7 +192,7 @@ static int eckd_get_boot_menu_index(block_number_t s1b_block_nr)
|
|
|
a6baaf |
for (i = 0; i < STAGE2_BLK_CNT_MAX; i++) {
|
|
|
a6baaf |
cur_block_nr = eckd_block_num(&s1b->seek[i].chs);
|
|
|
a6baaf |
|
|
|
a6baaf |
- if (!cur_block_nr) {
|
|
|
a6baaf |
+ if (!cur_block_nr || is_null_block_number(cur_block_nr)) {
|
|
|
a6baaf |
break;
|
|
|
a6baaf |
}
|
|
|
a6baaf |
|
|
|
a6baaf |
--
|
|
|
a6baaf |
2.27.0
|
|
|
a6baaf |
|