From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42973) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGWLR-000806-Hq for qemu-devel@nongnu.org; Fri, 15 Mar 2013 11:15:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGWLK-00049M-Va for qemu-devel@nongnu.org; Fri, 15 Mar 2013 11:14:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12215) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGWLK-00048h-NG for qemu-devel@nongnu.org; Fri, 15 Mar 2013 11:14:50 -0400 From: Stefan Hajnoczi Date: Fri, 15 Mar 2013 16:14:09 +0100 Message-Id: <1363360465-5247-13-git-send-email-stefanha@redhat.com> In-Reply-To: <1363360465-5247-1-git-send-email-stefanha@redhat.com> References: <1363360465-5247-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 12/28] qcow2: flush in qcow2_update_snapshot_refcount() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori Users of qcow2_update_snapshot_refcount() do not flush consistently. qcow2_snapshot_create() flushes but qcow2_snapshot_goto() and qcow2_snapshot_delete() do not. Solve this by moving the bdrv_flush() into qcow2_update_snapshot_refcount(). Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- block/qcow2-refcount.c | 2 +- block/qcow2-snapshot.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 4d9df5f..3d29d30 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -851,7 +851,7 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, } } - ret = 0; + ret = bdrv_flush(bs); fail: if (l2_table) { qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table); diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index f4719d9..992a5c8 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -381,11 +381,6 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) goto fail; } - ret = bdrv_flush(bs); - if (ret < 0) { - goto fail; - } - /* Append the new snapshot to the snapshot list */ new_snapshot_list = g_malloc((s->nb_snapshots + 1) * sizeof(QCowSnapshot)); if (s->snapshots) { -- 1.8.1.4