yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
26ba25
From 0d30ab413521525f60d9b45428157fe3ba998677 Mon Sep 17 00:00:00 2001
26ba25
From: John Snow <jsnow@redhat.com>
26ba25
Date: Tue, 25 Sep 2018 22:34:30 +0100
26ba25
Subject: [PATCH 27/28] block/backup: qapi documentation fixup
26ba25
26ba25
RH-Author: John Snow <jsnow@redhat.com>
26ba25
Message-id: <20180925223431.24791-25-jsnow@redhat.com>
26ba25
Patchwork-id: 82284
26ba25
O-Subject: [RHEL8/rhel qemu-kvm PATCH 24/25] block/backup: qapi documentation fixup
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
Fix documentation to match the other jobs amended for 3.1.
26ba25
26ba25
Signed-off-by: John Snow <jsnow@redhat.com>
26ba25
Reviewed-by: Max Reitz <mreitz@redhat.com>
26ba25
Message-id: 20180906130225.5118-16-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 dfaff2c37dfa52ab045cf87503e60ea56317230a)
26ba25
Signed-off-by: John Snow <jsnow@redhat.com>
26ba25
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
26ba25
---
26ba25
 qapi/block-core.json | 18 ++++++++++--------
26ba25
 1 file changed, 10 insertions(+), 8 deletions(-)
26ba25
26ba25
diff --git a/qapi/block-core.json b/qapi/block-core.json
26ba25
index ba4bba0..602c028 100644
26ba25
--- a/qapi/block-core.json
26ba25
+++ b/qapi/block-core.json
26ba25
@@ -1249,13 +1249,14 @@
26ba25
 #                   a different block device than @device).
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.
26ba25
-#                 When true, this job will automatically perform its abort or
26ba25
-#                 commit actions.
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 2.12)
26ba25
 #
26ba25
 # @auto-dismiss: When false, this job will wait in a CONCLUDED state after it
26ba25
-#                has completed ceased all work, and wait for @block-job-dismiss.
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 2.12)
26ba25
@@ -1304,13 +1305,14 @@
26ba25
 #                   a different block device than @device).
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.
26ba25
-#                 When true, this job will automatically perform its abort or
26ba25
-#                 commit actions.
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 2.12)
26ba25
 #
26ba25
 # @auto-dismiss: When false, this job will wait in a CONCLUDED state after it
26ba25
-#                has completed ceased all work, and wait for @block-job-dismiss.
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 2.12)
26ba25
-- 
26ba25
1.8.3.1
26ba25