cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
26ba25
From 47eda5e717db143f5135e00f5bd6a478f613c28d Mon Sep 17 00:00:00 2001
26ba25
From: John Snow <jsnow@redhat.com>
26ba25
Date: Tue, 25 Sep 2018 22:34:28 +0100
26ba25
Subject: [PATCH 25/28] qapi/block-mirror: expose new job properties
26ba25
26ba25
RH-Author: John Snow <jsnow@redhat.com>
26ba25
Message-id: <20180925223431.24791-23-jsnow@redhat.com>
26ba25
Patchwork-id: 82274
26ba25
O-Subject: [RHEL8/rhel qemu-kvm PATCH 22/25] qapi/block-mirror: expose new job properties
26ba25
Bugzilla: 1632939
26ba25
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
26ba25
RH-Acked-by: Max Reitz <mreitz@redhat.com>
26ba25
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
26ba25
26ba25
Signed-off-by: John Snow <jsnow@redhat.com>
26ba25
Reviewed-by: Max Reitz <mreitz@redhat.com>
26ba25
Message-id: 20180906130225.5118-14-jsnow@redhat.com
26ba25
Reviewed-by: Jeff Cody <jcody@redhat.com>
26ba25
Signed-off-by: Max Reitz <mreitz@redhat.com>
26ba25
(cherry picked from commit a6b58adec28ff43c0f29ff7c95cdd5d11e87cf61)
26ba25
Signed-off-by: John Snow <jsnow@redhat.com>
26ba25
26ba25
Conflicts: downstream does not have has_copy_mode.
26ba25
    -blockdev.c
26ba25
    -qapi/block-core.json
26ba25
26ba25
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
26ba25
---
26ba25
 blockdev.c           | 14 ++++++++++++++
26ba25
 qapi/block-core.json | 30 ++++++++++++++++++++++++++++--
26ba25
 2 files changed, 42 insertions(+), 2 deletions(-)
26ba25
26ba25
diff --git a/blockdev.c b/blockdev.c
26ba25
index 10b5944..fadafe0 100644
26ba25
--- a/blockdev.c
26ba25
+++ b/blockdev.c
26ba25
@@ -3707,6 +3707,8 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
26ba25
                                    bool has_unmap, bool unmap,
26ba25
                                    bool has_filter_node_name,
26ba25
                                    const char *filter_node_name,
26ba25
+                                   bool has_auto_finalize, bool auto_finalize,
26ba25
+                                   bool has_auto_dismiss, bool auto_dismiss,
26ba25
                                    Error **errp)
26ba25
 {
26ba25
     int job_flags = JOB_DEFAULT;
26ba25
@@ -3732,6 +3734,12 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
26ba25
     if (!has_filter_node_name) {
26ba25
         filter_node_name = NULL;
26ba25
     }
26ba25
+    if (has_auto_finalize && !auto_finalize) {
26ba25
+        job_flags |= JOB_MANUAL_FINALIZE;
26ba25
+    }
26ba25
+    if (has_auto_dismiss && !auto_dismiss) {
26ba25
+        job_flags |= JOB_MANUAL_DISMISS;
26ba25
+    }
26ba25
 
26ba25
     if (granularity != 0 && (granularity < 512 || granularity > 1048576 * 64)) {
26ba25
         error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "granularity",
26ba25
@@ -3908,6 +3916,8 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)
26ba25
                            arg->has_on_target_error, arg->on_target_error,
26ba25
                            arg->has_unmap, arg->unmap,
26ba25
                            false, NULL,
26ba25
+                           arg->has_auto_finalize, arg->auto_finalize,
26ba25
+                           arg->has_auto_dismiss, arg->auto_dismiss,
26ba25
                            &local_err);
26ba25
     bdrv_unref(target_bs);
26ba25
     error_propagate(errp, local_err);
26ba25
@@ -3928,6 +3938,8 @@ void qmp_blockdev_mirror(bool has_job_id, const char *job_id,
26ba25
                          BlockdevOnError on_target_error,
26ba25
                          bool has_filter_node_name,
26ba25
                          const char *filter_node_name,
26ba25
+                         bool has_auto_finalize, bool auto_finalize,
26ba25
+                         bool has_auto_dismiss, bool auto_dismiss,
26ba25
                          Error **errp)
26ba25
 {
26ba25
     BlockDriverState *bs;
26ba25
@@ -3960,6 +3972,8 @@ void qmp_blockdev_mirror(bool has_job_id, const char *job_id,
26ba25
                            has_on_target_error, on_target_error,
26ba25
                            true, true,
26ba25
                            has_filter_node_name, filter_node_name,
26ba25
+                           has_auto_finalize, auto_finalize,
26ba25
+                           has_auto_dismiss, auto_dismiss,
26ba25
                            &local_err);
26ba25
     error_propagate(errp, local_err);
26ba25
 
26ba25
diff --git a/qapi/block-core.json b/qapi/block-core.json
26ba25
index c29c4b6..3f9ff18 100644
26ba25
--- a/qapi/block-core.json
26ba25
+++ b/qapi/block-core.json
26ba25
@@ -1706,6 +1706,18 @@
26ba25
 #         written. Both will result in identical contents.
26ba25
 #         Default is true. (Since 2.4)
26ba25
 #
26ba25
+# @auto-finalize: When false, this job will wait in a PENDING state after it has
26ba25
+#                 finished its work, waiting for @block-job-finalize before
26ba25
+#                 making any block graph changes.
26ba25
+#                 When true, this job will automatically
26ba25
+#                 perform its abort or commit actions.
26ba25
+#                 Defaults to true. (Since 3.1)
26ba25
+#
26ba25
+# @auto-dismiss: When false, this job will wait in a CONCLUDED state after it
26ba25
+#                has completely ceased all work, and awaits @block-job-dismiss.
26ba25
+#                When true, this job will automatically disappear from the query
26ba25
+#                list without user intervention.
26ba25
+#                Defaults to true. (Since 3.1)
26ba25
 # Since: 1.3
26ba25
 ##
26ba25
 { 'struct': 'DriveMirror',
26ba25
@@ -1715,7 +1727,8 @@
26ba25
             '*speed': 'int', '*granularity': 'uint32',
26ba25
             '*buf-size': 'int', '*on-source-error': 'BlockdevOnError',
26ba25
             '*on-target-error': 'BlockdevOnError',
26ba25
-            '*unmap': 'bool' } }
26ba25
+            '*unmap': 'bool',
26ba25
+            '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }
26ba25
 
26ba25
 ##
26ba25
 # @BlockDirtyBitmap:
26ba25
@@ -1978,6 +1991,18 @@
26ba25
 #                    above @device. If this option is not given, a node name is
26ba25
 #                    autogenerated. (Since: 2.9)
26ba25
 #
26ba25
+# @auto-finalize: When false, this job will wait in a PENDING state after it has
26ba25
+#                 finished its work, waiting for @block-job-finalize before
26ba25
+#                 making any block graph changes.
26ba25
+#                 When true, this job will automatically
26ba25
+#                 perform its abort or commit actions.
26ba25
+#                 Defaults to true. (Since 3.1)
26ba25
+#
26ba25
+# @auto-dismiss: When false, this job will wait in a CONCLUDED state after it
26ba25
+#                has completely ceased all work, and awaits @block-job-dismiss.
26ba25
+#                When true, this job will automatically disappear from the query
26ba25
+#                list without user intervention.
26ba25
+#                Defaults to true. (Since 3.1)
26ba25
 # Returns: nothing on success.
26ba25
 #
26ba25
 # Since: 2.6
26ba25
@@ -1998,7 +2023,8 @@
26ba25
             '*speed': 'int', '*granularity': 'uint32',
26ba25
             '*buf-size': 'int', '*on-source-error': 'BlockdevOnError',
26ba25
             '*on-target-error': 'BlockdevOnError',
26ba25
-            '*filter-node-name': 'str' } }
26ba25
+            '*filter-node-name': 'str',
26ba25
+            '*auto-finalize': 'bool', '*auto-dismiss': 'bool' } }
26ba25
 
26ba25
 ##
26ba25
 # @block_set_io_throttle:
26ba25
-- 
26ba25
1.8.3.1
26ba25