From patchwork Wed Jun 22 12:25:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 9192749 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 D654D60756 for ; Wed, 22 Jun 2016 13:08:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5AAF283FD for ; Wed, 22 Jun 2016 13:08:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B81E628406; Wed, 22 Jun 2016 13:08:36 +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 33AE8283FD for ; Wed, 22 Jun 2016 13:08:36 +0000 (UTC) Received: from localhost ([::1]:58140 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFhtT-0007RY-AM for patchwork-qemu-devel@patchwork.kernel.org; Wed, 22 Jun 2016 09:08:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50235) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFhEQ-0003ls-PW for qemu-devel@nongnu.org; Wed, 22 Jun 2016 08:26:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFhEJ-00025c-4c for qemu-devel@nongnu.org; Wed, 22 Jun 2016 08:26:10 -0400 Received: from smtp3.mundo-r.com ([212.51.32.191]:50697 helo=smtp4.mundo-r.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFhEI-00023j-RK; Wed, 22 Jun 2016 08:26:03 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CkAgCmgmpX/5tjdVtUCh0BgyCBU40qmC4BAQEBAQEFAYEPAZExgg+BeoYXAoEsOBQBAQEBAQEBZSeETQIEeRA/EjwbGYg0AcMKAQEIJ4VfgkeGZnSFDwWIBoVycEKJU44tiUaFXY98HjaCCByBT2uJLQSBQAEBAQ X-IPAS-Result: A2CkAgCmgmpX/5tjdVtUCh0BgyCBU40qmC4BAQEBAQEFAYEPAZExgg+BeoYXAoEsOBQBAQEBAQEBZSeETQIEeRA/EjwbGYg0AcMKAQEIJ4VfgkeGZnSFDwWIBoVycEKJU44tiUaFXY98HjaCCByBT2uJLQSBQAEBAQ X-IronPort-AV: E=Sophos;i="5.26,509,1459807200"; d="scan'208";a="76201870" 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-0004kZ-9d; Wed, 22 Jun 2016 14:25:58 +0200 Received: from berto by perseus.local with local (Exim 4.87) (envelope-from ) id 1bFhDo-0007Fr-LG; Wed, 22 Jun 2016 15:25:32 +0300 From: Alberto Garcia To: qemu-devel@nongnu.org Date: Wed, 22 Jun 2016 15:25:11 +0300 Message-Id: <5c71494965c4d15596a9658d3391c669cc186dc2.1466598035.git.berto@igalia.com> 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 14/15] blockjob: Add 'id' parameter to 'block-job-complete' 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-complete' 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_complete' command remains unchanged. Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz --- blockdev.c | 7 +++++-- hmp.c | 2 +- qapi/block-core.json | 7 ++++++- qmp-commands.hx | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/blockdev.c b/blockdev.c index 5d8d405..9bb1033 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3842,10 +3842,13 @@ void qmp_block_job_resume(bool has_id, const char *id, aio_context_release(aio_context); } -void qmp_block_job_complete(const char *device, Error **errp) +void qmp_block_job_complete(bool has_id, const char *id, + bool has_device, const char *device, 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 8846673..c100ad8 100644 --- a/hmp.c +++ b/hmp.c @@ -1539,7 +1539,7 @@ void hmp_block_job_complete(Monitor *mon, const QDict *qdict) Error *error = NULL; const char *device = qdict_get_str(qdict, "device"); - qmp_block_job_complete(device, &error); + qmp_block_job_complete(false, NULL, true, device, &error); hmp_handle_error(mon, &error); } diff --git a/qapi/block-core.json b/qapi/block-core.json index 0efa73d..f15e62f 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1593,6 +1593,11 @@ # # A cancelled or paused job cannot be completed. # +# 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: the device name # # Returns: Nothing on success @@ -1600,7 +1605,7 @@ # # Since: 1.3 ## -{ 'command': 'block-job-complete', 'data': { 'device': 'str' } } +{ 'command': 'block-job-complete', 'data': { '*id': 'str', '*device': 'str' } } ## # @BlockdevDiscardOptions diff --git a/qmp-commands.hx b/qmp-commands.hx index b2020f3..df43d18 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1332,7 +1332,7 @@ EQMP }, { .name = "block-job-complete", - .args_type = "device:B", + .args_type = "id:s?,device:B?", .mhandler.cmd_new = qmp_marshal_block_job_complete, }, {