[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 07/46] blockjob: Update block-job-pause/resume docume
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 07/46] blockjob: Update block-job-pause/resume documentation |
Date: |
Wed, 23 May 2018 15:11:16 +0200 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: John Snow <address@hidden>
---
qapi/block-core.json | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 55728cb823..d32ec95666 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.
#
--
2.13.6
- [Qemu-block] [PULL 01/46] qemu-iotests: Fix paths for NFS, (continued)
- [Qemu-block] [PULL 01/46] qemu-iotests: Fix paths for NFS, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 03/46] qemu-iotests: 086 doesn't work with NFS, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 10/46] job: Rename BlockJobType into JobType, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 08/46] blockjob: Improve BlockJobInfo.offset/len documentation, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 06/46] qemu-iotests: Remove MIG_SOCKET from non-migration tests, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 02/46] qemu-iotests: Filter NFS paths, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 04/46] sheepdog: Remove unnecessary NULL check in sd_prealloc(), Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 05/46] qemu-iotests: Add more tests to "migration" group, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 11/46] job: Add JobDriver.job_type, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 12/46] job: Add job_delete(), Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 07/46] blockjob: Update block-job-pause/resume documentation,
Kevin Wolf <=
- [Qemu-block] [PULL 17/46] job: Add Job.aio_context, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 18/46] job: Move defer_to_main_loop to Job, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 09/46] job: Create Job, JobDriver and job_create(), Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 16/46] job: Move cancelled to Job, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 13/46] job: Maintain a list of all jobs, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 14/46] job: Move state transitions to Job, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 15/46] job: Add reference counting, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 22/46] job: Replace BlockJob.completed with job_is_completed(), Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 21/46] job: Move pause/resume functions to Job, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 24/46] blockjob: Split block_job_event_pending(), Kevin Wolf, 2018/05/23