From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdbaJ-0007er-La for qemu-devel@nongnu.org; Tue, 05 Nov 2013 03:02:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VdbaA-0002L8-A6 for qemu-devel@nongnu.org; Tue, 05 Nov 2013 03:01:59 -0500 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:35781) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vdba9-0002Ka-MF for qemu-devel@nongnu.org; Tue, 05 Nov 2013 03:01:50 -0500 Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 5 Nov 2013 13:31:47 +0530 Received: from d28relay04.in.ibm.com (d28relay04.in.ibm.com [9.184.220.61]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 83E471258053 for ; Tue, 5 Nov 2013 13:32:26 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay04.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rA581dHh36110450 for ; Tue, 5 Nov 2013 13:31:39 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rA581g0E009886 for ; Tue, 5 Nov 2013 13:31:42 +0530 From: Wenchao Xia Date: Tue, 5 Nov 2013 08:01:27 +0800 Message-Id: <1383609689-4417-5-git-send-email-xiawenc@linux.vnet.ibm.com> In-Reply-To: <1383609689-4417-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1383609689-4417-1-git-send-email-xiawenc@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V5 4/6] qcow2: cancel the modification on fail in qcow2_snapshot_create() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@gmail.com, mreitz@redhat.com, pbonzini@redhat.com, Wenchao Xia Signed-off-by: Wenchao Xia Reviewed-by: Max Reitz --- block/qcow2-snapshot.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index 70e329e..685ef8b 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -400,6 +400,7 @@ void qcow2_snapshot_create(BlockDriverState *bs, int i, ret; uint64_t *l1_table = NULL; int64_t l1_table_offset; + Error *err = NULL; memset(sn, 0, sizeof(*sn)); @@ -448,7 +449,7 @@ void qcow2_snapshot_create(BlockDriverState *bs, PRIu64 " with size %" PRIu64, sn->l1_table_offset, (uint64_t)(s->l1_size * sizeof(uint64_t))); - goto fail; + goto dealloc_cluster; } ret = bdrv_pwrite(bs->file, sn->l1_table_offset, l1_table, @@ -459,7 +460,7 @@ void qcow2_snapshot_create(BlockDriverState *bs, PRIu64 " with size %" PRIu64, sn->l1_table_offset, (uint64_t)(s->l1_size * sizeof(uint64_t))); - goto fail; + goto dealloc_cluster; } g_free(l1_table); @@ -476,7 +477,7 @@ void qcow2_snapshot_create(BlockDriverState *bs, "Failed in update of refcount for snapshot at %" PRIu64 " with size %d", s->l1_table_offset, s->l1_size); - goto fail; + goto dealloc_cluster; } /* Append the new snapshot to the snapshot list */ @@ -494,7 +495,7 @@ void qcow2_snapshot_create(BlockDriverState *bs, g_free(s->snapshots); s->snapshots = old_snapshot_list; s->nb_snapshots--; - goto fail; + goto restore_refcount; } g_free(old_snapshot_list); @@ -514,6 +515,22 @@ void qcow2_snapshot_create(BlockDriverState *bs, #endif return; +restore_refcount: + if (qcow2_update_snapshot_refcount(bs, s->l1_table_offset, s->l1_size, -1) + < 0 && errp) { + /* Nothing can be done now, need image check later */ + error_setg(&err, "%s\nqcow2: Error in restoring refcount in snapshot", + error_get_pretty(*errp)); + error_free(*errp); + *errp = NULL; + error_propagate(errp, err); + } + +dealloc_cluster: + qcow2_free_clusters(bs, sn->l1_table_offset, + sn->l1_size * sizeof(uint64_t), + QCOW2_DISCARD_ALWAYS); + fail: g_free(sn->id_str); g_free(sn->name); -- 1.7.1