From patchwork Wed May 8 10:25:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 242546 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 EBB4B2C026C for ; Wed, 8 May 2013 20:30:07 +1000 (EST) Received: from localhost ([::1]:58626 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ua1dN-0007Bw-A5 for incoming@patchwork.ozlabs.org; Wed, 08 May 2013 06:30:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ua1ag-0003kx-3Y for qemu-devel@nongnu.org; Wed, 08 May 2013 06:27:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ua1ae-0002gF-MH for qemu-devel@nongnu.org; Wed, 08 May 2013 06:27:18 -0400 Received: from e23smtp02.au.ibm.com ([202.81.31.144]:55626) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ua1ad-0002fs-Tq for qemu-devel@nongnu.org; Wed, 08 May 2013 06:27:16 -0400 Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 8 May 2013 20:18:55 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp02.au.ibm.com (202.81.31.208) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 8 May 2013 20:18:53 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id A45F42CE804A for ; Wed, 8 May 2013 20:27:08 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r48ADGlG22151300 for ; Wed, 8 May 2013 20:13:17 +1000 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r48AR70F024449 for ; Wed, 8 May 2013 20:27:08 +1000 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.202]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r48APNIY022425; Wed, 8 May 2013 20:27:06 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Wed, 8 May 2013 18:25:15 +0800 Message-Id: <1368008716-9632-5-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1368008716-9632-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1368008716-9632-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13050810-5490-0000-0000-0000036B786A X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.144 Cc: kwolf@redhat.com, stefanha@gmail.com, dietmar@proxmox.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V5 4/5] block: package rollback code in qmp_transaction() 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: Kevin Wolf Reviewed-by: Stefan Hajnoczi Reviewed-by: Eric Blake --- blockdev.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/blockdev.c b/blockdev.c index 76f0532..2131e13 100644 --- a/blockdev.c +++ b/blockdev.c @@ -882,6 +882,13 @@ static void external_snapshot_commit(BlkTransactionStates *states) NULL); } +static void external_snapshot_abort(BlkTransactionStates *states) +{ + if (states->new_bs) { + bdrv_delete(states->new_bs); + } +} + /* * 'Atomic' group snapshots. The snapshots are taken as a set, and if any fail * then we do not pivot any of the devices in the group, and abandon the @@ -939,9 +946,7 @@ delete_and_fail: * the original bs for all images */ QSIMPLEQ_FOREACH(states, &snap_bdrv_states, entry) { - if (states->new_bs) { - bdrv_delete(states->new_bs); - } + external_snapshot_abort(states); } exit: QSIMPLEQ_FOREACH_SAFE(states, &snap_bdrv_states, entry, next) {