From patchwork Sat Apr 13 11:11:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 236324 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 E31172C008C for ; Sat, 13 Apr 2013 21:13:41 +1000 (EST) Received: from localhost ([::1]:33785 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQyOq-0007PU-0N for incoming@patchwork.ozlabs.org; Sat, 13 Apr 2013 07:13:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQyOK-0007Lb-Ns for qemu-devel@nongnu.org; Sat, 13 Apr 2013 07:13:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQyOJ-00051w-Hk for qemu-devel@nongnu.org; Sat, 13 Apr 2013 07:13:08 -0400 Received: from e23smtp02.au.ibm.com ([202.81.31.144]:47978) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQyOI-00051Z-ML for qemu-devel@nongnu.org; Sat, 13 Apr 2013 07:13:07 -0400 Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 13 Apr 2013 21:05:10 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp02.au.ibm.com (202.81.31.208) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 13 Apr 2013 21:05:09 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 7F5A12BB0051 for ; Sat, 13 Apr 2013 21:12:42 +1000 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r3DAxKMh11075860 for ; Sat, 13 Apr 2013 20:59:20 +1000 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r3DBCf1J022306 for ; Sat, 13 Apr 2013 21:12:42 +1000 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.157]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r3DBBeZi019897; Sat, 13 Apr 2013 21:12:40 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Sat, 13 Apr 2013 19:11:41 +0800 Message-Id: <1365851501-3037-6-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1365851501-3037-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1365851501-3037-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13041311-5490-0000-0000-000003456017 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, pbonzini@redhat.com, Wenchao Xia , dietmar@proxmox.com, stefanha@gmail.com Subject: [Qemu-devel] [PATCH V2 5/5] block: make all steps in qmp_transaction() as callback 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 Now qmp_transaction() can be extended with other operation, external snapshot or backing chain creation, is just one case it. Signed-off-by: Wenchao Xia --- blockdev.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 58 insertions(+), 10 deletions(-) diff --git a/blockdev.c b/blockdev.c index 3e69569..9f0acfb 100644 --- a/blockdev.c +++ b/blockdev.c @@ -779,14 +779,35 @@ void qmp_blockdev_snapshot_sync(const char *device, const char *snapshot_file, /* New and old BlockDriverState structs for group snapshots */ + +/* Only in prepare() it may fail, so roll back just need to take care + what is done in prepare(). */ +typedef struct BdrvActionOps { + /* Prepare the work, must NOT be NULL. */ + int (*prepare)(BlockdevAction *action, void **p_opaque, Error **errp); + /* Commit the changes, can be NULL. */ + void (*commit)(BlockdevAction *action, void *opaque); + /* Rollback the changes on fail, mut NOT be NULL. */ + void (*rollback)(BlockdevAction *action, void *opaque); + /* Clean up resource in the end, can be NULL. */ + void (*clean)(BlockdevAction *action, void *opaque); +} BdrvActionOps; + typedef struct BlkTransactionStates { - BlockDriverState *old_bs; - BlockDriverState *new_bs; + BlockdevAction *action; + void *opaque; + const BdrvActionOps *ops; QSIMPLEQ_ENTRY(BlkTransactionStates) entry; } BlkTransactionStates; +/* external snapshot private data */ +typedef struct ExternalSnapshotState { + BlockDriverState *old_bs; + BlockDriverState *new_bs; +} ExternalSnapshotState; + static int external_snapshot_prepare(BlockdevAction *action, - BlkTransactionStates *states, + void **p_opaque, Error **errp) { BlockDriver *proto_drv; @@ -797,6 +818,7 @@ static int external_snapshot_prepare(BlockdevAction *action, const char *new_image_file; const char *format = "qcow2"; enum NewImageMode mode = NEW_IMAGE_MODE_ABSOLUTE_PATHS; + ExternalSnapshotState *states; /* get parameters */ g_assert(action->kind == BLOCKDEV_ACTION_KIND_BLOCKDEV_SNAPSHOT_SYNC); @@ -817,6 +839,9 @@ static int external_snapshot_prepare(BlockdevAction *action, goto fail; } + *p_opaque = g_malloc0(sizeof(ExternalSnapshotState)); + states = *p_opaque; + states->old_bs = bdrv_find(device); if (!states->old_bs) { error_set(errp, QERR_DEVICE_NOT_FOUND, device); @@ -878,8 +903,10 @@ static int external_snapshot_prepare(BlockdevAction *action, } static void external_snapshot_commit(BlockdevAction *action, - BlkTransactionStates *states) + void *opaque) { + ExternalSnapshotState *states = opaque; + /* 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 @@ -890,13 +917,27 @@ static void external_snapshot_commit(BlockdevAction *action, } static void external_snapshot_rollback(BlockdevAction *action, - BlkTransactionStates *states) + void *opaque) { + ExternalSnapshotState *states = opaque; if (states->new_bs) { bdrv_delete(states->new_bs); } } +static void external_snapshot_clean(BlockdevAction *action, + void *opaque) +{ + g_free(opaque); +} + +const BdrvActionOps external_snapshot_ops = { + .prepare = external_snapshot_prepare, + .commit = external_snapshot_commit, + .rollback = external_snapshot_rollback, + .clean = external_snapshot_clean, +}; + /* * '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 @@ -923,23 +964,27 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp) states = g_malloc0(sizeof(BlkTransactionStates)); QSIMPLEQ_INSERT_TAIL(&snap_bdrv_states, states, entry); + states->action = dev_info; switch (dev_info->kind) { case BLOCKDEV_ACTION_KIND_BLOCKDEV_SNAPSHOT_SYNC: - if (external_snapshot_prepare(dev_info, states, errp)) { - goto delete_and_fail; - } + states->ops = &external_snapshot_ops; break; default: abort(); } + if (states->ops->prepare(states->action, &states->opaque, errp)) { + goto delete_and_fail; + } } /* 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) { - external_snapshot_commit(NULL, states); + if (states->ops->commit) { + states->ops->commit(states->action, states->opaque); + } } /* success */ @@ -951,10 +996,13 @@ delete_and_fail: * the original bs for all images */ QSIMPLEQ_FOREACH(states, &snap_bdrv_states, entry) { - external_snapshot_rollback(NULL, states); + states->ops->rollback(states->action, states->opaque); } exit: QSIMPLEQ_FOREACH_SAFE(states, &snap_bdrv_states, entry, next) { + if (states->ops->clean) { + states->ops->clean(states->action, states->opaque); + } g_free(states); } }