yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-blockjob-Update-block-job-pause-resume-documentation.patch

ae23c9
From ec5e9da1b57dddafbc4b2d643f8e93d485d362c8 Mon Sep 17 00:00:00 2001
ae23c9
From: Kevin Wolf <kwolf@redhat.com>
ae23c9
Date: Tue, 26 Jun 2018 09:47:57 +0200
ae23c9
Subject: [PATCH 089/268] blockjob: Update block-job-pause/resume documentation
ae23c9
ae23c9
RH-Author: Kevin Wolf <kwolf@redhat.com>
ae23c9
Message-id: <20180626094856.6924-15-kwolf@redhat.com>
ae23c9
Patchwork-id: 81069
ae23c9
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 14/73] blockjob: Update block-job-pause/resume documentation
ae23c9
Bugzilla: 1513543
ae23c9
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
ae23c9
RH-Acked-by: Max Reitz <mreitz@redhat.com>
ae23c9
RH-Acked-by: Fam Zheng <famz@redhat.com>
ae23c9
ae23c9
Commit 0ec4dfb8d changed block-job_pause/resume so that they return an
ae23c9
error if they don't do anything because the job is already
ae23c9
paused/running. It forgot to update the documentation, so do that now.
ae23c9
ae23c9
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
ae23c9
Reviewed-by: Eric Blake <eblake@redhat.com>
ae23c9
Reviewed-by: John Snow <jsnow@redhat.com>
ae23c9
(cherry picked from commit cd44d96be90e7767c6fb8f33b90939eb58814956)
ae23c9
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
ae23c9
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
ae23c9
---
ae23c9
 qapi/block-core.json | 5 ++---
ae23c9
 1 file changed, 2 insertions(+), 3 deletions(-)
ae23c9
ae23c9
diff --git a/qapi/block-core.json b/qapi/block-core.json
ae23c9
index 28b4964..31bf64a 100644
ae23c9
--- a/qapi/block-core.json
ae23c9
+++ b/qapi/block-core.json
ae23c9
@@ -2338,8 +2338,7 @@
ae23c9
 #
ae23c9
 # This command returns immediately after marking the active background block
ae23c9
 # operation for pausing.  It is an error to call this command if no
ae23c9
-# operation is in progress.  Pausing an already paused job has no cumulative
ae23c9
-# effect; a single block-job-resume command will resume the job.
ae23c9
+# operation is in progress or if the job is already paused.
ae23c9
 #
ae23c9
 # The operation will pause as soon as possible.  No event is emitted when
ae23c9
 # the operation is actually paused.  Cancelling a paused job automatically
ae23c9
@@ -2363,7 +2362,7 @@
ae23c9
 #
ae23c9
 # This command returns immediately after resuming a paused background block
ae23c9
 # operation.  It is an error to call this command if no operation is in
ae23c9
-# progress.  Resuming an already running job is not an error.
ae23c9
+# progress or if the job is not paused.
ae23c9
 #
ae23c9
 # This command also clears the error status of the job.
ae23c9
 #
ae23c9
-- 
ae23c9
1.8.3.1
ae23c9