OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

quorum: add missing coroutine_fn annotations 

Callers of coroutine_fn must be coroutine_fn themselves, or the call
must be within "if (qemu_in_coroutine())".  Apply coroutine_fn to
functions where this holds.

Reviewed-by: Alberto Faria <afaria@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220922084924.201610-19-pbonzini@redhat.com>
[kwolf: Fixed up coding style]
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2022-09-22 10:49:16 +02:00 committed by Kevin Wolf
parent b383ae60a2
commit 2987ae7d84
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
block/quorum.c
View File

@ -161,11 +161,10 @@ static bool quorum_64bits_compare(QuorumVoteValue *a, QuorumVoteValue *b)
return a->l == b->l; return a->l == b->l;
} }
static QuorumAIOCB *quorum_aio_get(BlockDriverState *bs, static QuorumAIOCB *coroutine_fn quorum_aio_get(BlockDriverState *bs,
QEMUIOVector *qiov, QEMUIOVector *qiov,
uint64_t offset, uint64_t offset, uint64_t bytes,
uint64_t bytes, int flags)
int flags)
{ {
BDRVQuorumState *s = bs->opaque; BDRVQuorumState *s = bs->opaque;
QuorumAIOCB *acb = g_new(QuorumAIOCB, 1); QuorumAIOCB *acb = g_new(QuorumAIOCB, 1);
@ -273,7 +272,7 @@ static void quorum_report_bad_versions(BDRVQuorumState *s,
} }
} }
static void quorum_rewrite_entry(void *opaque) static void coroutine_fn quorum_rewrite_entry(void *opaque)
{ {
QuorumCo *co = opaque; QuorumCo *co = opaque;
QuorumAIOCB *acb = co->acb; QuorumAIOCB *acb = co->acb;
@ -574,7 +573,7 @@ free_exit:
quorum_free_vote_list(&acb->votes); quorum_free_vote_list(&acb->votes);
} }
static void read_quorum_children_entry(void *opaque) static void coroutine_fn read_quorum_children_entry(void *opaque)
{ {
QuorumCo *co = opaque; QuorumCo *co = opaque;
QuorumAIOCB *acb = co->acb; QuorumAIOCB *acb = co->acb;
@ -602,7 +601,7 @@ static void read_quorum_children_entry(void *opaque)
} }
} }
static int read_quorum_children(QuorumAIOCB *acb) static int coroutine_fn read_quorum_children(QuorumAIOCB *acb)
{ {
BDRVQuorumState *s = acb->bs->opaque; BDRVQuorumState *s = acb->bs->opaque;
int i; int i;
@ -643,7 +642,7 @@ static int read_quorum_children(QuorumAIOCB *acb)
return acb->vote_ret; return acb->vote_ret;
} }
static int read_fifo_child(QuorumAIOCB *acb) static int coroutine_fn read_fifo_child(QuorumAIOCB *acb)
{ {
BDRVQuorumState *s = acb->bs->opaque; BDRVQuorumState *s = acb->bs->opaque;
int n, ret; int n, ret;
@ -664,8 +663,10 @@ static int read_fifo_child(QuorumAIOCB *acb)
return ret; return ret;
} }
static int quorum_co_preadv(BlockDriverState *bs, int64_t offset, int64_t bytes, static int coroutine_fn quorum_co_preadv(BlockDriverState *bs,
QEMUIOVector *qiov, BdrvRequestFlags flags) int64_t offset, int64_t bytes,
QEMUIOVector *qiov,
BdrvRequestFlags flags)
{ {
BDRVQuorumState *s = bs->opaque; BDRVQuorumState *s = bs->opaque;
QuorumAIOCB *acb = quorum_aio_get(bs, qiov, offset, bytes, flags); QuorumAIOCB *acb = quorum_aio_get(bs, qiov, offset, bytes, flags);
@ -684,7 +685,7 @@ static int quorum_co_preadv(BlockDriverState *bs, int64_t offset, int64_t bytes,
return ret; return ret;
} }
static void write_quorum_entry(void *opaque) static void coroutine_fn write_quorum_entry(void *opaque)
{ {
QuorumCo *co = opaque; QuorumCo *co = opaque;
QuorumAIOCB *acb = co->acb; QuorumAIOCB *acb = co->acb;
@ -715,9 +716,9 @@ static void write_quorum_entry(void *opaque)
} }
} }
static int quorum_co_pwritev(BlockDriverState *bs, int64_t offset, static int coroutine_fn quorum_co_pwritev(BlockDriverState *bs, int64_t offset,
int64_t bytes, QEMUIOVector *qiov, int64_t bytes, QEMUIOVector *qiov,
BdrvRequestFlags flags) BdrvRequestFlags flags)
{ {
BDRVQuorumState *s = bs->opaque; BDRVQuorumState *s = bs->opaque;
QuorumAIOCB *acb = quorum_aio_get(bs, qiov, offset, bytes, flags); QuorumAIOCB *acb = quorum_aio_get(bs, qiov, offset, bytes, flags);
@ -746,8 +747,9 @@ static int quorum_co_pwritev(BlockDriverState *bs, int64_t offset,
return ret; return ret;
} }
static int quorum_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset, static int coroutine_fn quorum_co_pwrite_zeroes(BlockDriverState *bs,
int64_t bytes, BdrvRequestFlags flags) int64_t offset, int64_t bytes,
BdrvRequestFlags flags)
{ {
return quorum_co_pwritev(bs, offset, bytes, NULL, return quorum_co_pwritev(bs, offset, bytes, NULL,