ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: rename bdrv_child_try_change_aio_context in bdrv_try_change_aio_context 

No functional changes intended.

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20221025084952.2139888-10-eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Emanuele Giuseppe Esposito 2022-10-25 04:49:51 -04:00 committed by Kevin Wolf
parent d2aafbb68a
commit a41cfda126
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block.c
View File

@ -7340,8 +7340,8 @@ static bool bdrv_change_aio_context(BlockDriverState *bs, AioContext *ctx,
* bdrv_drained_end calls BDRV_POLL_WHILE that assumes the lock is taken too. * bdrv_drained_end calls BDRV_POLL_WHILE that assumes the lock is taken too.
* Therefore the new AioContext lock must not be taken by the caller. * Therefore the new AioContext lock must not be taken by the caller.
*/ */
int bdrv_child_try_change_aio_context(BlockDriverState *bs, AioContext *ctx, int bdrv_try_change_aio_context(BlockDriverState *bs, AioContext *ctx,
BdrvChild *ignore_child, Error **errp) BdrvChild *ignore_child, Error **errp)
{ {
Transaction *tran; Transaction *tran;
GHashTable *visited; GHashTable *visited;
@ -7411,7 +7411,7 @@ int bdrv_try_set_aio_context(BlockDriverState *bs, AioContext *ctx,
Error **errp) Error **errp)
{ {
GLOBAL_STATE_CODE(); GLOBAL_STATE_CODE();
return bdrv_child_try_change_aio_context(bs, ctx, NULL, errp); return bdrv_try_change_aio_context(bs, ctx, NULL, errp);
} }
void bdrv_add_aio_context_notifier(BlockDriverState *bs, void bdrv_add_aio_context_notifier(BlockDriverState *bs,

3
block/block-backend.c
View File

@ -2151,8 +2151,7 @@ static int blk_do_set_aio_context(BlockBackend *blk, AioContext *new_context,
* update_root_node MUST be false for blk_root_set_aio_ctx_commit(), * update_root_node MUST be false for blk_root_set_aio_ctx_commit(),
* as we are already in the commit function of a transaction. * as we are already in the commit function of a transaction.
*/ */
ret = bdrv_child_try_change_aio_context(bs, new_context, blk->root, ret = bdrv_try_change_aio_context(bs, new_context, blk->root, errp);
errp);
if (ret < 0) { if (ret < 0) {
bdrv_unref(bs); bdrv_unref(bs);
return ret; return ret;

4
include/block/block-global-state.h
View File

@ -226,8 +226,8 @@ AioContext *bdrv_child_get_parent_aio_context(BdrvChild *c);
bool bdrv_child_change_aio_context(BdrvChild *c, AioContext *ctx, bool bdrv_child_change_aio_context(BdrvChild *c, AioContext *ctx,
GHashTable *visited, Transaction *tran, GHashTable *visited, Transaction *tran,
Error **errp); Error **errp);
int bdrv_child_try_change_aio_context(BlockDriverState *bs, AioContext *ctx, int bdrv_try_change_aio_context(BlockDriverState *bs, AioContext *ctx,
BdrvChild *ignore_child, Error **errp); BdrvChild *ignore_child, Error **errp);
int bdrv_probe_blocksizes(BlockDriverState *bs, BlockSizes *bsz); int bdrv_probe_blocksizes(BlockDriverState *bs, BlockSizes *bsz);
int bdrv_probe_geometry(BlockDriverState *bs, HDGeometry *geo); int bdrv_probe_geometry(BlockDriverState *bs, HDGeometry *geo);