diff options
| -rw-r--r-- | block.c | 7 | ||||
| -rw-r--r-- | block/block-backend.c | 2 | ||||
| -rw-r--r-- | block/export/export.c | 2 | ||||
| -rw-r--r-- | block/parallels.c | 2 | ||||
| -rw-r--r-- | include/block/block.h | 1 | ||||
| -rw-r--r-- | tests/unit/test-block-iothread.c | 2 |
6 files changed, 11 insertions, 5 deletions
@@ -6393,6 +6393,11 @@ void bdrv_init_with_whitelist(void) bdrv_init(); } +int bdrv_activate(BlockDriverState *bs, Error **errp) +{ + return bdrv_invalidate_cache(bs, errp); +} + int coroutine_fn bdrv_co_invalidate_cache(BlockDriverState *bs, Error **errp) { BdrvChild *child, *parent; @@ -6478,7 +6483,7 @@ void bdrv_invalidate_cache_all(Error **errp) int ret; aio_context_acquire(aio_context); - ret = bdrv_invalidate_cache(bs, errp); + ret = bdrv_activate(bs, errp); aio_context_release(aio_context); if (ret < 0) { bdrv_next_cleanup(&it); diff --git a/block/block-backend.c b/block/block-backend.c index 4ff6b4d785..c516113a36 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1889,7 +1889,7 @@ void blk_invalidate_cache(BlockBackend *blk, Error **errp) return; } - bdrv_invalidate_cache(bs, errp); + bdrv_activate(bs, errp); } bool blk_is_inserted(BlockBackend *blk) diff --git a/block/export/export.c b/block/export/export.c index 6d3b9964c8..7253af3bc3 100644 --- a/block/export/export.c +++ b/block/export/export.c @@ -139,7 +139,7 @@ BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp) * access since the export could be available before migration handover. * ctx was acquired in the caller. */ - bdrv_invalidate_cache(bs, NULL); + bdrv_activate(bs, NULL); perm = BLK_PERM_CONSISTENT_READ; if (export->writable) { diff --git a/block/parallels.c b/block/parallels.c index 6ebad2a2bb..e58c828422 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -873,7 +873,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, s->bat_dirty_bmap = bitmap_new(DIV_ROUND_UP(s->header_size, s->bat_dirty_block)); - /* Disable migration until bdrv_invalidate_cache method is added */ + /* Disable migration until bdrv_activate method is added */ error_setg(&s->migration_blocker, "The Parallels format used by node '%s' " "does not support live migration", bdrv_get_device_or_node_name(bs)); diff --git a/include/block/block.h b/include/block/block.h index e1713ee306..18cd336911 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -494,6 +494,7 @@ int bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf); int generated_co_wrapper bdrv_invalidate_cache(BlockDriverState *bs, Error **errp); void bdrv_invalidate_cache_all(Error **errp); +int bdrv_activate(BlockDriverState *bs, Error **errp); int bdrv_inactivate_all(void); /* Ensure contents are flushed to disk. */ diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothread.c index aea660aeed..378a7b7869 100644 --- a/tests/unit/test-block-iothread.c +++ b/tests/unit/test-block-iothread.c @@ -282,7 +282,7 @@ static void test_sync_op_check(BdrvChild *c) static void test_sync_op_invalidate_cache(BdrvChild *c) { /* Early success: Image is not inactive */ - bdrv_invalidate_cache(c->bs, NULL); + bdrv_activate(c->bs, NULL); } |