* [PATCH] pc-bios/s390-ccw: don't try to read the next block if end of chunk is reached
@ 2021-04-16 7:47 Marc Hartmayer
2021-04-16 12:56 ` Thomas Huth
0 siblings, 1 reply; 2+ messages in thread
From: Marc Hartmayer @ 2021-04-16 7:47 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-s390x, Thomas Huth, Collin L. Walling
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>
---
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 44df7d16afca..b46997c0b7c1 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.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] pc-bios/s390-ccw: don't try to read the next block if end of chunk is reached
2021-04-16 7:47 [PATCH] pc-bios/s390-ccw: don't try to read the next block if end of chunk is reached Marc Hartmayer
@ 2021-04-16 12:56 ` Thomas Huth
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Huth @ 2021-04-16 12:56 UTC (permalink / raw)
To: Marc Hartmayer, qemu-devel; +Cc: qemu-s390x, Collin L. Walling
On 16/04/2021 09.47, Marc Hartmayer wrote:
> 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>
> ---
> 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 44df7d16afca..b46997c0b7c1 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");
> }
Commit 468184ec9024f4f7b5 was already a similar fix ... I wonder whether we
have any more of those?
Anyway,
Acked-by: Thomas Huth <thuth@redhat.com>
and I'll queue it for my next pull request.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-16 12:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-16 7:47 [PATCH] pc-bios/s390-ccw: don't try to read the next block if end of chunk is reached Marc Hartmayer
2021-04-16 12:56 ` Thomas Huth
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).