From patchwork Tue Mar 29 15:08:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 603026 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qZFGr257yz9sBm for ; Wed, 30 Mar 2016 02:35:48 +1100 (AEDT) Received: from localhost ([::1]:48011 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akvgI-0005SB-G7 for incoming@patchwork.ozlabs.org; Tue, 29 Mar 2016 11:35:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40967) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akvII-0005RT-Sy for qemu-devel@nongnu.org; Tue, 29 Mar 2016 11:10:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1akvIE-0006ge-OS for qemu-devel@nongnu.org; Tue, 29 Mar 2016 11:10:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6853) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akvI4-0006ct-V4; Tue, 29 Mar 2016 11:10:45 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id AB4097F09A; Tue, 29 Mar 2016 15:10:44 +0000 (UTC) Received: from noname.redhat.com (ovpn-116-120.ams2.redhat.com [10.36.116.120]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2TF913L011786; Tue, 29 Mar 2016 11:10:43 -0400 From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 29 Mar 2016 17:08:44 +0200 Message-Id: <1459264128-12761-45-git-send-email-kwolf@redhat.com> In-Reply-To: <1459264128-12761-1-git-send-email-kwolf@redhat.com> References: <1459264128-12761-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 44/48] block: Remove bdrv_(set_)enable_write_cache() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Reviewed-by: Max Reitz --- block.c | 16 ---------------- block/backup.c | 1 - block/mirror.c | 1 - include/block/block.h | 2 -- 4 files changed, 20 deletions(-) diff --git a/block.c b/block.c index 55100e2..b792bf5 100644 --- a/block.c +++ b/block.c @@ -2694,22 +2694,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 ab3e345..10397e2 100644 --- a/block/backup.c +++ b/block/backup.c @@ -402,7 +402,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 9635fa8..da18c0b 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -855,7 +855,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 bd8fa21..6808e9b 100644 --- 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);