From nobody Tue Feb 10 05:10:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517019496453880.6774462985462; Fri, 26 Jan 2018 18:18:16 -0800 (PST) Received: from localhost ([::1]:44042 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1efG4N-0005Y1-KA for importer@patchew.org; Fri, 26 Jan 2018 21:18:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1efFsC-0001CC-0X for qemu-devel@nongnu.org; Fri, 26 Jan 2018 21:05:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1efFsA-0008VS-DF for qemu-devel@nongnu.org; Fri, 26 Jan 2018 21:05:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48118) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1efFs6-0008RN-P2; Fri, 26 Jan 2018 21:05:35 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 12B6846269; Sat, 27 Jan 2018 02:05:34 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-231.bos.redhat.com [10.18.17.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5860E5457C; Sat, 27 Jan 2018 02:05:33 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org Date: Fri, 26 Jan 2018 21:05:14 -0500 Message-Id: <20180127020515.27137-14-jsnow@redhat.com> In-Reply-To: <20180127020515.27137-1-jsnow@redhat.com> References: <20180127020515.27137-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Sat, 27 Jan 2018 02:05:34 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC v3 13/14] blockjobs: Expose manual property X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, John Snow , pkrempa@redhat.com, jtc@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Expose the "manual" property via QAPI for the backup-related jobs. As of this commit, this allows the management API to request the "concluded" and "dismiss" semantics for backup jobs. Signed-off-by: John Snow --- blockdev.c | 14 ++++++++++---- include/block/block_int.h | 3 +++ qapi/block-core.json | 32 ++++++++++++++++++++++++++------ 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/blockdev.c b/blockdev.c index d387ef6ec0..e7c3fc0607 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3281,6 +3281,9 @@ static BlockJob *do_drive_backup(DriveBackup *backup,= BlockJobTxn *txn, if (!backup->has_job_id) { backup->job_id =3D NULL; } + if (!backup->has_manual) { + backup->manual =3D false; + } if (!backup->has_compress) { backup->compress =3D false; } @@ -3373,8 +3376,8 @@ static BlockJob *do_drive_backup(DriveBackup *backup,= BlockJobTxn *txn, } } =20 - job =3D backup_job_create(backup->job_id, false, bs, target_bs, backup= ->speed, - backup->sync, bmap, backup->compress, + job =3D backup_job_create(backup->job_id, backup->manual, bs, target_b= s, + backup->speed, backup->sync, bmap, backup->com= press, backup->on_source_error, backup->on_target_err= or, BLOCK_JOB_DEFAULT, NULL, NULL, txn, &local_err= ); bdrv_unref(target_bs); @@ -3424,6 +3427,9 @@ BlockJob *do_blockdev_backup(BlockdevBackup *backup, = BlockJobTxn *txn, if (!backup->has_job_id) { backup->job_id =3D NULL; } + if (!backup->has_manual) { + backup->manual =3D false; + } if (!backup->has_compress) { backup->compress =3D false; } @@ -3452,8 +3458,8 @@ BlockJob *do_blockdev_backup(BlockdevBackup *backup, = BlockJobTxn *txn, goto out; } } - job =3D backup_job_create(backup->job_id, false, bs, target_bs, backup= ->speed, - backup->sync, NULL, backup->compress, + job =3D backup_job_create(backup->job_id, backup->manual, bs, target_b= s, + backup->speed, backup->sync, NULL, backup->com= press, backup->on_source_error, backup->on_target_err= or, BLOCK_JOB_DEFAULT, NULL, NULL, txn, &local_err= ); if (local_err !=3D NULL) { diff --git a/include/block/block_int.h b/include/block/block_int.h index 08f5046c63..d91f50ca60 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -965,6 +965,9 @@ void mirror_start(const char *job_id, BlockDriverState = *bs, * backup_job_create: * @job_id: The id of the newly-created job, or %NULL to use the * device name of @bs. + * @manual: Whether or not this job requires manual intervention to transi= tion + * from "PENDING" state to "CONCLUDED" state, and again, manual + * intervention to dismiss CONCLUDED jobs. * @bs: Block device to operate on. * @target: Block device to write to. * @speed: The maximum speed, in bytes per second, or 0 for unlimited. diff --git a/qapi/block-core.json b/qapi/block-core.json index bd4458bf57..d8d82404da 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1119,6 +1119,16 @@ # @job-id: identifier for the newly-created block job. If # omitted, the device name will be used. (Since 2.7) # +# @manual: True to use an expanded, more explicit job control flow. +# Jobs may transition from a running state to a pending state, +# where they must be instructed to complete manually via +# block-job-finalize. +# Jobs belonging to a transaction must either all or all not use = this +# setting. Once a transaction reaches a pending state, issuing the +# finalize command to any one job in the transaction is sufficient +# to finalize the entire transaction. +# (Since 2.12) +# # @device: the device name or node-name of a root node which should be cop= ied. # # @target: the target of the new image. If the file exists, or if it @@ -1159,9 +1169,10 @@ # Since: 1.6 ## { 'struct': 'DriveBackup', - 'data': { '*job-id': 'str', 'device': 'str', 'target': 'str', - '*format': 'str', 'sync': 'MirrorSyncMode', '*mode': 'NewImage= Mode', - '*speed': 'int', '*bitmap': 'str', '*compress': 'bool', + 'data': { '*job-id': 'str', '*manual': 'bool', 'device': 'str', + 'target': 'str', '*format': 'str', 'sync': 'MirrorSyncMode', + '*mode': 'NewImageMode', '*speed': 'int', + '*bitmap': 'str', '*compress': 'bool', '*on-source-error': 'BlockdevOnError', '*on-target-error': 'BlockdevOnError' } } =20 @@ -1171,6 +1182,16 @@ # @job-id: identifier for the newly-created block job. If # omitted, the device name will be used. (Since 2.7) # +# @manual: True to use an expanded, more explicit job control flow. +# Jobs may transition from a running state to a pending state, +# where they must be instructed to complete manually via +# block-job-finalize. +# Jobs belonging to a transaction must either all or all not use = this +# setting. Once a transaction reaches a pending state, issuing the +# finalize command to any one job in the transaction is sufficient +# to finalize the entire transaction. +# (Since 2.12) +# # @device: the device name or node-name of a root node which should be cop= ied. # # @target: the device name or node-name of the backup target node. @@ -1200,9 +1221,8 @@ # Since: 2.3 ## { 'struct': 'BlockdevBackup', - 'data': { '*job-id': 'str', 'device': 'str', 'target': 'str', - 'sync': 'MirrorSyncMode', - '*speed': 'int', + 'data': { '*job-id': 'str', '*manual': 'bool', 'device': 'str', + 'target': 'str', 'sync': 'MirrorSyncMode', '*speed': 'int', '*compress': 'bool', '*on-source-error': 'BlockdevOnError', '*on-target-error': 'BlockdevOnError' } } --=20 2.14.3