aboutsummaryrefslogtreecommitdiff
path: root/hw/block
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2023-03-07 16:53:18 +0100
committerCédric Le Goater <clg@kaod.org>2023-03-07 16:53:18 +0100
commit3c6f3f65eab277d57f351823d0168e7268492ef5 (patch)
tree31b7dc8b7dd582fb75565303cc8b90e661ad765a /hw/block
parent11aeb4b8c125d20181421fe2996d36285c5d62f7 (diff)
downloadqemu-3c6f3f65eab277d57f351823d0168e7268492ef5.zip
qemu-3c6f3f65eab277d57f351823d0168e7268492ef5.tar.gz
qemu-3c6f3f65eab277d57f351823d0168e7268492ef5.tar.bz2
pflash: Fix blk_pread_nonzeroes()
Commit a4b15a8b introduced a new function blk_pread_nonzeroes(). Instead of reading directly from the root node of the BlockBackend, it reads from its 'file' child node. This can happen to mostly work for raw images (as long as the 'raw' format driver is in use, but not actually doing anything), but it breaks everything else. Fix it to read from the root node instead. Fixes: a4b15a8b9ef25b44fa92a4825312622600c1f37c Reported-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20230307140230.59158-1-kwolf@redhat.com> Signed-off-by: Cédric Le Goater <clg@kaod.org>
Diffstat (limited to 'hw/block')
-rw-r--r--hw/block/block.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/block/block.c b/hw/block/block.c
index af0710e..9f52ee6 100644
--- a/hw/block/block.c
+++ b/hw/block/block.c
@@ -39,8 +39,7 @@ static int blk_pread_nonzeroes(BlockBackend *blk, hwaddr size, void *buf)
return ret;
}
if (!(ret & BDRV_BLOCK_ZERO)) {
- ret = bdrv_pread(bs->file, offset, bytes,
- (uint8_t *) buf + offset, 0);
+ ret = blk_pread(blk, offset, bytes, (uint8_t *) buf + offset, 0);
if (ret < 0) {
return ret;
}