From: Markus Armbruster Date: Tue, 27 May 2025 07:39:14 +0000 (+0200) Subject: qapi: Mention both job-cancel and block-job-cancel in doc comments X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=901eb8b2d8a14a0378d1c59fe37733366d4da16c;p=thirdparty%2Fqemu.git qapi: Mention both job-cancel and block-job-cancel in doc comments Several doc comments mention block-job-cancel where the more generic job-cancel would also work. Adjust them to mention both. Signed-off-by: Markus Armbruster Message-ID: <20250527073916.1243024-12-armbru@redhat.com> Reviewed-by: Eric Blake --- diff --git a/qapi/block-core.json b/qapi/block-core.json index 6e5b90d5df..ad6de151c8 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1894,7 +1894,7 @@ # The status of ongoing drive-backup operations can be checked with # query-block-jobs where the BlockJobInfo.type field has the value # 'backup'. The operation can be stopped before it has completed -# using the block-job-cancel command. +# using the job-cancel or block-job-cancel command. # # Features: # @@ -1925,7 +1925,7 @@ # The status of ongoing blockdev-backup operations can be checked with # query-block-jobs where the BlockJobInfo.type field has the value # 'backup'. The operation can be stopped before it has completed -# using the block-job-cancel command. +# using the job-cancel or block-job-cancel command. # # Errors: # - If @device is not a valid block device, DeviceNotFound @@ -2788,7 +2788,7 @@ # immediately once streaming has started. The status of ongoing block # streaming operations can be checked with query-block-jobs. The # operation can be stopped before it has completed using the -# block-job-cancel command. +# job-cancel or block-job-cancel command. # # The node that receives the data is called the top image, can be # located in any part of the chain (but always above the base image; @@ -3075,8 +3075,8 @@ # # This command will refuse to operate on any job that has not yet # reached its terminal state, JOB_STATUS_CONCLUDED. For jobs that -# make use of the BLOCK_JOB_READY event, block-job-cancel or -# job-complete will still need to be used as appropriate. +# make use of the BLOCK_JOB_READY event, job-cancel, block-job-cancel +# or job-complete will still need to be used as appropriate. # # @id: The job identifier. #