From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc1sE-0004Hg-SO for qemu-devel@nongnu.org; Tue, 05 Jun 2012 18:05:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sc1sD-00013g-3K for qemu-devel@nongnu.org; Tue, 05 Jun 2012 18:05:10 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:40874) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc1sC-0000zZ-QI for qemu-devel@nongnu.org; Tue, 05 Jun 2012 18:05:09 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so8716928pbb.4 for ; Tue, 05 Jun 2012 15:05:08 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 6 Jun 2012 00:04:49 +0200 Message-Id: <1338933895-20677-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1338933895-20677-1-git-send-email-pbonzini@redhat.com> References: <1338933895-20677-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v3 1/7] block: flush in writethrough mode after writes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com We want to make the formats handle their own flushes autonomously, while keeping for guests the ability to use a writethrough cache. Since formats will write metadata via bs->file, bdrv_co_do_writev is the only place where we need to add a flush. Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- block.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 85ef6af..7538112 100644 --- a/block.c +++ b/block.c @@ -1758,8 +1758,8 @@ int bdrv_pwrite_sync(BlockDriverState *bs, int64_t offset, return ret; } - /* No flush needed for cache modes that use O_DSYNC */ - if ((bs->open_flags & BDRV_O_CACHE_WB) != 0) { + /* No flush needed for cache modes that already do it */ + if (bs->enable_write_cache) { bdrv_flush(bs); } @@ -1808,6 +1808,9 @@ static int coroutine_fn bdrv_co_do_copy_on_readv(BlockDriverState *bs, ret = bdrv_co_do_write_zeroes(bs, cluster_sector_num, cluster_nb_sectors); } else { + /* This does not change the data on the disk, it is not necessary + * to flush even in cache=writethrough mode. + */ ret = drv->bdrv_co_writev(bs, cluster_sector_num, cluster_nb_sectors, &bounce_qiov); } @@ -1977,6 +1980,10 @@ static int coroutine_fn bdrv_co_do_writev(BlockDriverState *bs, ret = drv->bdrv_co_writev(bs, sector_num, nb_sectors, qiov); } + if (ret == 0 && !bs->enable_write_cache) { + ret = bdrv_co_flush(bs); + } + if (bs->dirty_bitmap) { set_dirty_bitmap(bs, sector_num, nb_sectors, 1); } -- 1.7.10.1