From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>,
John Snow <jsnow@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>,
Eric Blake <eblake@redhat.com>, Fam Zheng <fam@euphon.net>,
qemu-devel@nongnu.org,
Emanuele Giuseppe Esposito <eesposit@redhat.com>
Subject: [PATCH v4 07/11] block/vmdk: add missing coroutine_fn annotations
Date: Wed, 16 Nov 2022 07:22:37 -0500 [thread overview]
Message-ID: <20221116122241.2856527-8-eesposit@redhat.com> (raw)
In-Reply-To: <20221116122241.2856527-1-eesposit@redhat.com>
These functions end up calling bdrv_create() implemented as generated_co_wrapper
functions.
In addition, they also happen to be always called in coroutine context,
meaning all callers are coroutine_fn.
This means that the g_c_w function will enter the qemu_in_coroutine()
case and eventually suspend (or in other words call qemu_coroutine_yield()).
Therefore we need to mark such functions coroutine_fn too.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
block/vmdk.c | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/block/vmdk.c b/block/vmdk.c
index 26376352b9..0c32bf2e83 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -2285,10 +2285,11 @@ exit:
return ret;
}
-static int vmdk_create_extent(const char *filename, int64_t filesize,
- bool flat, bool compress, bool zeroed_grain,
- BlockBackend **pbb,
- QemuOpts *opts, Error **errp)
+static int coroutine_fn vmdk_create_extent(const char *filename,
+ int64_t filesize, bool flat,
+ bool compress, bool zeroed_grain,
+ BlockBackend **pbb,
+ QemuOpts *opts, Error **errp)
{
int ret;
BlockBackend *blk = NULL;
@@ -2366,14 +2367,14 @@ static int filename_decompose(const char *filename, char *path, char *prefix,
* non-split format.
* idx >= 1: get the n-th extent if in a split subformat
*/
-typedef BlockBackend *(*vmdk_create_extent_fn)(int64_t size,
- int idx,
- bool flat,
- bool split,
- bool compress,
- bool zeroed_grain,
- void *opaque,
- Error **errp);
+typedef BlockBackend * coroutine_fn (*vmdk_create_extent_fn)(int64_t size,
+ int idx,
+ bool flat,
+ bool split,
+ bool compress,
+ bool zeroed_grain,
+ void *opaque,
+ Error **errp);
static void vmdk_desc_add_extent(GString *desc,
const char *extent_line_fmt,
@@ -2616,7 +2617,7 @@ typedef struct {
QemuOpts *opts;
} VMDKCreateOptsData;
-static BlockBackend *vmdk_co_create_opts_cb(int64_t size, int idx,
+static BlockBackend * coroutine_fn vmdk_co_create_opts_cb(int64_t size, int idx,
bool flat, bool split, bool compress,
bool zeroed_grain, void *opaque,
Error **errp)
@@ -2768,10 +2769,11 @@ exit:
return ret;
}
-static BlockBackend *vmdk_co_create_cb(int64_t size, int idx,
- bool flat, bool split, bool compress,
- bool zeroed_grain, void *opaque,
- Error **errp)
+static BlockBackend * coroutine_fn vmdk_co_create_cb(int64_t size, int idx,
+ bool flat, bool split,
+ bool compress,
+ bool zeroed_grain,
+ void *opaque, Error **errp)
{
int ret;
BlockDriverState *bs;
--
2.31.1
next prev parent reply other threads:[~2022-11-16 12:25 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-16 12:22 [PATCH v4 00/11] Still more coroutine and various fixes in block layer Emanuele Giuseppe Esposito
2022-11-16 12:22 ` [PATCH v4 01/11] block-copy: add missing coroutine_fn annotations Emanuele Giuseppe Esposito
2022-11-18 19:05 ` Kevin Wolf
2022-11-21 8:32 ` Emanuele Giuseppe Esposito
2022-11-21 8:51 ` Emanuele Giuseppe Esposito
2022-11-21 11:50 ` Kevin Wolf
2022-11-21 13:26 ` Emanuele Giuseppe Esposito
2022-11-16 12:22 ` [PATCH v4 02/11] nbd/server.c: " Emanuele Giuseppe Esposito
2022-11-18 19:08 ` Kevin Wolf
2022-11-16 12:22 ` [PATCH v4 03/11] block-backend: replace bdrv_*_above with blk_*_above Emanuele Giuseppe Esposito
2022-11-18 19:15 ` Kevin Wolf
2022-11-16 12:22 ` [PATCH v4 04/11] block-coroutine-wrapper.py: introduce generated_co_wrapper_simple Emanuele Giuseppe Esposito
2022-11-21 12:21 ` Kevin Wolf
2022-11-16 12:22 ` [PATCH v4 05/11] block-coroutine-wrapper.py: default to main loop aiocontext if function does not have a BlockDriverState parameter Emanuele Giuseppe Esposito
2022-11-21 15:30 ` Kevin Wolf
2022-11-21 15:52 ` Emanuele Giuseppe Esposito
2022-11-22 8:27 ` Kevin Wolf
2022-11-16 12:22 ` [PATCH v4 06/11] block-coroutine-wrapper.py: support also basic return types Emanuele Giuseppe Esposito
2022-11-21 15:55 ` Kevin Wolf
2022-11-16 12:22 ` Emanuele Giuseppe Esposito [this message]
2022-11-21 16:01 ` [PATCH v4 07/11] block/vmdk: add missing coroutine_fn annotations Kevin Wolf
2022-11-21 16:07 ` Emanuele Giuseppe Esposito
2022-11-16 12:22 ` [PATCH v4 08/11] block: distinguish between bdrv_create running in coroutine and not Emanuele Giuseppe Esposito
2022-11-22 8:45 ` Kevin Wolf
2022-11-16 12:22 ` [PATCH v4 09/11] block: bdrv_create_file is a coroutine_fn Emanuele Giuseppe Esposito
2022-11-22 8:58 ` Kevin Wolf
2022-11-22 9:04 ` Emanuele Giuseppe Esposito
2022-11-16 12:22 ` [PATCH v4 10/11] block: convert bdrv_create to generated_co_wrapper_simple Emanuele Giuseppe Esposito
2022-11-22 9:16 ` Kevin Wolf
2022-11-16 12:22 ` [PATCH v4 11/11] block/dirty-bitmap: convert coroutine-only functions " Emanuele Giuseppe Esposito
2022-11-22 10:04 ` Kevin Wolf
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=20221116122241.2856527-8-eesposit@redhat.com \
--to=eesposit@redhat.com \
--cc=eblake@redhat.com \
--cc=fam@euphon.net \
--cc=hreitz@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@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 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).