From patchwork Thu Oct 18 14:49:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 192365 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 E9CF32C008F for ; Fri, 19 Oct 2012 02:40:40 +1100 (EST) Received: from localhost ([::1]:52759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOrRN-0000Va-4h for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2012 10:51:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOrQe-0007Z2-8t for qemu-devel@nongnu.org; Thu, 18 Oct 2012 10:50:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOrQY-0007ph-DB for qemu-devel@nongnu.org; Thu, 18 Oct 2012 10:50:32 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:54803) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOrQY-0007Y1-5b for qemu-devel@nongnu.org; Thu, 18 Oct 2012 10:50:26 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so8433579pad.4 for ; Thu, 18 Oct 2012 07:50:25 -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=6fUcuZknFPuSI4HcpGDCyON2BfQarI6gnPRs8QAqHDQ=; b=iioMYGM1ICJKbA1w4AAQxMNkDL2NBDIRb5nWMDiS8EMlUjtLuUvDu6XosKElAAaPAY crs+HT7GPbmkljO7JpNfZ+2qa1s/oufioFZTpwSwt4nDmgwHnM3dEKx2KQhB+c/QkaDT b7JbFXNOfMXS4YYmSzNBWoOSVcQTnzj4pmoUITep4aXgquKSiNrs+ifsAGOoTTDt3stN 5isjMycQF7mSP421asDtSEHENFzzlcTEhls4WD1K0Q/H//ooXo1K5fTI3fHMEKu83mji mT+d8Fk/k0d7xYGngi/dXsXinFfP4lTYfznSceMCHHl47vgwINVg/jQLgWNCm4lIy82q zhRA== Received: by 10.68.232.131 with SMTP id to3mr67450672pbc.58.1350571825548; Thu, 18 Oct 2012 07:50:25 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id qb2sm14348236pbb.15.2012.10.18.07.50.20 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 07:50:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2012 16:49:20 +0200 Message-Id: <1350571770-9836-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1350571770-9836-1-git-send-email-pbonzini@redhat.com> References: <1350571770-9836-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.220.45 Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH v3 06/16] 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 --- v2->v3: commit is also affected block/commit.c | 2 +- block/stream.c | 4 ++-- blockjob.c | 2 +- blockjob.h | 4 ++-- 4 file modificati, 6 inserzioni(+), 6 rimozioni(-) diff --git a/block/commit.c b/block/commit.c index 733c914..897af5f 100644 --- a/block/commit.c +++ b/block/commit.c @@ -160,7 +160,7 @@ exit_restore_reopen: bdrv_reopen(overlay_bs, s->orig_overlay_flags, NULL); } - block_job_complete(&s->common, ret); + block_job_completed(&s->common, ret); } static void commit_set_speed(BlockJob *job, int64_t speed, Error **errp) diff --git a/block/stream.c b/block/stream.c index 7926652..0c0fc7a 100644 --- a/block/stream.c +++ b/block/stream.c @@ -86,7 +86,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; } @@ -184,7 +184,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 f55f55a..b5c16f3 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 930cc3c..c2261a9 100644 --- a/blockjob.h +++ b/blockjob.h @@ -135,14 +135,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: