diff mbox

[v7,10/14] blockdev: make BlockJobTxn available to qmp 'transaction'

Message ID 1442889976-8733-11-git-send-email-famz@redhat.com
State New
Headers show

Commit Message

Fam Zheng Sept. 22, 2015, 2:46 a.m. UTC
From: Stefan Hajnoczi <stefanha@redhat.com>

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 <stefanha@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 blockdev.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

John Snow Sept. 22, 2015, 7:13 p.m. UTC | #1
On 09/21/2015 10:46 PM, Fam Zheng wrote:
> From: Stefan Hajnoczi <stefanha@redhat.com>
> 
> 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 <stefanha@redhat.com>
> Reviewed-by: Fam Zheng <famz@redhat.com>
> Reviewed-by: Max Reitz <mreitz@redhat.com>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  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 <jsnow@redhat.com>
diff mbox

Patch

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;
 };
 
@@ -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);
 }