From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbjTn-0006km-3d for qemu-devel@nongnu.org; Tue, 15 Sep 2015 02:12:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbjTm-00048i-9B for qemu-devel@nongnu.org; Tue, 15 Sep 2015 02:12:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47689) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbjTm-00048d-52 for qemu-devel@nongnu.org; Tue, 15 Sep 2015 02:12:34 -0400 From: Fam Zheng Date: Tue, 15 Sep 2015 14:11:49 +0800 Message-Id: <1442297513-7001-11-git-send-email-famz@redhat.com> In-Reply-To: <1442297513-7001-1-git-send-email-famz@redhat.com> References: <1442297513-7001-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v6 10/14] 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 , Jeff Cody , Max Reitz , vsementsov@parallels.com, stefanha@redhat.com, John Snow From: 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 Signed-off-by: Fam Zheng --- blockdev.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/blockdev.c b/blockdev.c index 4ebded8..93a9eef 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1285,6 +1285,7 @@ typedef struct BlkActionOps { struct BlkActionState { TransactionAction *action; const BlkActionOps *ops; + BlockJobTxn *block_job_txn; QSIMPLEQ_ENTRY(BlkActionState) entry; }; @@ -1889,12 +1890,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(); @@ -1914,6 +1918,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); @@ -1946,6 +1951,7 @@ exit: } g_free(state); } + block_job_txn_unref(block_job_txn); } -- 2.4.3