From patchwork Mon Oct 14 21:52:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 283483 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 62BB42C011F for ; Tue, 15 Oct 2013 16:54:56 +1100 (EST) Received: from localhost ([::1]:39890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VVxao-0005zp-IT for incoming@patchwork.ozlabs.org; Tue, 15 Oct 2013 01:54:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VVxYz-0003RB-Nm for qemu-devel@nongnu.org; Tue, 15 Oct 2013 01:53:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VVxYp-0003tA-UE for qemu-devel@nongnu.org; Tue, 15 Oct 2013 01:53:01 -0400 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:59945) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VVxYp-0003sK-DD for qemu-devel@nongnu.org; Tue, 15 Oct 2013 01:52:51 -0400 Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 15 Oct 2013 11:22:47 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp09.in.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 15 Oct 2013 11:22:44 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 3A4371258051 for ; Tue, 15 Oct 2013 11:23:11 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r9F5tOqG46858254 for ; Tue, 15 Oct 2013 11:25:24 +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 r9F5qhNl000758 for ; Tue, 15 Oct 2013 11:22:43 +0530 Received: from RH64wenchao ([9.181.129.59]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r9F5qZHF000390; Tue, 15 Oct 2013 11:22:41 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Tue, 15 Oct 2013 05:52:31 +0800 Message-Id: <1381787553-12497-5-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1381787553-12497-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1381787553-12497-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13101505-2674-0000-0000-00000B0BC0C2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.9 Cc: kwolf@redhat.com, stefanha@gmail.com, mreitz@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V4 4/6] qcow2: cancel the modification on fail in qcow2_snapshot_create() 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 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 c933b7f..6d0ffd4 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -404,6 +404,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)); @@ -453,7 +454,7 @@ void qcow2_snapshot_create(BlockDriverState *bs, PRIu64 " with size %" PRIu64 ": %d (%s)", sn->l1_table_offset, s->l1_size * sizeof(uint64_t), ret, strerror(-ret)); - goto fail; + goto dealloc_cluster; } ret = bdrv_pwrite(bs->file, sn->l1_table_offset, l1_table, @@ -463,7 +464,7 @@ void qcow2_snapshot_create(BlockDriverState *bs, PRIu64 " with size %" PRIu64 ": %d (%s)", sn->l1_table_offset, s->l1_size * sizeof(uint64_t), ret, strerror(-ret)); - goto fail; + goto dealloc_cluster; } g_free(l1_table); @@ -479,7 +480,7 @@ void qcow2_snapshot_create(BlockDriverState *bs, error_setg(errp, "Failed in update of refcount for snapshot at %" PRIu64 " with size %d: %d (%s)", s->l1_table_offset, s->l1_size, ret, strerror(-ret)); - goto fail; + goto dealloc_cluster; } /* Append the new snapshot to the snapshot list */ @@ -497,7 +498,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); @@ -517,6 +518,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);