[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/9] pc-bios/s390-ccw: don't try to read the next block if end of
From: |
Thomas Huth |
Subject: |
[PULL 1/9] pc-bios/s390-ccw: don't try to read the next block if end of chunk is reached |
Date: |
Mon, 10 May 2021 09:35:16 +0200 |
From: Marc Hartmayer <mhartmay@linux.ibm.com>
Don't read the block if a null block number is reached, because this means that
the end of chunk is reached.
Reviewed-by: Collin Walling <walling@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Message-Id: <20210416074736.17409-1-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 44df7d16af..b46997c0b7 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -213,7 +213,7 @@ static int eckd_get_boot_menu_index(block_number_t
s1b_block_nr)
next_block_nr = eckd_block_num(&s1b->seek[i + 1].chs);
}
- if (next_block_nr) {
+ if (next_block_nr && !is_null_block_number(next_block_nr)) {
read_block(next_block_nr, s2_next_blk,
"Cannot read stage2 boot loader");
}
--
2.27.0
- [PULL 0/9] s390-ccw bios update, Thomas Huth, 2021/05/10
- [PULL 1/9] pc-bios/s390-ccw: don't try to read the next block if end of chunk is reached,
Thomas Huth <=
- [PULL 2/9] pc-bios/s390-ccw/bootmap: Silence compiler warning from Clang, Thomas Huth, 2021/05/10
- [PULL 3/9] pc-bios/s390-ccw: Use reset_psw pointer instead of hard-coded null pointer, Thomas Huth, 2021/05/10
- [PULL 5/9] pc-bios/s390-ccw: Silence warning from Clang by marking panic() as noreturn, Thomas Huth, 2021/05/10
- [PULL 4/9] pc-bios/s390-ccw/netboot: Use "-Wl, " prefix to pass parameter to the linker, Thomas Huth, 2021/05/10
- [PULL 7/9] pc-bios/s390-ccw: Silence GCC 11 stringop-overflow warning, Thomas Huth, 2021/05/10
- [PULL 6/9] pc-bios/s390-ccw: Fix the cc-option macro in the Makefile, Thomas Huth, 2021/05/10
- [PULL 8/9] pc-bios/s390-ccw: Allow building with Clang, too, Thomas Huth, 2021/05/10