aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2023-04-06 12:17:52 +0200
committerKevin Wolf <kwolf@redhat.com>2023-05-10 14:15:13 +0200
commit17ac39c3e726173f737bb6cd898c160b406532d4 (patch)
treeb908c25406eb0527e7514f552d46eb25f1d57b46
parent11cea42e176bebc5e85866b01ade4a86651b7633 (diff)
downloadqemu-17ac39c3e726173f737bb6cd898c160b406532d4.zip
qemu-17ac39c3e726173f737bb6cd898c160b406532d4.tar.gz
qemu-17ac39c3e726173f737bb6cd898c160b406532d4.tar.bz2
block: add missing coroutine_fn annotations
After the recent introduction of many new coroutine callbacks, a couple calls from non-coroutine_fn to coroutine_fn have sneaked in; fix them. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20230406101752.242125-1-pbonzini@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--block/mirror.c4
-rw-r--r--include/block/graph-lock.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/block/mirror.c b/block/mirror.c
index af9bbd2..80fa345 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -270,8 +270,8 @@ static inline int64_t mirror_clip_bytes(MirrorBlockJob *s,
/* Round offset and/or bytes to target cluster if COW is needed, and
* return the offset of the adjusted tail against original. */
-static int mirror_cow_align(MirrorBlockJob *s, int64_t *offset,
- uint64_t *bytes)
+static int coroutine_fn mirror_cow_align(MirrorBlockJob *s, int64_t *offset,
+ uint64_t *bytes)
{
bool need_cow;
int ret = 0;
diff --git a/include/block/graph-lock.h b/include/block/graph-lock.h
index 18cc14d..ac0fef8 100644
--- a/include/block/graph-lock.h
+++ b/include/block/graph-lock.h
@@ -208,14 +208,14 @@ typedef struct GraphLockable { } GraphLockable;
* unlocked. TSA_ASSERT() makes sure that the following calls know that we
* hold the lock while unlocking is left unchecked.
*/
-static inline GraphLockable * TSA_ASSERT(graph_lock) TSA_NO_TSA
+static inline GraphLockable * TSA_ASSERT(graph_lock) TSA_NO_TSA coroutine_fn
graph_lockable_auto_lock(GraphLockable *x)
{
bdrv_graph_co_rdlock();
return x;
}
-static inline void TSA_NO_TSA
+static inline void TSA_NO_TSA coroutine_fn
graph_lockable_auto_unlock(GraphLockable *x)
{
bdrv_graph_co_rdunlock();