From patchwork Fri Jul 1 15:52:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 9210107 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 0502B60752 for ; Fri, 1 Jul 2016 15:57:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EAC512853D for ; Fri, 1 Jul 2016 15:57:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF5A42867A; Fri, 1 Jul 2016 15:57:18 +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 1B3EE2853D for ; Fri, 1 Jul 2016 15:57:18 +0000 (UTC) Received: from localhost ([::1]:34114 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ0of-00067A-AO for patchwork-qemu-devel@patchwork.kernel.org; Fri, 01 Jul 2016 11:57:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35663) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ0kl-0000Le-KX for qemu-devel@nongnu.org; Fri, 01 Jul 2016 11:53:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bJ0kg-0004k8-Nq for qemu-devel@nongnu.org; Fri, 01 Jul 2016 11:53:14 -0400 Received: from smtp3.mundo-r.com ([212.51.32.191]:19237 helo=smtp4.mundo-r.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ0kg-0004jk-Fn; Fri, 01 Jul 2016 11:53:10 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2AjBQAhkXZX/5tjdVtdHQGDIIFSpGQGBQGBEJFBgg+Be4YYAoEwORMBAQEBAQEBZSeETQIEJ1IQPxI8GxmINAHEQgEBAQcnhWCCR4dahQ8FiAmFeHBCiV2ORIFqh2GFX4ZWiTMgAjKCCByBT2uHMASBQAEBAQ X-IPAS-Result: A2AjBQAhkXZX/5tjdVtdHQGDIIFSpGQGBQGBEJFBgg+Be4YYAoEwORMBAQEBAQEBZSeETQIEJ1IQPxI8GxmINAHEQgEBAQcnhWCCR4dahQ8FiAmFeHBCiV2ORIFqh2GFX4ZWiTMgAjKCCByBT2uHMASBQAEBAQ X-IronPort-AV: E=Sophos;i="5.26,557,1459807200"; d="scan'208";a="146521274" Received: from fanzine.igalia.com ([91.117.99.155]) by smtp4.mundo-r.com with ESMTP; 01 Jul 2016 17:52:29 +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 1bJ0k1-0003i7-7b; Fri, 01 Jul 2016 17:52:29 +0200 Received: from berto by perseus.local with local (Exim 4.87) (envelope-from ) id 1bJ0jl-0005PF-4g; Fri, 01 Jul 2016 18:52:13 +0300 From: Alberto Garcia To: qemu-devel@nongnu.org Date: Fri, 1 Jul 2016 18:52:00 +0300 Message-Id: <330e110a04ea4e3c8b202d5db0bf82223e03dc18.1467386530.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 v3 02/11] blockjob: Update description of the 'id' field 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 , John Snow Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The 'id' field of the BlockJob structure will be able to hold any ID, not only a device name. This patch updates the description of that field and the error messages where it is being used. Soon we'll add the ability to set an arbitrary ID when creating a block job. Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz --- block/mirror.c | 3 ++- blockjob.c | 3 ++- include/block/blockjob.h | 5 +---- include/qapi/qmp/qerror.h | 3 --- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index 8d96049..6e3dbd2 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -761,7 +761,8 @@ static void mirror_complete(BlockJob *job, Error **errp) target = blk_bs(s->target); if (!s->synced) { - error_setg(errp, QERR_BLOCK_JOB_NOT_READY, job->id); + error_setg(errp, "The active block job '%s' cannot be completed", + job->id); return; } diff --git a/blockjob.c b/blockjob.c index 205da9d..ce0e27c 100644 --- a/blockjob.c +++ b/blockjob.c @@ -290,7 +290,8 @@ void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp) void block_job_complete(BlockJob *job, Error **errp) { if (job->pause_count || job->cancelled || !job->driver->complete) { - error_setg(errp, QERR_BLOCK_JOB_NOT_READY, job->id); + error_setg(errp, "The active block job '%s' cannot be completed", + job->id); return; } diff --git a/include/block/blockjob.h b/include/block/blockjob.h index 7dc720c..5181514 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -106,10 +106,7 @@ struct BlockJob { BlockBackend *blk; /** - * The ID of the block job. Currently the BlockBackend name of the BDS - * owning the job at the time when the job is started. - * - * TODO Decouple block job IDs from BlockBackend names + * The ID of the block job. */ char *id; diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index d08652a..6586c9f 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -19,9 +19,6 @@ #define QERR_BASE_NOT_FOUND \ "Base '%s' not found" -#define QERR_BLOCK_JOB_NOT_READY \ - "The active block job for device '%s' cannot be completed" - #define QERR_BUS_NO_HOTPLUG \ "Bus '%s' does not support hotplugging"