From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uft34-0007Zl-7F for qemu-devel@nongnu.org; Fri, 24 May 2013 10:33:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uft2v-0003tz-AC for qemu-devel@nongnu.org; Fri, 24 May 2013 10:32:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36331) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uft2u-0003tr-VV for qemu-devel@nongnu.org; Fri, 24 May 2013 10:32:41 -0400 From: Stefan Hajnoczi Date: Fri, 24 May 2013 16:32:19 +0200 Message-Id: <1369405947-14818-4-git-send-email-stefanha@redhat.com> In-Reply-To: <1369405947-14818-1-git-send-email-stefanha@redhat.com> References: <1369405947-14818-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 03/11] block: package committing code in qmp_transaction() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Anthony Liguori , Wenchao Xia From: Wenchao Xia The code is simply moved into a separate function. Signed-off-by: Wenchao Xia Reviewed-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- blockdev.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/blockdev.c b/blockdev.c index 0115f46..76f0532 100644 --- a/blockdev.c +++ b/blockdev.c @@ -871,6 +871,17 @@ static void external_snapshot_prepare(BlockdevAction *action, } } +static void external_snapshot_commit(BlkTransactionStates *states) +{ + /* This removes our old bs from the bdrv_states, and adds the new bs */ + bdrv_append(states->new_bs, states->old_bs); + /* We don't need (or want) to use the transactional + * bdrv_reopen_multiple() across all the entries at once, because we + * don't want to abort all of them if one of them fails the reopen */ + bdrv_reopen(states->new_bs, states->new_bs->open_flags & ~BDRV_O_RDWR, + NULL); +} + /* * '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 @@ -916,13 +927,7 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp) /* Now we are going to do the actual pivot. Everything up to this point * is reversible, but we are committed at this point */ QSIMPLEQ_FOREACH(states, &snap_bdrv_states, entry) { - /* This removes our old bs from the bdrv_states, and adds the new bs */ - bdrv_append(states->new_bs, states->old_bs); - /* We don't need (or want) to use the transactional - * bdrv_reopen_multiple() across all the entries at once, because we - * don't want to abort all of them if one of them fails the reopen */ - bdrv_reopen(states->new_bs, states->new_bs->open_flags & ~BDRV_O_RDWR, - NULL); + external_snapshot_commit(states); } /* success */ -- 1.8.1.4