From a846fdf85ff06e60d1d4f2da8ee26a111011e1f9 Mon Sep 17 00:00:00 2001

From: John Snow <jsnow@redhat.com>

Date: Mon, 10 Sep 2018 18:17:48 +0200

Subject: [PATCH 10/25] block/commit: add block job creation flags

RH-Author: John Snow <jsnow@redhat.com>

Message-id: <20180910181803.11781-11-jsnow@redhat.com>

Patchwork-id: 82109

O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 10/25] block/commit: add block job creation flags

Bugzilla: 1626061

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Jeffrey Cody <jcody@redhat.com>

RH-Acked-by: Kevin Wolf <kwolf@redhat.com>

Add support for taking and passing forward job creation flags.

Signed-off-by: John Snow <jsnow@redhat.com>

Reviewed-by: Max Reitz <mreitz@redhat.com>

Reviewed-by: Jeff Cody <jcody@redhat.com>

Message-id: 20180906130225.5118-2-jsnow@redhat.com

Signed-off-by: Max Reitz <mreitz@redhat.com>

(cherry picked from commit cbb05aee29ba2c2dbbe8ac913a05bd6e1eff4e8a)

Signed-off-by: John Snow <jsnow@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 block/commit.c            | 5 +++--

 blockdev.c                | 7 ++++---

 include/block/block_int.h | 5 ++++-

 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/block/commit.c b/block/commit.c

index 25b3cb8..c737664 100644

--- a/block/commit.c

+++ b/block/commit.c

@@ -254,7 +254,8 @@ static BlockDriver bdrv_commit_top = {

 };

 void commit_start(const char *job_id, BlockDriverState *bs,

-                  BlockDriverState *base, BlockDriverState *top, int64_t speed,

+                  BlockDriverState *base, BlockDriverState *top,

+                  int creation_flags, int64_t speed,

                   BlockdevOnError on_error, const char *backing_file_str,

                   const char *filter_node_name, Error **errp)

 {

@@ -272,7 +273,7 @@ void commit_start(const char *job_id, BlockDriverState *bs,

     }

     s = block_job_create(job_id, &commit_job_driver, NULL, bs, 0, BLK_PERM_ALL,

-                         speed, JOB_DEFAULT, NULL, NULL, errp);

+                         speed, creation_flags, NULL, NULL, errp);

     if (!s) {

         return;

     }

diff --git a/blockdev.c b/blockdev.c

index baa7e18..20dbcf5 100644

--- a/blockdev.c

+++ b/blockdev.c

@@ -3371,6 +3371,7 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device,

      * BlockdevOnError change for blkmirror makes it in

      */

     BlockdevOnError on_error = BLOCKDEV_ON_ERROR_REPORT;

+    int job_flags = JOB_DEFAULT;

     if (!has_speed) {

         speed = 0;

@@ -3452,15 +3453,15 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device,

             goto out;

         }

         commit_active_start(has_job_id ? job_id : NULL, bs, base_bs,

-                            JOB_DEFAULT, speed, on_error,

+                            job_flags, speed, on_error,

                             filter_node_name, NULL, NULL, false, &local_err);

     } else {

         BlockDriverState *overlay_bs = bdrv_find_overlay(bs, top_bs);

         if (bdrv_op_is_blocked(overlay_bs, BLOCK_OP_TYPE_COMMIT_TARGET, errp)) {

             goto out;

         }

-        commit_start(has_job_id ? job_id : NULL, bs, base_bs, top_bs, speed,

-                     on_error, has_backing_file ? backing_file : NULL,

+        commit_start(has_job_id ? job_id : NULL, bs, base_bs, top_bs, job_flags,

+                     speed, on_error, has_backing_file ? backing_file : NULL,

                      filter_node_name, &local_err);

     }

     if (local_err != NULL) {

diff --git a/include/block/block_int.h b/include/block/block_int.h

index b05cf11..25ad363 100644

--- a/include/block/block_int.h

+++ b/include/block/block_int.h

@@ -951,6 +951,8 @@ void stream_start(const char *job_id, BlockDriverState *bs,

  * @bs: Active block device.

  * @top: Top block device to be committed.

  * @base: Block device that will be written into, and become the new top.

+ * @creation_flags: Flags that control the behavior of the Job lifetime.

+ *                  See @BlockJobCreateFlags

  * @speed: The maximum speed, in bytes per second, or 0 for unlimited.

  * @on_error: The action to take upon error.

  * @backing_file_str: String to use as the backing file in @top's overlay

@@ -961,7 +963,8 @@ void stream_start(const char *job_id, BlockDriverState *bs,

  *

  */

 void commit_start(const char *job_id, BlockDriverState *bs,

-                  BlockDriverState *base, BlockDriverState *top, int64_t speed,

+                  BlockDriverState *base, BlockDriverState *top,

+                  int creation_flags, int64_t speed,

                   BlockdevOnError on_error, const char *backing_file_str,

                   const char *filter_node_name, Error **errp);

 /**

-- 

1.8.3.1