From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9hh5-0003Is-Dn for qemu-devel@nongnu.org; Mon, 29 Jun 2015 18:38:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z9hh2-00042t-8M for qemu-devel@nongnu.org; Mon, 29 Jun 2015 18:38:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49881) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9hh2-000420-20 for qemu-devel@nongnu.org; Mon, 29 Jun 2015 18:38:24 -0400 Message-ID: <5591C8DE.6080809@redhat.com> Date: Mon, 29 Jun 2015 18:38:22 -0400 From: John Snow MIME-Version: 1.0 References: <1435234332-581-1-git-send-email-stefanha@redhat.com> <1435234332-581-7-git-send-email-stefanha@redhat.com> In-Reply-To: <1435234332-581-7-git-send-email-stefanha@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 06/10] blockdev: make BlockJobTxn available to qmp 'transaction' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Kevin Wolf , Jeff Cody , vsementsov@parallels.com, famz@redhat.com, mreitz@redhat.com On 06/25/2015 08:12 AM, Stefan Hajnoczi wrote: > 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 > --- > blockdev.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/blockdev.c b/blockdev.c > index c572950..453f3ec 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) { > Reviewed-by: John Snow