nbd/server.c: add coroutine_fn annotations
These functions end up calling bdrv_*() 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 can mark such functions coroutine_fn too. Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> Message-Id: <20221128142337.657646-4-eesposit@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
43a0d4f08b
commit
6f58ac5539
17
nbd/server.c
17
nbd/server.c
@ -2138,13 +2138,14 @@ static int nbd_extent_array_add(NBDExtentArray *ea,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int blockstatus_to_extents(BlockDriverState *bs, uint64_t offset,
|
static int coroutine_fn blockstatus_to_extents(BlockDriverState *bs,
|
||||||
uint64_t bytes, NBDExtentArray *ea)
|
uint64_t offset, uint64_t bytes,
|
||||||
|
NBDExtentArray *ea)
|
||||||
{
|
{
|
||||||
while (bytes) {
|
while (bytes) {
|
||||||
uint32_t flags;
|
uint32_t flags;
|
||||||
int64_t num;
|
int64_t num;
|
||||||
int ret = bdrv_block_status_above(bs, NULL, offset, bytes, &num,
|
int ret = bdrv_co_block_status_above(bs, NULL, offset, bytes, &num,
|
||||||
NULL, NULL);
|
NULL, NULL);
|
||||||
|
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
@ -2165,12 +2166,13 @@ static int blockstatus_to_extents(BlockDriverState *bs, uint64_t offset,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int blockalloc_to_extents(BlockDriverState *bs, uint64_t offset,
|
static int coroutine_fn blockalloc_to_extents(BlockDriverState *bs,
|
||||||
uint64_t bytes, NBDExtentArray *ea)
|
uint64_t offset, uint64_t bytes,
|
||||||
|
NBDExtentArray *ea)
|
||||||
{
|
{
|
||||||
while (bytes) {
|
while (bytes) {
|
||||||
int64_t num;
|
int64_t num;
|
||||||
int ret = bdrv_is_allocated_above(bs, NULL, false, offset, bytes,
|
int ret = bdrv_co_is_allocated_above(bs, NULL, false, offset, bytes,
|
||||||
&num);
|
&num);
|
||||||
|
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
@ -2217,7 +2219,8 @@ static int nbd_co_send_extents(NBDClient *client, uint64_t handle,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Get block status from the exported device and send it to the client */
|
/* Get block status from the exported device and send it to the client */
|
||||||
static int nbd_co_send_block_status(NBDClient *client, uint64_t handle,
|
static int
|
||||||
|
coroutine_fn nbd_co_send_block_status(NBDClient *client, uint64_t handle,
|
||||||
BlockDriverState *bs, uint64_t offset,
|
BlockDriverState *bs, uint64_t offset,
|
||||||
uint32_t length, bool dont_fragment,
|
uint32_t length, bool dont_fragment,
|
||||||
bool last, uint32_t context_id,
|
bool last, uint32_t context_id,
|
||||||
|
Loading…
Reference in New Issue
Block a user