From nobody Sat Nov 15 18:47:38 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1748932731; cv=none; d=zohomail.com; s=zohoarc; b=Xxlj//iCsAs2TJlVHOVBgdYPnwWjCn1RdS/8c3gcm2lpwk/L9xllpvZyQifUEHInveeN2rOCe1WA5//SjsQpk6fWAYw5eCw8mUpOD/Xlladp0XvwPL0jnbWA8q3qJ/8lROf8rmd6Wp5JKcFqvheMn0VRgxqx9jbN86WWlPiFxRA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748932731; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CV1+ywSWVoSgMySlXiooa7/udBbvhJS3VG2OsC4HKVg=; b=aS8B6MkaC/UYBmpZvM7cVkjDbvf+PPcAXVwh8rpTgSSYMXJMiMzQen4G4ovbSU1yGpGdaYKYpuDAVHbHtBotXnAVFsUImbLWJENeKKBmXqdgH4NxvuQXkOp8uDy+HILECEq/LZBrJo3wRS/VEcffk3RlTXRIYjDvid8jLYF0g00= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1748932731781786.1121476606248; Mon, 2 Jun 2025 23:38:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMLHJ-00086C-HH; Tue, 03 Jun 2025 02:37:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uMLGa-0007jS-Rw for qemu-devel@nongnu.org; Tue, 03 Jun 2025 02:37:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uMLGY-0003RD-Ec for qemu-devel@nongnu.org; Tue, 03 Jun 2025 02:36:56 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-543-OhbCRxZwPYuhZs-1z8_7pw-1; Tue, 03 Jun 2025 02:36:51 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CC3C11956088 for ; Tue, 3 Jun 2025 06:36:50 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.38]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 878F919560AB for ; Tue, 3 Jun 2025 06:36:50 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 16BBB21E65FD; Tue, 03 Jun 2025 08:36:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748932613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CV1+ywSWVoSgMySlXiooa7/udBbvhJS3VG2OsC4HKVg=; b=BJbLrdFBe/1IOccDRV1TTqHbyAEwgArhTPn5ScaCFsjM3Nnb+U1UL8BUrkvRC4St0MxX43 twvas6r+sfk1WNuhTSxRklPlAub7B3aQwMl/Z1iKPGe7U/jmxFFZ9m/RgN0P2N0qKcXHMm B4gop+Evo/V0Yt/nSv2rExloRTdn56o= X-MC-Unique: OhbCRxZwPYuhZs-1z8_7pw-1 X-Mimecast-MFC-AGG-ID: OhbCRxZwPYuhZs-1z8_7pw_1748932611 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Eric Blake Subject: [PULL 11/13] qapi: Mention both job-cancel and block-job-cancel in doc comments Date: Tue, 3 Jun 2025 08:36:42 +0200 Message-ID: <20250603063644.3953528-12-armbru@redhat.com> In-Reply-To: <20250603063644.3953528-1-armbru@redhat.com> References: <20250603063644.3953528-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.015, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1748932733864116600 Content-Type: text/plain; charset="utf-8" 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 --- qapi/block-core.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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. # --=20 2.48.1