From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 17/19] block: mark mixed functions that can suspend
Date: Tue, 26 Sep 2023 18:59:13 +0200 [thread overview]
Message-ID: <20230926165915.738719-18-pbonzini@redhat.com> (raw)
In-Reply-To: <20230926165915.738719-1-pbonzini@redhat.com>
The marking should be extended transitively to all functions that call
these ones, so that static analysis can be done much more efficiently.
However, this is a start and makes it possible to use vrc's path-based
searches to find potential bugs where coroutine_fns call blocking functions.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
block/io.c | 5 +++--
block/qcow2.c | 2 +-
block/qed.c | 4 ++--
block/throttle-groups.c | 4 ++--
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/block/io.c b/block/io.c
index 209a6da0c8e..e7f9448d5a3 100644
--- a/block/io.c
+++ b/block/io.c
@@ -387,7 +387,8 @@ void bdrv_do_drained_begin_quiesce(BlockDriverState *bs, BdrvChild *parent)
bdrv_do_drained_begin(bs, parent, false);
}
-void bdrv_drained_begin(BlockDriverState *bs)
+void coroutine_mixed_fn
+bdrv_drained_begin(BlockDriverState *bs)
{
IO_OR_GS_CODE();
bdrv_do_drained_begin(bs, NULL, true);
@@ -506,7 +507,7 @@ void bdrv_drain_all_begin_nopoll(void)
}
}
-void bdrv_drain_all_begin(void)
+void coroutine_mixed_fn bdrv_drain_all_begin(void)
{
BlockDriverState *bs = NULL;
diff --git a/block/qcow2.c b/block/qcow2.c
index af43d59d768..5a3c537f146 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -5288,7 +5288,7 @@ static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs,
return spec_info;
}
-static int qcow2_has_zero_init(BlockDriverState *bs)
+static int coroutine_mixed_fn qcow2_has_zero_init(BlockDriverState *bs)
{
BDRVQcow2State *s = bs->opaque;
bool preallocated;
diff --git a/block/qed.c b/block/qed.c
index b2604d9dad3..45ae320290d 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -570,8 +570,8 @@ static void coroutine_fn bdrv_qed_open_entry(void *opaque)
qemu_co_mutex_unlock(&s->table_lock);
}
-static int bdrv_qed_open(BlockDriverState *bs, QDict *options, int flags,
- Error **errp)
+static int coroutine_mixed_fn bdrv_qed_open(BlockDriverState *bs, QDict *options,
+ int flags, Error **errp)
{
QEDOpenCo qoc = {
.bs = bs,
diff --git a/block/throttle-groups.c b/block/throttle-groups.c
index 3eda4c4e3de..f5c0fac5814 100644
--- a/block/throttle-groups.c
+++ b/block/throttle-groups.c
@@ -317,8 +317,8 @@ static bool coroutine_fn throttle_group_co_restart_queue(ThrottleGroupMember *tg
* @tgm: the current ThrottleGroupMember
* @direction: the ThrottleDirection
*/
-static void schedule_next_request(ThrottleGroupMember *tgm,
- ThrottleDirection direction)
+static void coroutine_mixed_fn schedule_next_request(ThrottleGroupMember *tgm,
+ ThrottleDirection direction)
{
ThrottleState *ts = tgm->throttle_state;
ThrottleGroup *tg = container_of(ts, ThrottleGroup, ts);
--
2.41.0
next prev parent reply other threads:[~2023-09-26 17:01 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-26 16:58 [PULL 00/19] Misc patches for 2023-09-26 Paolo Bonzini
2023-09-26 16:58 ` [PULL 01/19] pc_piix: remove pc-i440fx-1.4 up to pc-i440fx-1.7 Paolo Bonzini
2023-09-26 16:58 ` [PULL 02/19] seabios: remove PCI drivers from bios.bin Paolo Bonzini
2023-09-26 16:58 ` [PULL 03/19] user-exec-stub: remove unused variable Paolo Bonzini
2023-09-26 16:59 ` [PULL 04/19] hw/scsi/scsi-disk: Disallow block sizes smaller than 512 [CVE-2023-42467] Paolo Bonzini
2023-09-26 16:59 ` [PULL 05/19] vl: remove shadowed local variables Paolo Bonzini
2023-09-26 16:59 ` [PULL 06/19] ui/vnc: fix debug output for invalid audio message Paolo Bonzini
2023-09-26 16:59 ` [PULL 07/19] ui/vnc: fix handling of VNC_FEATURE_XVP Paolo Bonzini
2023-09-26 16:59 ` [PULL 08/19] mptsas: avoid shadowed local variables Paolo Bonzini
2023-09-26 16:59 ` [PULL 09/19] pm_smbus: rename variable to avoid shadowing Paolo Bonzini
2023-09-26 16:59 ` [PULL 10/19] m48t59-test: avoid possible overflow on ABS Paolo Bonzini
2023-09-26 16:59 ` [PULL 11/19] target/i386/kvm: eliminate shadowed local variables Paolo Bonzini
2023-09-26 16:59 ` [PULL 12/19] target/i386/cpu: avoid " Paolo Bonzini
2023-09-26 16:59 ` [PULL 13/19] target/i386/translate: " Paolo Bonzini
2023-09-26 16:59 ` [PULL 14/19] target/i386/seg_helper: introduce tss_set_busy Paolo Bonzini
2023-09-26 16:59 ` [PULL 15/19] target/i386/seg_helper: remove shadowed variable Paolo Bonzini
2023-09-26 16:59 ` [PULL 16/19] target/i386/svm_helper: eliminate duplicate local variable Paolo Bonzini
2023-09-26 16:59 ` Paolo Bonzini [this message]
2023-09-26 16:59 ` [PULL 18/19] compiler: introduce QEMU_ANNOTATE Paolo Bonzini
2023-09-26 16:59 ` [PULL 19/19] audio: remove shadowed locals Paolo Bonzini
2023-09-27 20:13 ` [PULL 00/19] Misc patches for 2023-09-26 Stefan Hajnoczi
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=20230926165915.738719-18-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.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).