From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDZq4-0001xx-7L for qemu-devel@nongnu.org; Fri, 30 Mar 2012 07:17:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SDZpx-0000F5-TQ for qemu-devel@nongnu.org; Fri, 30 Mar 2012 07:17:51 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:59874) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDZpx-0000DJ-L3 for qemu-devel@nongnu.org; Fri, 30 Mar 2012 07:17:45 -0400 Received: by mail-pb0-f45.google.com with SMTP id uo5so1822303pbc.4 for ; Fri, 30 Mar 2012 04:17:44 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 30 Mar 2012 13:17:12 +0200 Message-Id: <1333106233-12472-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1333106233-12472-1-git-send-email-pbonzini@redhat.com> References: <1333106233-12472-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 3/4] block: set job->speed in block_set_speed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@linux.vnet.ibm.com There is no need to do this in every implementation of set_speed (even though there is only one right now). Signed-off-by: Paolo Bonzini --- block.c | 8 +++++++- block/stream.c | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index f244f99..3b6065b 100644 --- a/block.c +++ b/block.c @@ -4065,10 +4065,16 @@ void block_job_complete(BlockJob *job, int ret) int block_job_set_speed(BlockJob *job, int64_t value) { + int rc; + if (!job->job_type->set_speed) { return -ENOTSUP; } - return job->job_type->set_speed(job, value); + rc = job->job_type->set_speed(job, value); + if (rc == 0) { + job->speed = value; + } + return rc; } void block_job_cancel(BlockJob *job) diff --git a/block/stream.c b/block/stream.c index f186bfd..61ff7a2 100644 --- a/block/stream.c +++ b/block/stream.c @@ -236,7 +236,6 @@ static int stream_set_speed(BlockJob *job, int64_t value) if (value < 0) { return -EINVAL; } - job->speed = value; ratelimit_set_speed(&s->limit, value / BDRV_SECTOR_SIZE); return 0; } -- 1.7.9.1