From patchwork Wed Apr 25 13:17:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 154957 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 68523B6F6E for ; Thu, 26 Apr 2012 00:28:09 +1000 (EST) Received: from localhost ([::1]:51604 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SN3CR-0003GJ-6E for incoming@patchwork.ozlabs.org; Wed, 25 Apr 2012 10:28:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50465) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SN3CB-0002zA-K1 for qemu-devel@nongnu.org; Wed, 25 Apr 2012 10:27:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SN3C4-0006CZ-Qn for qemu-devel@nongnu.org; Wed, 25 Apr 2012 10:27:51 -0400 Received: from e06smtp18.uk.ibm.com ([195.75.94.114]:57165) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SN3C4-0006BI-Hs for qemu-devel@nongnu.org; Wed, 25 Apr 2012 10:27:44 -0400 Received: from /spool/local by e06smtp18.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 25 Apr 2012 14:17:22 +0100 Received: from d06nrmr1806.portsmouth.uk.ibm.com (9.149.39.193) by e06smtp18.uk.ibm.com (192.168.101.148) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 25 Apr 2012 14:17:20 +0100 Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q3PDHJ0Y2064500 for ; Wed, 25 Apr 2012 14:17:19 +0100 Received: from d06av06.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q3PDHJVG007319 for ; Wed, 25 Apr 2012 07:17:19 -0600 Received: from localhost ([9.145.156.72]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q3PDHIJh007269; Wed, 25 Apr 2012 07:17:18 -0600 From: Stefan Hajnoczi To: Date: Wed, 25 Apr 2012 14:17:08 +0100 Message-Id: <1335359831-18473-3-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1335359831-18473-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1335359831-18473-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12042513-6892-0000-0000-000001A9736D X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.114 Cc: Kevin Wolf , Paolo Bonzini , Eric Blake , Stefan Hajnoczi , Luiz Capitulino Subject: [Qemu-devel] [PATCH v3 2/5] block: use Error mechanism instead of -errno for block_job_set_speed() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org There are at least two different errors that can occur in block_job_set_speed(): the job might not support setting speeds or the value might be invalid. Use the Error mechanism to report the error where it occurs. Signed-off-by: Stefan Hajnoczi Acked-by: Kevin Wolf --- block.c | 17 ++++++++++------- block/stream.c | 6 +++--- block_int.h | 5 +++-- blockdev.c | 4 +--- qapi-schema.json | 1 + 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/block.c b/block.c index 2b72a0f..dc02736 100644 --- a/block.c +++ b/block.c @@ -4114,18 +4114,21 @@ void block_job_complete(BlockJob *job, int ret) bdrv_set_in_use(bs, 0); } -int block_job_set_speed(BlockJob *job, int64_t value) +void block_job_set_speed(BlockJob *job, int64_t value, Error **errp) { - int rc; + Error *local_err = NULL; if (!job->job_type->set_speed) { - return -ENOTSUP; + error_set(errp, QERR_NOT_SUPPORTED); + return; } - rc = job->job_type->set_speed(job, value); - if (rc == 0) { - job->speed = value; + job->job_type->set_speed(job, value, &local_err); + if (error_is_set(&local_err)) { + error_propagate(errp, local_err); + return; } - return rc; + + job->speed = value; } void block_job_cancel(BlockJob *job) diff --git a/block/stream.c b/block/stream.c index 7002dc8..06bc70a 100644 --- a/block/stream.c +++ b/block/stream.c @@ -263,15 +263,15 @@ retry: block_job_complete(&s->common, ret); } -static int stream_set_speed(BlockJob *job, int64_t value) +static void stream_set_speed(BlockJob *job, int64_t value, Error **errp) { StreamBlockJob *s = container_of(job, StreamBlockJob, common); if (value < 0) { - return -EINVAL; + error_set(errp, QERR_INVALID_PARAMETER, "value"); + return; } ratelimit_set_speed(&s->limit, value / BDRV_SECTOR_SIZE); - return 0; } static BlockJobType stream_job_type = { diff --git a/block_int.h b/block_int.h index e70a33e..e042676 100644 --- a/block_int.h +++ b/block_int.h @@ -79,7 +79,7 @@ typedef struct BlockJobType { const char *job_type; /** Optional callback for job types that support setting a speed limit */ - int (*set_speed)(BlockJob *job, int64_t value); + void (*set_speed)(BlockJob *job, int64_t value, Error **errp); } BlockJobType; /** @@ -375,11 +375,12 @@ void block_job_complete(BlockJob *job, int ret); * block_job_set_speed: * @job: The job to set the speed for. * @speed: The new value + * @errp: Error object. * * Set a rate-limiting parameter for the job; the actual meaning may * vary depending on the job type. */ -int block_job_set_speed(BlockJob *job, int64_t value); +void block_job_set_speed(BlockJob *job, int64_t value, Error **errp); /** * block_job_cancel: diff --git a/blockdev.c b/blockdev.c index a411477..7073330 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1145,9 +1145,7 @@ void qmp_block_job_set_speed(const char *device, int64_t value, Error **errp) return; } - if (block_job_set_speed(job, value) < 0) { - error_set(errp, QERR_NOT_SUPPORTED); - } + block_job_set_speed(job, value, errp); } void qmp_block_job_cancel(const char *device, Error **errp) diff --git a/qapi-schema.json b/qapi-schema.json index 6499895..49f1e16 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1596,6 +1596,7 @@ # # Returns: Nothing on success # If the job type does not support throttling, NotSupported +# If the speed value is invalid, InvalidParameter # If streaming is not active on this device, DeviceNotActive # # Since: 1.1