From: Kevin Wolf <kwolf@redhat.com>
Date: Tue, 7 Mar 2023 15:53:18 +0000 (+0100)
Subject: pflash: Fix blk_pread_nonzeroes()
X-Git-Tag: v8.0.0-rc0~19^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c6f3f65eab277d57f351823d0168e7268492ef5;p=thirdparty%2Fqemu.git

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>
---

diff --git a/hw/block/block.c b/hw/block/block.c
index af0710e4778..9f52ee6e728 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;
             }