From 4fd9e923e840ff8a9618e018192bad6ed000cc40 Mon Sep 17 00:00:00 2001

From: John Snow <jsnow@redhat.com>

Date: Mon, 10 Sep 2018 18:18:00 +0200

Subject: [PATCH 22/25] qapi/block-mirror: expose new job properties

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

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

Patchwork-id: 82096

O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 22/25] qapi/block-mirror: expose new job properties

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>

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

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

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

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

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

(cherry picked from commit 61bd6718ebceae42f97a99d2ffd315b05b86f1b3)

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

Conflicts: downstream does not have has_copy_mode.

    -blockdev.c

    -qapi/block-core.json

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

---

 blockdev.c           | 14 ++++++++++++++

 qapi/block-core.json | 30 ++++++++++++++++++++++++++++--

 2 files changed, 42 insertions(+), 2 deletions(-)

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

index 1d0cbb1..a655387 100644

--- a/blockdev.c

+++ b/blockdev.c

@@ -3753,6 +3753,8 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,

                                    bool has_unmap, bool unmap,

                                    bool has_filter_node_name,

                                    const char *filter_node_name,

+                                   bool has_auto_finalize, bool auto_finalize,

+                                   bool has_auto_dismiss, bool auto_dismiss,

                                    Error **errp)

 {

     int job_flags = JOB_DEFAULT;

@@ -3778,6 +3780,12 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,

     if (!has_filter_node_name) {

         filter_node_name = NULL;

     }

+    if (has_auto_finalize && !auto_finalize) {

+        job_flags |= JOB_MANUAL_FINALIZE;

+    }

+    if (has_auto_dismiss && !auto_dismiss) {

+        job_flags |= JOB_MANUAL_DISMISS;

+    }

     if (granularity != 0 && (granularity < 512 || granularity > 1048576 * 64)) {

         error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "granularity",

@@ -3954,6 +3962,8 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)

                            arg->has_on_target_error, arg->on_target_error,

                            arg->has_unmap, arg->unmap,

                            false, NULL,

+                           arg->has_auto_finalize, arg->auto_finalize,

+                           arg->has_auto_dismiss, arg->auto_dismiss,

                            &local_err);

     bdrv_unref(target_bs);

     error_propagate(errp, local_err);

@@ -3974,6 +3984,8 @@ void qmp_blockdev_mirror(bool has_job_id, const char *job_id,

                          BlockdevOnError on_target_error,

                          bool has_filter_node_name,

                          const char *filter_node_name,

+                         bool has_auto_finalize, bool auto_finalize,

+                         bool has_auto_dismiss, bool auto_dismiss,

                          Error **errp)

 {

     BlockDriverState *bs;

@@ -4006,6 +4018,8 @@ void qmp_blockdev_mirror(bool has_job_id, const char *job_id,

                            has_on_target_error, on_target_error,

                            true, true,

                            has_filter_node_name, filter_node_name,

+                           has_auto_finalize, auto_finalize,

+                           has_auto_dismiss, auto_dismiss,

                            &local_err);

     error_propagate(errp, local_err);

diff --git a/qapi/block-core.json b/qapi/block-core.json

index af453c5..6a5e357 100644

--- a/qapi/block-core.json

+++ b/qapi/block-core.json

@@ -1712,6 +1712,18 @@

 #         written. Both will result in identical contents.

 #         Default is true. (Since 2.4)

 #

+# @auto-finalize: When false, this job will wait in a PENDING state after it has

+#                 finished its work, waiting for @block-job-finalize before

+#                 making any block graph changes.

+#                 When true, this job will automatically

+#                 perform its abort or commit actions.

+#                 Defaults to true. (Since 3.1)

+#

+# @auto-dismiss: When false, this job will wait in a CONCLUDED state after it

+#                has completely ceased all work, and awaits @block-job-dismiss.

+#                When true, this job will automatically disappear from the query

+#                list without user intervention.

+#                Defaults to true. (Since 3.1)

 # Since: 1.3

 ##

 { 'struct': 'DriveMirror',

@@ -1721,7 +1733,8 @@

             '*speed': 'int', '*granularity': 'uint32',

             '*buf-size': 'int', '*on-source-error': 'BlockdevOnError',

             '*on-target-error': 'BlockdevOnError',

-            '*unmap': 'bool' } }

+            '*unmap': 'bool',

+            '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }

 ##

 # @BlockDirtyBitmap:

@@ -1984,6 +1997,18 @@

 #                    above @device. If this option is not given, a node name is

 #                    autogenerated. (Since: 2.9)

 #

+# @auto-finalize: When false, this job will wait in a PENDING state after it has

+#                 finished its work, waiting for @block-job-finalize before

+#                 making any block graph changes.

+#                 When true, this job will automatically

+#                 perform its abort or commit actions.

+#                 Defaults to true. (Since 3.1)

+#

+# @auto-dismiss: When false, this job will wait in a CONCLUDED state after it

+#                has completely ceased all work, and awaits @block-job-dismiss.

+#                When true, this job will automatically disappear from the query

+#                list without user intervention.

+#                Defaults to true. (Since 3.1)

 # Returns: nothing on success.

 #

 # Since: 2.6

@@ -2004,7 +2029,8 @@

             '*speed': 'int', '*granularity': 'uint32',

             '*buf-size': 'int', '*on-source-error': 'BlockdevOnError',

             '*on-target-error': 'BlockdevOnError',

-            '*filter-node-name': 'str' } }

+            '*filter-node-name': 'str',

+            '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }

 ##

 # @block_set_io_throttle:

-- 

1.8.3.1