|
 |
1bdc94 |
From 74396004eb3705a30023e5206cc46e6b414830be Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: John Snow <jsnow@redhat.com>
|
|
|
1bdc94 |
Date: Mon, 10 Sep 2018 18:18:02 +0200
|
|
|
1bdc94 |
Subject: [PATCH 24/25] block/backup: qapi documentation fixup
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180910181803.11781-25-jsnow@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 82094
|
|
|
1bdc94 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 24/25] block/backup: qapi documentation fixup
|
|
|
1bdc94 |
Bugzilla: 1626061
|
|
|
1bdc94 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Fix documentation to match the other jobs amended for 3.1.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
Message-id: 20180906130225.5118-16-jsnow@redhat.com
|
|
|
1bdc94 |
Reviewed-by: Jeff Cody <jcody@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
(cherry picked from commit 487e31ee250d0f05a26506107fd17191bbce614a)
|
|
|
1bdc94 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
qapi/block-core.json | 18 ++++++++++--------
|
|
|
1bdc94 |
1 file changed, 10 insertions(+), 8 deletions(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/qapi/block-core.json b/qapi/block-core.json
|
|
|
1bdc94 |
index 5526cbc..56937db 100644
|
|
|
1bdc94 |
--- a/qapi/block-core.json
|
|
|
1bdc94 |
+++ b/qapi/block-core.json
|
|
|
1bdc94 |
@@ -1255,13 +1255,14 @@
|
|
|
1bdc94 |
# a different block device than @device).
|
|
|
1bdc94 |
#
|
|
|
1bdc94 |
# @auto-finalize: When false, this job will wait in a PENDING state after it has
|
|
|
1bdc94 |
-# finished its work, waiting for @block-job-finalize.
|
|
|
1bdc94 |
-# When true, this job will automatically perform its abort or
|
|
|
1bdc94 |
-# commit actions.
|
|
|
1bdc94 |
+# finished its work, waiting for @block-job-finalize before
|
|
|
1bdc94 |
+# making any block graph changes.
|
|
|
1bdc94 |
+# When true, this job will automatically
|
|
|
1bdc94 |
+# perform its abort or commit actions.
|
|
|
1bdc94 |
# Defaults to true. (Since 2.12)
|
|
|
1bdc94 |
#
|
|
|
1bdc94 |
# @auto-dismiss: When false, this job will wait in a CONCLUDED state after it
|
|
|
1bdc94 |
-# has completed ceased all work, and wait for @block-job-dismiss.
|
|
|
1bdc94 |
+# has completely ceased all work, and awaits @block-job-dismiss.
|
|
|
1bdc94 |
# When true, this job will automatically disappear from the query
|
|
|
1bdc94 |
# list without user intervention.
|
|
|
1bdc94 |
# Defaults to true. (Since 2.12)
|
|
|
1bdc94 |
@@ -1310,13 +1311,14 @@
|
|
|
1bdc94 |
# a different block device than @device).
|
|
|
1bdc94 |
#
|
|
|
1bdc94 |
# @auto-finalize: When false, this job will wait in a PENDING state after it has
|
|
|
1bdc94 |
-# finished its work, waiting for @block-job-finalize.
|
|
|
1bdc94 |
-# When true, this job will automatically perform its abort or
|
|
|
1bdc94 |
-# commit actions.
|
|
|
1bdc94 |
+# finished its work, waiting for @block-job-finalize before
|
|
|
1bdc94 |
+# making any block graph changes.
|
|
|
1bdc94 |
+# When true, this job will automatically
|
|
|
1bdc94 |
+# perform its abort or commit actions.
|
|
|
1bdc94 |
# Defaults to true. (Since 2.12)
|
|
|
1bdc94 |
#
|
|
|
1bdc94 |
# @auto-dismiss: When false, this job will wait in a CONCLUDED state after it
|
|
|
1bdc94 |
-# has completed ceased all work, and wait for @block-job-dismiss.
|
|
|
1bdc94 |
+# has completely ceased all work, and awaits @block-job-dismiss.
|
|
|
1bdc94 |
# When true, this job will automatically disappear from the query
|
|
|
1bdc94 |
# list without user intervention.
|
|
|
1bdc94 |
# Defaults to true. (Since 2.12)
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|