From ec5e9da1b57dddafbc4b2d643f8e93d485d362c8 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Tue, 26 Jun 2018 09:47:57 +0200 Subject: [PATCH 089/268] blockjob: Update block-job-pause/resume documentation RH-Author: Kevin Wolf Message-id: <20180626094856.6924-15-kwolf@redhat.com> Patchwork-id: 81069 O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 14/73] blockjob: Update block-job-pause/resume documentation Bugzilla: 1513543 RH-Acked-by: Jeffrey Cody RH-Acked-by: Max Reitz RH-Acked-by: Fam Zheng 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 Reviewed-by: Eric Blake Reviewed-by: John Snow (cherry picked from commit cd44d96be90e7767c6fb8f33b90939eb58814956) Signed-off-by: Kevin Wolf Signed-off-by: Miroslav Rezanina --- 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 28b4964..31bf64a 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. # -- 1.8.3.1