aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2018-05-16 12:55:48 +0200
committerKevin Wolf <kwolf@redhat.com>2018-05-23 14:30:49 +0200
commitcd44d96be90e7767c6fb8f33b90939eb58814956 (patch)
treed227a88c31ee8fa66f28fe0f11ffd173cc9546f0
parent169926dccfaa06f15a172331bcf0f13bd595e2e5 (diff)
downloadqemu-cd44d96be90e7767c6fb8f33b90939eb58814956.zip
qemu-cd44d96be90e7767c6fb8f33b90939eb58814956.tar.gz
qemu-cd44d96be90e7767c6fb8f33b90939eb58814956.tar.bz2
blockjob: Update block-job-pause/resume documentation
Commit 0ec4dfb8d changed block-job_pause/resume so that they return an error if they don't do anything because the job is already paused/running. It forgot to update the documentation, so do that now. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com>
-rw-r--r--qapi/block-core.json5
1 files changed, 2 insertions, 3 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 55728cb..d32ec95 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2338,8 +2338,7 @@
#
# This command returns immediately after marking the active background block
# operation for pausing. It is an error to call this command if no
-# operation is in progress. Pausing an already paused job has no cumulative
-# effect; a single block-job-resume command will resume the job.
+# operation is in progress or if the job is already paused.
#
# The operation will pause as soon as possible. No event is emitted when
# the operation is actually paused. Cancelling a paused job automatically
@@ -2363,7 +2362,7 @@
#
# This command returns immediately after resuming a paused background block
# operation. It is an error to call this command if no operation is in
-# progress. Resuming an already running job is not an error.
+# progress or if the job is not paused.
#
# This command also clears the error status of the job.
#