Now it's actually substituted by coroutine based bdrv_debug_wait_break(). Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> --- include/block/block.h | 1 - include/block/block_int.h | 1 - block.c | 13 ------------- block/blkdebug.c | 1 - 4 files changed, 16 deletions(-)
diff --git a/include/block/block.h b/include/block/block.h index e133adf54f..fb1897c1e8 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -647,7 +647,6 @@ int bdrv_debug_breakpoint(BlockDriverState *bs, const char *event, const char *tag); int bdrv_debug_remove_breakpoint(BlockDriverState *bs, const char *tag); int bdrv_debug_resume(BlockDriverState *bs, const char *tag); -bool bdrv_debug_is_suspended(BlockDriverState *bs, const char *tag); void coroutine_fn bdrv_debug_wait_break(BlockDriverState *bs, const char *tag); /** diff --git a/include/block/block_int.h b/include/block/block_int.h index 89e6904fc7..592acc960f 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -501,7 +501,6 @@ struct BlockDriver { int (*bdrv_debug_remove_breakpoint)(BlockDriverState *bs, const char *tag); int (*bdrv_debug_resume)(BlockDriverState *bs, const char *tag); - bool (*bdrv_debug_is_suspended)(BlockDriverState *bs, const char *tag); void (*bdrv_debug_wait_break)(BlockDriverState *bs, const char *tag); void (*bdrv_refresh_limits)(BlockDriverState *bs, Error **errp); diff --git a/block.c b/block.c index 3ea088b9fb..f026d710b7 100644 --- a/block.c +++ b/block.c @@ -5689,19 +5689,6 @@ int bdrv_debug_resume(BlockDriverState *bs, const char *tag) return -ENOTSUP; } -bool bdrv_debug_is_suspended(BlockDriverState *bs, const char *tag) -{ - while (bs && bs->drv && !bs->drv->bdrv_debug_is_suspended) { - bs = bdrv_primary_bs(bs); - } - - if (bs && bs->drv && bs->drv->bdrv_debug_is_suspended) { - return bs->drv->bdrv_debug_is_suspended(bs, tag); - } - - return false; -} - void coroutine_fn bdrv_debug_wait_break(BlockDriverState *bs, const char *tag) { while (bs && bs->drv && !bs->drv->bdrv_debug_wait_break) { diff --git a/block/blkdebug.c b/block/blkdebug.c index 10b7c38467..608d1d5bd6 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -1062,7 +1062,6 @@ static BlockDriver bdrv_blkdebug = { .bdrv_debug_remove_breakpoint = blkdebug_debug_remove_breakpoint, .bdrv_debug_resume = blkdebug_debug_resume, - .bdrv_debug_is_suspended = blkdebug_debug_is_suspended, .bdrv_debug_wait_break = blkdebug_debug_wait_break, .strong_runtime_opts = blkdebug_strong_runtime_opts, -- 2.29.2