[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/9] qemu-pr-helper: mark more coroutine_fns
From: |
Paolo Bonzini |
Subject: |
[PATCH 6/9] qemu-pr-helper: mark more coroutine_fns |
Date: |
Thu, 9 Mar 2023 09:44:53 +0100 |
do_sgio can suspend via the coroutine function thread_pool_submit_co, so it
has to be coroutine_fn as well---and the same is true of all its direct and
indirect callers.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
scsi/qemu-pr-helper.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c
index 199227a556e6..9df82d93a7d2 100644
--- a/scsi/qemu-pr-helper.c
+++ b/scsi/qemu-pr-helper.c
@@ -177,8 +177,8 @@ static int do_sgio_worker(void *opaque)
return status;
}
-static int do_sgio(int fd, const uint8_t *cdb, uint8_t *sense,
- uint8_t *buf, int *sz, int dir)
+static int coroutine_fn do_sgio(int fd, const uint8_t *cdb, uint8_t *sense,
+ uint8_t *buf, int *sz, int dir)
{
ThreadPool *pool = aio_get_thread_pool(qemu_get_aio_context());
int r;
@@ -320,7 +320,7 @@ static SCSISense mpath_generic_sense(int r)
}
}
-static int mpath_reconstruct_sense(int fd, int r, uint8_t *sense)
+static int coroutine_fn mpath_reconstruct_sense(int fd, int r, uint8_t *sense)
{
switch (r) {
case MPATH_PR_SUCCESS:
@@ -372,8 +372,8 @@ static int mpath_reconstruct_sense(int fd, int r, uint8_t
*sense)
}
}
-static int multipath_pr_in(int fd, const uint8_t *cdb, uint8_t *sense,
- uint8_t *data, int sz)
+static int coroutine_fn multipath_pr_in(int fd, const uint8_t *cdb, uint8_t
*sense,
+ uint8_t *data, int sz)
{
int rq_servact = cdb[1];
struct prin_resp resp;
@@ -427,8 +427,8 @@ static int multipath_pr_in(int fd, const uint8_t *cdb,
uint8_t *sense,
return mpath_reconstruct_sense(fd, r, sense);
}
-static int multipath_pr_out(int fd, const uint8_t *cdb, uint8_t *sense,
- const uint8_t *param, int sz)
+static int coroutine_fn multipath_pr_out(int fd, const uint8_t *cdb, uint8_t
*sense,
+ const uint8_t *param, int sz)
{
int rq_servact = cdb[1];
int rq_scope = cdb[2] >> 4;
@@ -545,8 +545,8 @@ static int multipath_pr_out(int fd, const uint8_t *cdb,
uint8_t *sense,
}
#endif
-static int do_pr_in(int fd, const uint8_t *cdb, uint8_t *sense,
- uint8_t *data, int *resp_sz)
+static int coroutine_fn do_pr_in(int fd, const uint8_t *cdb, uint8_t *sense,
+ uint8_t *data, int *resp_sz)
{
#ifdef CONFIG_MPATH
if (is_mpath(fd)) {
@@ -563,8 +563,8 @@ static int do_pr_in(int fd, const uint8_t *cdb, uint8_t
*sense,
SG_DXFER_FROM_DEV);
}
-static int do_pr_out(int fd, const uint8_t *cdb, uint8_t *sense,
- const uint8_t *param, int sz)
+static int coroutine_fn do_pr_out(int fd, const uint8_t *cdb, uint8_t *sense,
+ const uint8_t *param, int sz)
{
int resp_sz;
--
2.39.2
- [PATCH 0/9] (mostly) block: add more coroutine_fn annotations, use bdrv/blk_co_*, Paolo Bonzini, 2023/03/09
- [PATCH 2/9] blkdebug: add missing coroutine_fn annotation, Paolo Bonzini, 2023/03/09
- [PATCH 1/9] vvfat: mark various functions as coroutine_fn, Paolo Bonzini, 2023/03/09
- [PATCH 3/9] mirror: make mirror_flush a coroutine_fn, do not use co_wrappers, Paolo Bonzini, 2023/03/09
- [PATCH 5/9] 9pfs: mark more coroutine_fns, Paolo Bonzini, 2023/03/09
- [PATCH 4/9] nbd: mark more coroutine_fns, do not use co_wrappers, Paolo Bonzini, 2023/03/09
- [PATCH 7/9] tests: mark more coroutine_fns, Paolo Bonzini, 2023/03/09
- [PATCH 6/9] qemu-pr-helper: mark more coroutine_fns,
Paolo Bonzini <=
- [PATCH 9/9] vmdk: make vmdk_is_cid_valid a coroutine_fn, Paolo Bonzini, 2023/03/09
- [PATCH 8/9] qcow2: mark various functions as coroutine_fn and GRAPH_RDLOCK, Paolo Bonzini, 2023/03/09
- Re: [PATCH 0/9] (mostly) block: add more coroutine_fn annotations, use bdrv/blk_co_*, Kevin Wolf, 2023/03/23