From patchwork Wed Jun 22 12:25:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 9192753 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4F3CE6075A for ; Wed, 22 Jun 2016 13:12:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 401E8283F7 for ; Wed, 22 Jun 2016 13:12:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3373B28406; Wed, 22 Jun 2016 13:12:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 99470283F7 for ; Wed, 22 Jun 2016 13:12:55 +0000 (UTC) Received: from localhost ([::1]:58168 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFhxe-00052o-6a for patchwork-qemu-devel@patchwork.kernel.org; Wed, 22 Jun 2016 09:12:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFhEQ-0003lA-0R for qemu-devel@nongnu.org; Wed, 22 Jun 2016 08:26:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFhEI-00025S-W7 for qemu-devel@nongnu.org; Wed, 22 Jun 2016 08:26:09 -0400 Received: from smtp3.mundo-r.com ([212.51.32.191]:21734 helo=smtp4.mundo-r.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFhEI-000253-IM; Wed, 22 Jun 2016 08:26:02 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CqAgCmgmpX/5tjdVtUCh6DIIFTpVgBAQEBAQEFAYEPAZExgg+BeoYXAoEsOBQBAQEBAQEBZSeETQIEeRA/EjwbGYg0AcMKAQEIJ4VfgkeGZnSFDwWNeHCKFY4tiUaFXY98HjaCCByBT2uJLQSBQAEBAQ X-IPAS-Result: A2CqAgCmgmpX/5tjdVtUCh6DIIFTpVgBAQEBAQEFAYEPAZExgg+BeoYXAoEsOBQBAQEBAQEBZSeETQIEeRA/EjwbGYg0AcMKAQEIJ4VfgkeGZnSFDwWNeHCKFY4tiUaFXY98HjaCCByBT2uJLQSBQAEBAQ X-IronPort-AV: E=Sophos;i="5.26,509,1459807200"; d="scan'208";a="76201874" Received: from fanzine.igalia.com ([91.117.99.155]) by smtp4.mundo-r.com with ESMTP; 22 Jun 2016 14:25:58 +0200 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim) id 1bFhEE-0004kS-Dg; Wed, 22 Jun 2016 14:25:58 +0200 Received: from berto by perseus.local with local (Exim 4.87) (envelope-from ) id 1bFhDo-0007Fi-JC; Wed, 22 Jun 2016 15:25:32 +0300 From: Alberto Garcia To: qemu-devel@nongnu.org Date: Wed, 22 Jun 2016 15:25:08 +0300 Message-Id: X-Mailer: git-send-email 2.8.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.51.32.191 Subject: [Qemu-devel] [PATCH v2 11/15] blockjob: Add 'id' parameter to 'block-job-cancel' 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: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Jeff Cody , Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch allows the 'block-job-cancel' command to identify the job by either its ID or its device name. The latter becomes now optional since the ID alone is enough to identify the job. The HMP 'block_job_cancel' command remains unchanged. Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz --- blockdev.c | 7 +++++-- hmp.c | 2 +- qapi/block-core.json | 10 ++++++++-- qmp-commands.hx | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/blockdev.c b/blockdev.c index bd276ee..3a0b22a 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3776,11 +3776,14 @@ void qmp_block_job_set_speed(bool has_id, const char *id, bool has_device, aio_context_release(aio_context); } -void qmp_block_job_cancel(const char *device, +void qmp_block_job_cancel(bool has_id, const char *id, + bool has_device, const char *device, bool has_force, bool force, Error **errp) { AioContext *aio_context; - BlockJob *job = find_block_job(NULL, device, &aio_context, errp); + BlockJob *job = find_block_job(has_id ? id : NULL, + has_device ? device : NULL, + &aio_context, errp); if (!job) { return; diff --git a/hmp.c b/hmp.c index f498ccd..ed5a125 100644 --- a/hmp.c +++ b/hmp.c @@ -1509,7 +1509,7 @@ void hmp_block_job_cancel(Monitor *mon, const QDict *qdict) const char *device = qdict_get_str(qdict, "device"); bool force = qdict_get_try_bool(qdict, "force", false); - qmp_block_job_cancel(device, true, force, &error); + qmp_block_job_cancel(false, NULL, true, device, true, force, &error); hmp_handle_error(mon, &error); } diff --git a/qapi/block-core.json b/qapi/block-core.json index 64038cc..38dd3f2 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1505,7 +1505,12 @@ # operation can be started at a later time to finish copying all data from the # backing file. # -# @device: the device name +# The job must be identified with the @id or @device parameters, but +# only one of them must be set. +# +# @id: #optional the job identifier (Since 2.7) +# +# @device: #optional the device name # # @force: #optional whether to allow cancellation of a paused job (default # false). Since 1.3. @@ -1515,7 +1520,8 @@ # # Since: 1.1 ## -{ 'command': 'block-job-cancel', 'data': { 'device': 'str', '*force': 'bool' } } +{ 'command': 'block-job-cancel', + 'data': { '*id': 'str', '*device': 'str', '*force': 'bool' } } ## # @block-job-pause: diff --git a/qmp-commands.hx b/qmp-commands.hx index cc70007..c7d207a 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1317,7 +1317,7 @@ EQMP { .name = "block-job-cancel", - .args_type = "device:B,force:b?", + .args_type = "id:s?,device:B?,force:b?", .mhandler.cmd_new = qmp_marshal_block_job_cancel, }, {