From patchwork Tue Jul 24 11:03:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 172838 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 EDA962C007B for ; Tue, 24 Jul 2012 21:30:48 +1000 (EST) Received: from localhost ([::1]:40451 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stcw7-0007eE-C1 for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2012 07:05:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StcvJ-0005dW-TZ for qemu-devel@nongnu.org; Tue, 24 Jul 2012 07:05:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1StcvE-0005Az-Ly for qemu-devel@nongnu.org; Tue, 24 Jul 2012 07:05:05 -0400 Received: from mail-yx0-f173.google.com ([209.85.213.173]:61960) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StcvE-00057s-HJ for qemu-devel@nongnu.org; Tue, 24 Jul 2012 07:05:00 -0400 Received: by mail-yx0-f173.google.com with SMTP id l1so6601761yen.4 for ; Tue, 24 Jul 2012 04:05:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=tM70/gpbX+ipE3bAIBnGF7om9u4E82tjfCP5c6cRB4U=; b=IMqBHy70f3VqEWFxfpUi3oZgJaqCVTni+XKb2yAY+g0XOpwmQefX4WAOEL4XPaWjyp vT2+PUNzGou1PKXLMCe+SJ/75ZRJyfvAdxmM2xGSG2vK3F/qfDhf0CkC8/6XOUYmASmW 68MY+1Are5cKUYkUvEV/+NOzVKpKXnqbUen7aH8y7rkAZmBCJuGvV4XJDSHd/zKoXJGI 93kPvVCUOhGtifyaE2xlh1xqVw10itXZHKf/A6+XXscdp1usEwwI3ArUs0HMCmkEl9VD W0DujecX4QzD1ULi8XQRGNRGEK/X293kwzcXOpgMFa+OuzKdlAEj5VD902K9giOs+JxE /0Qw== Received: by 10.42.145.7 with SMTP id d7mr14388591icv.45.1343127900107; Tue, 24 Jul 2012 04:05:00 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-189-113.ip51.fastwebnet.it. [93.34.189.113]) by mx.google.com with ESMTPS id if4sm1752561igc.10.2012.07.24.04.04.57 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Jul 2012 04:04:59 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 24 Jul 2012 13:03:46 +0200 Message-Id: <1343127865-16608-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343127865-16608-1-git-send-email-pbonzini@redhat.com> References: <1343127865-16608-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.213.173 Cc: kwolf@redhat.com, jcody@redhat.com, eblake@redhat.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 08/47] block: rename block_job_complete to block_job_completed 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 The imperative will be used for the QMP command. Signed-off-by: Paolo Bonzini --- block/stream.c | 4 ++-- blockjob.c | 2 +- blockjob.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/block/stream.c b/block/stream.c index 5b801b4..b3ede44 100644 --- a/block/stream.c +++ b/block/stream.c @@ -84,7 +84,7 @@ static void coroutine_fn stream_run(void *opaque) s->common.len = bdrv_getlength(bs); if (s->common.len < 0) { - block_job_complete(&s->common, s->common.len); + block_job_completed(&s->common, s->common.len); return; } @@ -161,7 +161,7 @@ wait: } qemu_vfree(buf); - block_job_complete(&s->common, ret); + block_job_completed(&s->common, ret); } static void stream_set_speed(BlockJob *job, int64_t speed, Error **errp) diff --git a/blockjob.c b/blockjob.c index 5d62191..a18da3f 100644 --- a/blockjob.c +++ b/blockjob.c @@ -71,7 +71,7 @@ void *block_job_create(const BlockJobType *job_type, BlockDriverState *bs, return job; } -void block_job_complete(BlockJob *job, int ret) +void block_job_completed(BlockJob *job, int ret) { BlockDriverState *bs = job->bs; diff --git a/blockjob.h b/blockjob.h index ccbef07..2abbe13 100644 --- a/blockjob.h +++ b/blockjob.h @@ -132,14 +132,14 @@ void *block_job_create(const BlockJobType *job_type, BlockDriverState *bs, void block_job_sleep_ns(BlockJob *job, QEMUClock *clock, int64_t ns); /** - * block_job_complete: + * block_job_completed: * @job: The job being completed. * @ret: The status code. * * Call the completion function that was registered at creation time, and * free @job. */ -void block_job_complete(BlockJob *job, int ret); +void block_job_completed(BlockJob *job, int ret); /** * block_job_set_speed: