From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, hreitz@redhat.com, eesposit@redhat.com,
pbonzini@redhat.com, vsementsov@yandex-team.ru,
qemu-devel@nongnu.org
Subject: [PATCH 07/14] block: use bdrv_co_refresh_total_sectors when possible
Date: Tue, 13 Dec 2022 09:53:13 +0100 [thread overview]
Message-ID: <20221213085320.95673-8-kwolf@redhat.com> (raw)
In-Reply-To: <20221213085320.95673-1-kwolf@redhat.com>
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
In some places we are sure we are always running in a
coroutine, therefore it's useless to call the generated_co_wrapper,
instead call directly the _co_ function.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/block-backend.c | 6 +++---
block/copy-on-read.c | 2 +-
block/io.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index 5b8da86772..5f6b269a79 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -1235,8 +1235,8 @@ void blk_set_disable_request_queuing(BlockBackend *blk, bool disable)
blk->disable_request_queuing = disable;
}
-static int blk_check_byte_request(BlockBackend *blk, int64_t offset,
- int64_t bytes)
+static coroutine_fn int blk_check_byte_request(BlockBackend *blk,
+ int64_t offset, int64_t bytes)
{
int64_t len;
@@ -1253,7 +1253,7 @@ static int blk_check_byte_request(BlockBackend *blk, int64_t offset,
}
if (!blk->allow_write_beyond_eof) {
- len = bdrv_getlength(blk_bs(blk));
+ len = bdrv_co_getlength(blk_bs(blk));
if (len < 0) {
return len;
}
diff --git a/block/copy-on-read.c b/block/copy-on-read.c
index 815ac1d835..74f7727a02 100644
--- a/block/copy-on-read.c
+++ b/block/copy-on-read.c
@@ -122,7 +122,7 @@ static void cor_child_perm(BlockDriverState *bs, BdrvChild *c,
static int64_t cor_getlength(BlockDriverState *bs)
{
- return bdrv_getlength(bs->file->bs);
+ return bdrv_co_getlength(bs->file->bs);
}
diff --git a/block/io.c b/block/io.c
index 3940026dc1..aef0929202 100644
--- a/block/io.c
+++ b/block/io.c
@@ -3434,7 +3434,7 @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,
if (new_bytes && backing) {
int64_t backing_len;
- backing_len = bdrv_getlength(backing->bs);
+ backing_len = bdrv_co_getlength(backing->bs);
if (backing_len < 0) {
ret = backing_len;
error_setg_errno(errp, -ret, "Could not get backing file size");
@@ -3464,7 +3464,7 @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,
goto out;
}
- ret = bdrv_refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);
+ ret = bdrv_co_refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);
if (ret < 0) {
error_setg_errno(errp, -ret, "Could not refresh total sector count");
} else {
--
2.38.1
next prev parent reply other threads:[~2022-12-13 9:04 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-13 8:53 [PATCH 00/14] block: Move more functions to coroutines Kevin Wolf
2022-12-13 8:53 ` [PATCH 01/14] block-coroutine-wrapper: support void functions Kevin Wolf
2022-12-16 14:21 ` Vladimir Sementsov-Ogievskiy
2022-12-13 8:53 ` [PATCH 02/14] block: Convert bdrv_io_plug() to co_wrapper Kevin Wolf
2022-12-16 14:26 ` Vladimir Sementsov-Ogievskiy
2022-12-19 12:24 ` Emanuele Giuseppe Esposito
2022-12-16 16:12 ` Vladimir Sementsov-Ogievskiy
2022-12-19 12:26 ` Emanuele Giuseppe Esposito
2023-01-13 15:51 ` Kevin Wolf
2022-12-13 8:53 ` [PATCH 03/14] block: Convert bdrv_io_unplug() " Kevin Wolf
2022-12-13 8:53 ` [PATCH 04/14] block: Rename refresh_total_sectors to bdrv_refresh_total_sectors Kevin Wolf
2022-12-16 16:55 ` Vladimir Sementsov-Ogievskiy
2022-12-13 8:53 ` [PATCH 05/14] block: Convert bdrv_refresh_total_sectors() to co_wrapper_mixed Kevin Wolf
2022-12-16 17:19 ` Vladimir Sementsov-Ogievskiy
2022-12-13 8:53 ` [PATCH 06/14] block-backend: use bdrv_getlength instead of blk_getlength Kevin Wolf
2022-12-16 17:22 ` Vladimir Sementsov-Ogievskiy
2022-12-19 12:28 ` Emanuele Giuseppe Esposito
2022-12-13 8:53 ` Kevin Wolf [this message]
2022-12-16 17:26 ` [PATCH 07/14] block: use bdrv_co_refresh_total_sectors when possible Vladimir Sementsov-Ogievskiy
2022-12-13 8:53 ` [PATCH 08/14] block: Convert bdrv_get_allocated_file_size() to co_wrapper Kevin Wolf
2022-12-13 8:53 ` [PATCH 09/14] block: Convert bdrv_get_info() to co_wrapper_mixed Kevin Wolf
2022-12-13 8:53 ` [PATCH 10/14] block: Convert bdrv_is_inserted() to co_wrapper Kevin Wolf
2022-12-13 8:53 ` [PATCH 11/14] block: Convert bdrv_eject() " Kevin Wolf
2022-12-13 8:53 ` [PATCH 12/14] block: convert bdrv_lock_medium in co_wrapper Kevin Wolf
2022-12-13 8:53 ` [PATCH 13/14] block: Convert bdrv_debug_event to co_wrapper_mixed Kevin Wolf
2022-12-13 8:53 ` [PATCH 14/14] block: Rename newly converted BlockDriver IO coroutine functions Kevin Wolf
2022-12-16 17:30 ` Vladimir Sementsov-Ogievskiy
2022-12-15 12:39 ` [PATCH 00/14] block: Move more functions to coroutines Emanuele Giuseppe Esposito
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=20221213085320.95673-8-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=eesposit@redhat.com \
--cc=hreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@yandex-team.ru \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.