From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, richard.henderson@linaro.org, qemu-devel@nongnu.org
Subject: [PULL 16/23] block: mark another function as coroutine_fns and GRAPH_UNLOCKED
Date: Wed, 28 Jun 2023 16:15:19 +0200 [thread overview]
Message-ID: <20230628141526.293104-17-kwolf@redhat.com> (raw)
In-Reply-To: <20230628141526.293104-1-kwolf@redhat.com>
From: Paolo Bonzini <pbonzini@redhat.com>
Mark functions as coroutine_fn when they are only called by other coroutine_fns
and they can suspend. Because this function operates on a BlockBackend, mark it
GRAPH_UNLOCKED.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <20230601115145.196465-6-pbonzini@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/block.c b/block.c
index 0cd1a12344..a307c151a8 100644
--- a/block.c
+++ b/block.c
@@ -555,8 +555,9 @@ int coroutine_fn bdrv_co_create(BlockDriver *drv, const char *filename,
* On success, return @blk's actual length.
* Otherwise, return -errno.
*/
-static int64_t create_file_fallback_truncate(BlockBackend *blk,
- int64_t minimum_size, Error **errp)
+static int64_t coroutine_fn GRAPH_UNLOCKED
+create_file_fallback_truncate(BlockBackend *blk, int64_t minimum_size,
+ Error **errp)
{
Error *local_err = NULL;
int64_t size;
@@ -564,14 +565,14 @@ static int64_t create_file_fallback_truncate(BlockBackend *blk,
GLOBAL_STATE_CODE();
- ret = blk_truncate(blk, minimum_size, false, PREALLOC_MODE_OFF, 0,
- &local_err);
+ ret = blk_co_truncate(blk, minimum_size, false, PREALLOC_MODE_OFF, 0,
+ &local_err);
if (ret < 0 && ret != -ENOTSUP) {
error_propagate(errp, local_err);
return ret;
}
- size = blk_getlength(blk);
+ size = blk_co_getlength(blk);
if (size < 0) {
error_free(local_err);
error_setg_errno(errp, -size,
--
2.41.0
next prev parent reply other threads:[~2023-06-28 14:17 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-28 14:15 [PULL 00/23] Block layer patches Kevin Wolf
2023-06-28 14:15 ` [PULL 01/23] iotests: Test active commit with iothread and background I/O Kevin Wolf
2023-06-28 14:15 ` [PULL 02/23] qdev-properties-system: Lock AioContext for blk_insert_bs() Kevin Wolf
2023-06-28 14:15 ` [PULL 03/23] test-block-iothread: " Kevin Wolf
2023-06-28 14:15 ` [PULL 04/23] block: Fix AioContext locking in bdrv_open_child() Kevin Wolf
2023-06-28 14:15 ` [PULL 05/23] block: Fix AioContext locking in bdrv_attach_child_common() Kevin Wolf
2023-06-28 14:15 ` [PULL 06/23] block: Fix AioContext locking in bdrv_reopen_parse_file_or_backing() Kevin Wolf
2023-06-28 14:15 ` [PULL 07/23] block: Fix AioContext locking in bdrv_open_inherit() Kevin Wolf
2023-06-28 14:15 ` [PULL 08/23] block: Fix AioContext locking in bdrv_open_backing_file() Kevin Wolf
2023-06-28 14:15 ` [PULL 09/23] blockjob: Fix AioContext locking in block_job_add_bdrv() Kevin Wolf
2023-06-28 14:15 ` [PULL 10/23] graph-lock: Unlock the AioContext while polling Kevin Wolf
2023-06-28 14:15 ` [PULL 11/23] Revert "graph-lock: Disable locking for now" Kevin Wolf
2023-07-10 12:22 ` Klaus Jensen
2023-07-10 12:40 ` Kevin Wolf
2023-07-10 14:03 ` Klaus Jensen
2023-06-28 14:15 ` [PULL 12/23] file-posix: remove incorrect coroutine_fn calls Kevin Wolf
2023-06-28 14:15 ` [PULL 13/23] qed: mark more functions as coroutine_fns and GRAPH_RDLOCK Kevin Wolf
2023-06-28 14:15 ` [PULL 14/23] vpc: " Kevin Wolf
2023-06-28 14:15 ` [PULL 15/23] bochs: " Kevin Wolf
2023-06-28 14:15 ` Kevin Wolf [this message]
2023-06-28 14:15 ` [PULL 17/23] cloop: " Kevin Wolf
2023-06-28 14:15 ` [PULL 18/23] dmg: " Kevin Wolf
2023-06-28 14:15 ` [PULL 19/23] vmdk: " Kevin Wolf
2023-06-28 14:15 ` [PULL 20/23] vhdx: " Kevin Wolf
2023-06-28 14:15 ` [PULL 21/23] qcow2: " Kevin Wolf
2023-06-28 14:15 ` [PULL 22/23] block: use bdrv_co_getlength in coroutine context Kevin Wolf
2023-06-28 14:15 ` [PULL 23/23] block: use bdrv_co_debug_event " Kevin Wolf
2023-06-29 6:11 ` [PULL 00/23] Block layer patches Richard Henderson
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=20230628141526.293104-17-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/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 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).