block: Remove bdrv_(set_)enable_write_cache()

The only remaining users were block jobs (mirror and backup) which
unconditionally enabled WCE on the BlockBackend of the target image. As
these block jobs don't go through BlockBackend for their I/O requests,
they aren't affected by this setting anyway but always get a writeback
mode, so that call can be removed.

Signed-off-by: Kevin Wolf <[email protected]>
Reviewed-by: Max Reitz <[email protected]>

diff --git a/block.c b/block.c
index 7ff4fcb7f5cc8d65eef48eb37a6c039abd15e75e..d36eb75be96a2c027c206e36deb1ada53c25f0f8 100644 (file)
--- a/block.c
+++ b/block.c
@@ -2695,22 +2695,6 @@ int bdrv_is_sg(BlockDriverState *bs)
     return bs->sg;
 }
 
-int bdrv_enable_write_cache(BlockDriverState *bs)
-{
-    if (bs->blk) {
-        return blk_enable_write_cache(bs->blk);
-    } else {
-        return true;
-    }
-}
-
-void bdrv_set_enable_write_cache(BlockDriverState *bs, bool wce)
-{
-    if (bs->blk) {
-        blk_set_enable_write_cache(bs->blk, wce);
-    }
-}
-
 int bdrv_is_encrypted(BlockDriverState *bs)
 {
     if (bs->backing && bs->backing->bs->encrypted) {

diff --git a/block/backup.c b/block/backup.c
index 9170983ba912c3a413d1f432bc4e1783bcb4e8b9..491fd140684df5cd0d4efd4f8ce69bb25a84876b 100644 (file)
--- a/block/backup.c
+++ b/block/backup.c
@@ -404,7 +404,6 @@ static void coroutine_fn backup_run(void *opaque)
 
     job->done_bitmap = bitmap_new(end);
 
-    bdrv_set_enable_write_cache(target, true);
     if (target->blk) {
         blk_set_on_error(target->blk, on_target_error, on_target_error);
         blk_iostatus_enable(target->blk);

diff --git a/block/mirror.c b/block/mirror.c
index 7bfd0d29961ef9554a42a7775ca49e5fe99f0f00..f64db1a69b7ccd5bc8797467a0fd961cd0dcab69 100644 (file)
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -856,7 +856,6 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target,
 
     bdrv_op_block_all(s->target, s->common.blocker);
 
-    bdrv_set_enable_write_cache(s->target, true);
     if (s->target->blk) {
         blk_set_on_error(s->target->blk, on_target_error, on_target_error);
         blk_iostatus_enable(s->target->blk);

diff --git a/include/block/block.h b/include/block/block.h
index 7bacd556b82b90fd4a2ebc88c17a60f6571dbfac..6a39f946f52840f9e60e6806a5ab32871b6d1976 100644 (file)
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -395,8 +395,6 @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
 
 int bdrv_is_read_only(BlockDriverState *bs);
 int bdrv_is_sg(BlockDriverState *bs);
-int bdrv_enable_write_cache(BlockDriverState *bs);
-void bdrv_set_enable_write_cache(BlockDriverState *bs, bool wce);
 bool bdrv_is_inserted(BlockDriverState *bs);
 int bdrv_media_changed(BlockDriverState *bs);
 void bdrv_lock_medium(BlockDriverState *bs, bool locked);