summaryrefslogtreecommitdiff
path: root/pc-bios
diff options
context:
space:
mode:
authorMarc Hartmayer <mhartmay@linux.ibm.com>2021-04-16 09:47:36 +0200
committerThomas Huth <thuth@redhat.com>2021-05-09 18:14:31 +0200
commita6625d38cce3901a7c1cba069f0abcf743a293f1 (patch)
tree20bd2320c0b0c680a340285447f1108c965edfee /pc-bios
parentd90f154867ec0ec22fd719164b88716e8fd48672 (diff)
downloadqemu-a6625d38cce3901a7c1cba069f0abcf743a293f1.zip
pc-bios/s390-ccw: don't try to read the next block if end of chunk is reached
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>
Diffstat (limited to 'pc-bios')
-rw-r--r--pc-bios/s390-ccw/bootmap.c2
1 files changed, 1 insertions, 1 deletions
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");
}