From patchwork Wed May 15 08:43:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 243944 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 79A072C00FD for ; Wed, 15 May 2013 18:46:04 +1000 (EST) Received: from localhost ([::1]:32806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UcXLW-0005EI-FR for incoming@patchwork.ozlabs.org; Wed, 15 May 2013 04:46:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57911) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UcXL2-0005Dh-Cm for qemu-devel@nongnu.org; Wed, 15 May 2013 04:45:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UcXL1-0003rg-8I for qemu-devel@nongnu.org; Wed, 15 May 2013 04:45:32 -0400 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:59005) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UcXL0-0003rQ-JB for qemu-devel@nongnu.org; Wed, 15 May 2013 04:45:31 -0400 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 15 May 2013 14:10:24 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp04.in.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 15 May 2013 14:10:23 +0530 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id A3F561258051 for ; Wed, 15 May 2013 14:17:14 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r4F8jD5C9830490 for ; Wed, 15 May 2013 14:15:13 +0530 Received: from d28av03.in.ibm.com (loopback [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r4F8jJCf011523 for ; Wed, 15 May 2013 18:45:20 +1000 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.120]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r4F8hjIU003740; Wed, 15 May 2013 18:45:18 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Wed, 15 May 2013 16:43:39 +0800 Message-Id: <1368607419-15178-2-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1368607419-15178-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1368607419-15178-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13051508-5564-0000-0000-000007EE82EE X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.4 Cc: kwolf@redhat.com, pbonzini@redhat.com, aliguori@us.ibm.com, Wenchao Xia , stefanha@gmail.com Subject: [Qemu-devel] [PATCH 2/2] 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 --- block/qcow2-snapshot.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index a6065a9..ad030f9 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -410,6 +410,17 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) #endif return 0; +restore_refcount: + ret = qcow2_update_snapshot_refcount(bs, s->l1_table_offset, + s->l1_size, -1); + if (ret < 0) { + /* Nothing can be done none now, need image check later */ + error_report("qcow2: Error in restoring refcount in snapshot"); + } + +dealloc_cluster: + qcow2_free_clusters(bs, sn->l1_table_offset, sn->l1_size); + fail: g_free(sn->id_str); g_free(sn->name);