From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeT02-0000jA-LA for qemu-devel@nongnu.org; Tue, 22 Sep 2015 15:13:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZeSzx-0008O5-Qm for qemu-devel@nongnu.org; Tue, 22 Sep 2015 15:13:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59935) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeSzx-0008Nx-Lm for qemu-devel@nongnu.org; Tue, 22 Sep 2015 15:13:05 -0400 References: <1442889976-8733-1-git-send-email-famz@redhat.com> <1442889976-8733-11-git-send-email-famz@redhat.com> From: John Snow Message-ID: <5601A840.3060202@redhat.com> Date: Tue, 22 Sep 2015 15:13:04 -0400 MIME-Version: 1.0 In-Reply-To: <1442889976-8733-11-git-send-email-famz@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v7 10/14] blockdev: make BlockJobTxn available to qmp 'transaction' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng , qemu-devel@nongnu.org Cc: Kevin Wolf , Jeff Cody , vsementsov@parallels.com, stefanha@redhat.com, Max Reitz On 09/21/2015 10:46 PM, Fam Zheng wrote: > 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: Max Reitz > Signed-off-by: Fam Zheng > --- > blockdev.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/blockdev.c b/blockdev.c > index 796bc64..ed50cb4 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; > }; > I know it's obvious, but for consistency we should update the documentation sitting right above this structure. > @@ -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); > @@ -1940,6 +1945,7 @@ exit: > } > g_free(state); > } > + block_job_txn_unref(block_job_txn); > } > > > With or without my recommendation: Reviewed-by: John Snow