From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZC7K9-0004XX-S5 for qemu-devel@nongnu.org; Mon, 06 Jul 2015 10:24:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZC7K7-0001NN-R6 for qemu-devel@nongnu.org; Mon, 06 Jul 2015 10:24:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34125) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZC7K7-0001NE-I9 for qemu-devel@nongnu.org; Mon, 06 Jul 2015 10:24:43 -0400 From: Stefan Hajnoczi Date: Mon, 6 Jul 2015 15:24:25 +0100 Message-Id: <1436192669-10062-7-git-send-email-stefanha@redhat.com> In-Reply-To: <1436192669-10062-1-git-send-email-stefanha@redhat.com> References: <1436192669-10062-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH v2 06/10] blockdev: make BlockJobTxn available to qmp 'transaction' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , famz@redhat.com, John Snow , Jeff Cody , mreitz@redhat.com, vsementsov@parallels.com, Stefan Hajnoczi Provide a BlockJobTxn to actions executed in a qmp 'transaction' command. This allows actions to make their block jobs either complete as a group or fail/cancel together. The next patch adds the first user. Signed-off-by: Stefan Hajnoczi Reviewed-by: Fam Zheng Reviewed-by: John Snow --- blockdev.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/blockdev.c b/blockdev.c index 0ab8ad9..9a83f8b 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1279,6 +1279,7 @@ typedef struct BlkActionOps { struct BlkActionState { TransactionAction *action; const BlkActionOps *ops; + BlockJobTxn *block_job_txn; QSIMPLEQ_ENTRY(BlkActionState) entry; }; @@ -1883,12 +1884,15 @@ static const BlkActionOps actions[] = { void qmp_transaction(TransactionActionList *dev_list, Error **errp) { TransactionActionList *dev_entry = dev_list; + BlockJobTxn *block_job_txn; BlkActionState *state, *next; Error *local_err = NULL; QSIMPLEQ_HEAD(snap_bdrv_states, BlkActionState) snap_bdrv_states; QSIMPLEQ_INIT(&snap_bdrv_states); + block_job_txn = block_job_txn_new(); + /* drain all i/o before any operations */ bdrv_drain_all(); @@ -1908,6 +1912,7 @@ void qmp_transaction(TransactionActionList *dev_list, Error **errp) state = g_malloc0(ops->instance_size); state->ops = ops; state->action = dev_info; + state->block_job_txn = block_job_txn; QSIMPLEQ_INSERT_TAIL(&snap_bdrv_states, state, entry); state->ops->prepare(state, &local_err); @@ -1917,6 +1922,8 @@ void qmp_transaction(TransactionActionList *dev_list, Error **errp) } } + block_job_txn_begin(&block_job_txn); + QSIMPLEQ_FOREACH(state, &snap_bdrv_states, entry) { if (state->ops->commit) { state->ops->commit(state); @@ -1927,6 +1934,8 @@ void qmp_transaction(TransactionActionList *dev_list, Error **errp) goto exit; delete_and_fail: + block_job_txn_begin(&block_job_txn); + /* failure, and it is all-or-none; roll back all operations */ QSIMPLEQ_FOREACH(state, &snap_bdrv_states, entry) { if (state->ops->abort) { -- 2.4.3