yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
ae23c9
From 0d30ab413521525f60d9b45428157fe3ba998677 Mon Sep 17 00:00:00 2001
ae23c9
From: John Snow <jsnow@redhat.com>
ae23c9
Date: Tue, 25 Sep 2018 22:34:30 +0100
ae23c9
Subject: [PATCH 27/28] block/backup: qapi documentation fixup
ae23c9
ae23c9
RH-Author: John Snow <jsnow@redhat.com>
ae23c9
Message-id: <20180925223431.24791-25-jsnow@redhat.com>
ae23c9
Patchwork-id: 82284
ae23c9
O-Subject: [RHEL8/rhel qemu-kvm PATCH 24/25] block/backup: qapi documentation fixup
ae23c9
Bugzilla: 1632939
ae23c9
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
ae23c9
RH-Acked-by: Max Reitz <mreitz@redhat.com>
ae23c9
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
ae23c9
ae23c9
Fix documentation to match the other jobs amended for 3.1.
ae23c9
ae23c9
Signed-off-by: John Snow <jsnow@redhat.com>
ae23c9
Reviewed-by: Max Reitz <mreitz@redhat.com>
ae23c9
Message-id: 20180906130225.5118-16-jsnow@redhat.com
ae23c9
Reviewed-by: Jeff Cody <jcody@redhat.com>
ae23c9
Signed-off-by: Max Reitz <mreitz@redhat.com>
ae23c9
(cherry picked from commit dfaff2c37dfa52ab045cf87503e60ea56317230a)
ae23c9
Signed-off-by: John Snow <jsnow@redhat.com>
ae23c9
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
ae23c9
---
ae23c9
 qapi/block-core.json | 18 ++++++++++--------
ae23c9
 1 file changed, 10 insertions(+), 8 deletions(-)
ae23c9
ae23c9
diff --git a/qapi/block-core.json b/qapi/block-core.json
ae23c9
index ba4bba0..602c028 100644
ae23c9
--- a/qapi/block-core.json
ae23c9
+++ b/qapi/block-core.json
ae23c9
@@ -1249,13 +1249,14 @@
ae23c9
 #                   a different block device than @device).
ae23c9
 #
ae23c9
 # @auto-finalize: When false, this job will wait in a PENDING state after it has
ae23c9
-#                 finished its work, waiting for @block-job-finalize.
ae23c9
-#                 When true, this job will automatically perform its abort or
ae23c9
-#                 commit actions.
ae23c9
+#                 finished its work, waiting for @block-job-finalize before
ae23c9
+#                 making any block graph changes.
ae23c9
+#                 When true, this job will automatically
ae23c9
+#                 perform its abort or commit actions.
ae23c9
 #                 Defaults to true. (Since 2.12)
ae23c9
 #
ae23c9
 # @auto-dismiss: When false, this job will wait in a CONCLUDED state after it
ae23c9
-#                has completed ceased all work, and wait for @block-job-dismiss.
ae23c9
+#                has completely ceased all work, and awaits @block-job-dismiss.
ae23c9
 #                When true, this job will automatically disappear from the query
ae23c9
 #                list without user intervention.
ae23c9
 #                Defaults to true. (Since 2.12)
ae23c9
@@ -1304,13 +1305,14 @@
ae23c9
 #                   a different block device than @device).
ae23c9
 #
ae23c9
 # @auto-finalize: When false, this job will wait in a PENDING state after it has
ae23c9
-#                 finished its work, waiting for @block-job-finalize.
ae23c9
-#                 When true, this job will automatically perform its abort or
ae23c9
-#                 commit actions.
ae23c9
+#                 finished its work, waiting for @block-job-finalize before
ae23c9
+#                 making any block graph changes.
ae23c9
+#                 When true, this job will automatically
ae23c9
+#                 perform its abort or commit actions.
ae23c9
 #                 Defaults to true. (Since 2.12)
ae23c9
 #
ae23c9
 # @auto-dismiss: When false, this job will wait in a CONCLUDED state after it
ae23c9
-#                has completed ceased all work, and wait for @block-job-dismiss.
ae23c9
+#                has completely ceased all work, and awaits @block-job-dismiss.
ae23c9
 #                When true, this job will automatically disappear from the query
ae23c9
 #                list without user intervention.
ae23c9
 #                Defaults to true. (Since 2.12)
ae23c9
-- 
ae23c9
1.8.3.1
ae23c9