block: convert bdrv_create to co_wrapper
This function is never called in coroutine context, therefore instead of manually creating a new coroutine, delegate it to the block-coroutine-wrapper script, defining it as co_wrapper. Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> Message-Id: <20221128142337.657646-14-eesposit@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
6700dfb1b8
commit
741443eb43
41
block.c
41
block.c
|
@ -526,8 +526,8 @@ typedef struct CreateCo {
|
||||||
Error *err;
|
Error *err;
|
||||||
} CreateCo;
|
} CreateCo;
|
||||||
|
|
||||||
static int coroutine_fn bdrv_co_create(BlockDriver *drv, const char *filename,
|
int coroutine_fn bdrv_co_create(BlockDriver *drv, const char *filename,
|
||||||
QemuOpts *opts, Error **errp)
|
QemuOpts *opts, Error **errp)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
GLOBAL_STATE_CODE();
|
GLOBAL_STATE_CODE();
|
||||||
|
@ -547,43 +547,6 @@ static int coroutine_fn bdrv_co_create(BlockDriver *drv, const char *filename,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void coroutine_fn bdrv_create_co_entry(void *opaque)
|
|
||||||
{
|
|
||||||
CreateCo *cco = opaque;
|
|
||||||
GLOBAL_STATE_CODE();
|
|
||||||
|
|
||||||
cco->ret = bdrv_co_create(cco->drv, cco->filename, cco->opts, &cco->err);
|
|
||||||
aio_wait_kick();
|
|
||||||
}
|
|
||||||
|
|
||||||
int bdrv_create(BlockDriver *drv, const char* filename,
|
|
||||||
QemuOpts *opts, Error **errp)
|
|
||||||
{
|
|
||||||
GLOBAL_STATE_CODE();
|
|
||||||
|
|
||||||
if (qemu_in_coroutine()) {
|
|
||||||
/* Fast-path if already in coroutine context */
|
|
||||||
return bdrv_co_create(drv, filename, opts, errp);
|
|
||||||
} else {
|
|
||||||
Coroutine *co;
|
|
||||||
CreateCo cco = {
|
|
||||||
.drv = drv,
|
|
||||||
.filename = filename,
|
|
||||||
.opts = opts,
|
|
||||||
.ret = NOT_DONE,
|
|
||||||
.err = NULL,
|
|
||||||
};
|
|
||||||
|
|
||||||
co = qemu_coroutine_create(bdrv_create_co_entry, &cco);
|
|
||||||
qemu_coroutine_enter(co);
|
|
||||||
while (cco.ret == NOT_DONE) {
|
|
||||||
aio_poll(qemu_get_aio_context(), true);
|
|
||||||
}
|
|
||||||
error_propagate(errp, cco.err);
|
|
||||||
return cco.ret;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Helper function for bdrv_create_file_fallback(): Resize @blk to at
|
* Helper function for bdrv_create_file_fallback(): Resize @blk to at
|
||||||
* least the given @minimum_size.
|
* least the given @minimum_size.
|
||||||
|
|
|
@ -55,8 +55,12 @@ BlockDriver *bdrv_find_protocol(const char *filename,
|
||||||
bool allow_protocol_prefix,
|
bool allow_protocol_prefix,
|
||||||
Error **errp);
|
Error **errp);
|
||||||
BlockDriver *bdrv_find_format(const char *format_name);
|
BlockDriver *bdrv_find_format(const char *format_name);
|
||||||
int bdrv_create(BlockDriver *drv, const char* filename,
|
|
||||||
QemuOpts *opts, Error **errp);
|
int coroutine_fn bdrv_co_create(BlockDriver *drv, const char *filename,
|
||||||
|
QemuOpts *opts, Error **errp);
|
||||||
|
int co_wrapper bdrv_create(BlockDriver *drv, const char *filename,
|
||||||
|
QemuOpts *opts, Error **errp);
|
||||||
|
|
||||||
int coroutine_fn bdrv_co_create_file(const char *filename, QemuOpts *opts,
|
int coroutine_fn bdrv_co_create_file(const char *filename, QemuOpts *opts,
|
||||||
Error **errp);
|
Error **errp);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue