From 64f2d8be8a97b47baa7c51cceaa29b60d6b969a5 Mon Sep 17 00:00:00 2001

From: John Snow <jsnow@redhat.com>

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

Subject: [PATCH 21/25] qapi/block-commit: expose new job properties

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

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

Patchwork-id: 82100

O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 21/25] qapi/block-commit: 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-13-jsnow@redhat.com

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

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

(cherry picked from commit 7c91d440488214e953f8cc76e5d5fa477dc0376f)

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

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

---

 blockdev.c           |  8 ++++++++

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

 2 files changed, 23 insertions(+), 1 deletion(-)

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

index c4a1801..1d0cbb1 100644

--- a/blockdev.c

+++ b/blockdev.c

@@ -3361,6 +3361,8 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device,

                       bool has_backing_file, const char *backing_file,

                       bool has_speed, int64_t speed,

                       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;

@@ -3380,6 +3382,12 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device,

     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;

+    }

     /* Important Note:

      *  libvirt relies on the DeviceNotFound error class in order to probe for

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

index c6b42eb..af453c5 100644

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

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

@@ -1481,6 +1481,19 @@

 #                    above @top. 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

 #          If commit or stream is already active on this device, DeviceInUse

 #          If @device does not exist, DeviceNotFound

@@ -1501,7 +1514,8 @@

 { 'command': 'block-commit',

   'data': { '*job-id': 'str', 'device': 'str', '*base': 'str', '*top': 'str',

             '*backing-file': 'str', '*speed': 'int',

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

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

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

 ##

 # @drive-backup:

-- 

1.8.3.1