summaryrefslogtreecommitdiff
path: root/qapi
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2018-06-06 19:02:56 -0400
committerKevin Wolf <kwolf@redhat.com>2018-06-15 14:49:44 +0200
commitc5b09f3f2c4db32f39ecbde2cf2f78e7a657a85d (patch)
tree9641be99893a25dccaa41ddabba46c3f24713cad /qapi
parentc6a9d2f6f9bc0c163b3a3073126464a2446bad5f (diff)
downloadqemu-c5b09f3f2c4db32f39ecbde2cf2f78e7a657a85d.zip
jobs: fix stale wording
During the design for manual completion, we decided not to use the "manual" property as a shorthand for both auto-dismiss and auto-finalize. Fix the wording. Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Jeff Cody <jcody@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qapi')
-rw-r--r--qapi/job.json11
1 files changed, 6 insertions, 5 deletions
diff --git a/qapi/job.json b/qapi/job.json
index 17d10037c4..226443594b 100644
--- a/qapi/job.json
+++ b/qapi/job.json
@@ -50,16 +50,17 @@
# the last job in a transaction.
#
# @pending: The job has finished its work, but has finalization steps that it
-# needs to make prior to completing. These changes may require
-# manual intervention by the management process if manual was set
-# to true. These changes may still fail.
+# needs to make prior to completing. These changes will require
+# manual intervention via @job-finalize if auto-finalize was set to
+# false. These pending changes may still fail.
#
# @aborting: The job is in the process of being aborted, and will finish with
# an error. The job will afterwards report that it is @concluded.
# This status may not be visible to the management process.
#
-# @concluded: The job has finished all work. If manual was set to true, the job
-# will remain in the query list until it is dismissed.
+# @concluded: The job has finished all work. If auto-dismiss was set to false,
+# the job will remain in the query list until it is dismissed via
+# @job-dismiss.
#
# @null: The job is in the process of being dismantled. This state should not
# ever be visible externally.