From patchwork Wed Sep 13 18:18:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 813556 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xsqj76VsGz9s7g for ; Thu, 14 Sep 2017 04:20:43 +1000 (AEST) Received: from localhost ([::1]:43984 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsCHB-0007qx-Fu for incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 14:20:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsCGN-0007ou-3r for qemu-devel@nongnu.org; Wed, 13 Sep 2017 14:19:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dsCGM-0004nc-5t for qemu-devel@nongnu.org; Wed, 13 Sep 2017 14:19:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39198) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dsCGJ-0004m2-S1; Wed, 13 Sep 2017 14:19:48 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9CB0F356D8; Wed, 13 Sep 2017 18:19:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9CB0F356D8 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=mreitz@redhat.com Received: from localhost (ovpn-204-23.brq.redhat.com [10.40.204.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 88A4C5C545; Wed, 13 Sep 2017 18:19:39 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 13 Sep 2017 20:18:55 +0200 Message-Id: <20170913181910.29688-4-mreitz@redhat.com> In-Reply-To: <20170913181910.29688-1-mreitz@redhat.com> References: <20170913181910.29688-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 13 Sep 2017 18:19:46 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 03/18] blockjob: Make drained_{begin, end} public X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-devel@nongnu.org, Max Reitz , Stefan Hajnoczi , John Snow Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When a block job decides to be represented as a BDS and track its associated child nodes itself instead of having the BlockJob object track them, it needs to implement the drained_begin/drained_end child operations. In order to do that, it has to be able to control drainage of the block job (i.e. to pause and resume it). Therefore, we need to make these operations public. Signed-off-by: Max Reitz Reviewed-by: Fam Zheng --- include/block/blockjob.h | 15 +++++++++++++++ blockjob.c | 20 ++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/include/block/blockjob.h b/include/block/blockjob.h index 67c0968fa5..a59f316788 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -339,6 +339,21 @@ void block_job_ref(BlockJob *job); void block_job_unref(BlockJob *job); /** + * block_job_drained_begin: + * + * Inhibit I/O requests initiated by the block job. + */ +void block_job_drained_begin(BlockJob *job); + +/** + * block_job_drained_end: + * + * Resume I/O after it has been paused through + * block_job_drained_begin(). + */ +void block_job_drained_end(BlockJob *job); + +/** * block_job_txn_unref: * * Release a reference that was previously acquired with block_job_txn_add_job diff --git a/blockjob.c b/blockjob.c index 3a0c49137e..4312a121fa 100644 --- a/blockjob.c +++ b/blockjob.c @@ -217,21 +217,29 @@ static const BdrvChildRole child_job = { .stay_at_node = true, }; -static void block_job_drained_begin(void *opaque) +void block_job_drained_begin(BlockJob *job) { - BlockJob *job = opaque; block_job_pause(job); } -static void block_job_drained_end(void *opaque) +static void block_job_drained_begin_op(void *opaque) +{ + block_job_drained_begin(opaque); +} + +void block_job_drained_end(BlockJob *job) { - BlockJob *job = opaque; block_job_resume(job); } +static void block_job_drained_end_op(void *opaque) +{ + block_job_drained_end(opaque); +} + static const BlockDevOps block_job_dev_ops = { - .drained_begin = block_job_drained_begin, - .drained_end = block_job_drained_end, + .drained_begin = block_job_drained_begin_op, + .drained_end = block_job_drained_end_op, }; void block_job_remove_all_bdrv(BlockJob *job)