From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
qemu-s390x@nongnu.org, cohuck@redhat.com
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 [thread overview]
Message-ID: <20210510073524.85951-2-thuth@redhat.com> (raw)
In-Reply-To: <20210510073524.85951-1-thuth@redhat.com>
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
next prev parent reply other threads:[~2021-05-10 7:37 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-10 7:35 [PULL 0/9] s390-ccw bios update Thomas Huth
2021-05-10 7:35 ` Thomas Huth [this message]
2021-05-10 7:35 ` [PULL 2/9] pc-bios/s390-ccw/bootmap: Silence compiler warning from Clang Thomas Huth
2021-05-10 7:35 ` [PULL 3/9] pc-bios/s390-ccw: Use reset_psw pointer instead of hard-coded null pointer Thomas Huth
2021-05-10 7:35 ` [PULL 4/9] pc-bios/s390-ccw/netboot: Use "-Wl, " prefix to pass parameter to the linker Thomas Huth
2021-05-10 7:35 ` [PULL 5/9] pc-bios/s390-ccw: Silence warning from Clang by marking panic() as noreturn Thomas Huth
2021-05-10 7:35 ` [PULL 6/9] pc-bios/s390-ccw: Fix the cc-option macro in the Makefile Thomas Huth
2021-05-10 7:35 ` [PULL 7/9] pc-bios/s390-ccw: Silence GCC 11 stringop-overflow warning Thomas Huth
2021-05-10 7:35 ` [PULL 8/9] pc-bios/s390-ccw: Allow building with Clang, too Thomas Huth
2021-05-12 11:53 ` Philippe Mathieu-Daudé
2021-05-12 13:40 ` Thomas Huth
2021-05-12 14:00 ` Thomas Huth
2021-05-12 14:51 ` Thomas Huth
2021-05-12 14:09 ` Philippe Mathieu-Daudé
2021-05-10 7:35 ` [PULL 9/9] pc-bios/s390: Update the s390-ccw bios binaries with the Clang and other fixes Thomas Huth
2021-05-12 7:53 ` [PULL 0/9] s390-ccw bios update Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210510073524.85951-2-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).