From patchwork Wed Sep 26 15:56:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 187108 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 E859D2C007B for ; Thu, 27 Sep 2012 01:57:46 +1000 (EST) Received: from localhost ([::1]:39208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGtzd-0000WB-22 for incoming@patchwork.ozlabs.org; Wed, 26 Sep 2012 11:57:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGtzB-0008SL-7A for qemu-devel@nongnu.org; Wed, 26 Sep 2012 11:57:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGtz9-0004aO-TV for qemu-devel@nongnu.org; Wed, 26 Sep 2012 11:57:16 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:36644) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGtz9-0004Z6-LN for qemu-devel@nongnu.org; Wed, 26 Sep 2012 11:57:15 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so2106416pbb.4 for ; Wed, 26 Sep 2012 08:57:15 -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=LUv3KrMV3DoqBnQr7X/LIzAwVr81ysq7lXkG4oXCgAs=; b=yLex3QB/NQ1eBRpVHsqrZFuKKxdV5ukiVwe8h9aaQQOjv9vwedpz8oKgB3xTQIKdYp MStgzbAEcOu8ge0CHMxSJBxzNxVNoNU7AV3Zi+a+1lfK5wqCQhM+g34FAC1Q2uLNmZQT BV8r2l2nMn6ncGogSRAsNoAPl0PB4b+NhrQc40zSXiorOSbpTXlgAxG1vVSYzEff38D7 g7BJQIa5j1lflFotWv3kx5XYI14bZOcOB5tPs8WvH5QUduZOY89BhTjqESWsQZqIzXSt BxjuUGvRcxJGq0kMi1P2R8VBDjtQ+4SksP0WeEaFVn9h31Fsotv9dAJuU55TAq2/oaKN Wxvw== Received: by 10.68.189.161 with SMTP id gj1mr3818078pbc.21.1348675035029; Wed, 26 Sep 2012 08:57:15 -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 i2sm2114149pav.13.2012.09.26.08.57.11 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 26 Sep 2012 08:57:13 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 26 Sep 2012 17:56:09 +0200 Message-Id: <1348675011-8794-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1348675011-8794-1-git-send-email-pbonzini@redhat.com> References: <1348675011-8794-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.160.45 Cc: kwolf@redhat.com, jcody@redhat.com Subject: [Qemu-devel] [PATCH v2 03/45] block: fix documentation of block_job_cancel_sync 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 Do this in a separate commit before we move the functions to blockjob.h. Signed-off-by: Paolo Bonzini --- v1->v2: split out of the next patch block_int.h | 4 ++-- 1 file modificato, 2 inserzioni(+), 2 rimozioni(-) diff --git a/block_int.h b/block_int.h index ac4245c..7bb95b7 100644 --- a/block_int.h +++ b/block_int.h @@ -425,10 +425,10 @@ void block_job_cancel(BlockJob *job); bool block_job_is_cancelled(BlockJob *job); /** - * block_job_cancel: + * block_job_cancel_sync: * @job: The job to be canceled. * - * Asynchronously cancel the job and wait for it to reach a quiescent + * Synchronously cancel the job and wait for it to reach a quiescent * state. Note that the completion callback will still be called * asynchronously, hence it is *not* valid to call #bdrv_delete * immediately after #block_job_cancel_sync. Users of block jobs