From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Date: Fri, 13 Jan 2023 20:42:05 +0000 (+0100)
Subject: block-backend: use bdrv_getlength instead of blk_getlength
X-Git-Tag: v8.0.0-rc0~78^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d886257d84dd7c3d3f04c3b1e2e4749b47541ee5;p=thirdparty%2Fqemu.git

block-backend: use bdrv_getlength instead of blk_getlength

The only difference is that blk_ checks if the block is available,
but this check is already performed above in blk_check_byte_request().

This is in preparation for the graph rdlock, which will be taken
by both the callers of blk_check_byte_request() and blk_getlength().

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20230113204212.359076-8-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block/block-backend.c b/block/block-backend.c
index d698cc3f33c..7d4b08ee457 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -1253,7 +1253,7 @@ static int blk_check_byte_request(BlockBackend *blk, int64_t offset,
     }
 
     if (!blk->allow_write_beyond_eof) {
-        len = blk_getlength(blk);
+        len = bdrv_getlength(blk_bs(blk));
         if (len < 0) {
             return len;
         }