This function is a caller of bdrv_do_query_node_info(), which have been converted to a coroutine. Convert this function as well so we're closer from having the whole qmp_query_block as a single coroutine.
Also remove the wrapper for bdrv_co_do_query_node_info() now that all its callers are converted. Signed-off-by: Fabiano Rosas <[email protected]> --- block/qapi.c | 16 +++++++--------- include/block/qapi.h | 8 ++++---- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 7b1cf48246..5e263960a9 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -304,7 +304,7 @@ bdrv_co_do_query_node_info(BlockDriverState *bs, BlockNodeInfo *info, } /** - * bdrv_query_image_info: + * bdrv_co_query_image_info: * @bs: block node to examine * @p_info: location to store image information * @flat: skip backing node information @@ -325,17 +325,15 @@ bdrv_co_do_query_node_info(BlockDriverState *bs, BlockNodeInfo *info, * * @p_info will be set only on success. On error, store error in @errp. */ -void bdrv_query_image_info(BlockDriverState *bs, - ImageInfo **p_info, - bool flat, - bool skip_implicit_filters, - Error **errp) +void coroutine_fn +bdrv_co_query_image_info(BlockDriverState *bs, ImageInfo **p_info, bool flat, + bool skip_implicit_filters, Error **errp) { ERRP_GUARD(); ImageInfo *info; info = g_new0(ImageInfo, 1); - bdrv_do_query_node_info(bs, qapi_ImageInfo_base(info), errp); + bdrv_co_do_query_node_info(bs, qapi_ImageInfo_base(info), errp); if (*errp) { goto fail; } @@ -353,8 +351,8 @@ void bdrv_query_image_info(BlockDriverState *bs, } if (backing) { - bdrv_query_image_info(backing, &info->backing_image, false, - skip_implicit_filters, errp); + bdrv_co_query_image_info(backing, &info->backing_image, false, + skip_implicit_filters, errp); if (*errp) { goto fail; } diff --git a/include/block/qapi.h b/include/block/qapi.h index 76be9cc3e5..5f7e3a690e 100644 --- a/include/block/qapi.h +++ b/include/block/qapi.h @@ -38,7 +38,10 @@ int GRAPH_RDLOCK bdrv_query_snapshot_info_list(BlockDriverState *bs, SnapshotInfoList **p_list, Error **errp); -void GRAPH_RDLOCK +void coroutine_fn GRAPH_RDLOCK +bdrv_co_query_image_info(BlockDriverState *bs, ImageInfo **p_info, bool flat, + bool skip_implicit_filters, Error **errp); +void co_wrapper_bdrv_rdlock bdrv_query_image_info(BlockDriverState *bs, ImageInfo **p_info, bool flat, bool skip_implicit_filters, Error **errp); @@ -58,7 +61,4 @@ void bdrv_node_info_dump(BlockNodeInfo *info, int indentation, bool protocol); void coroutine_fn GRAPH_RDLOCK bdrv_co_do_query_node_info(BlockDriverState *bs, BlockNodeInfo *info, Error **errp); -void co_wrapper_bdrv_rdlock -bdrv_do_query_node_info(BlockDriverState *bs, BlockNodeInfo *info, - Error **errp); #endif -- 2.35.3
