From patchwork Tue Mar 21 03:16:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 741402 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3vnJCw636dz9s73 for ; Tue, 21 Mar 2017 14:27:40 +1100 (AEDT) Received: from localhost ([::1]:36449 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqASQ-0001EK-7t for incoming@patchwork.ozlabs.org; Mon, 20 Mar 2017 23:27:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqAJz-0002oA-9j for qemu-devel@nongnu.org; Mon, 20 Mar 2017 23:18:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cqAJy-00018a-AU for qemu-devel@nongnu.org; Mon, 20 Mar 2017 23:18:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6363) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cqAJt-00016P-PX; Mon, 20 Mar 2017 23:18:49 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D276EC054C58; Tue, 21 Mar 2017 03:18:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D276EC054C58 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com D276EC054C58 Received: from lemon.redhat.com (ovpn-8-61.pek2.redhat.com [10.72.8.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0099DA2A6A; Tue, 21 Mar 2017 03:18:37 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 21 Mar 2017 11:16:28 +0800 Message-Id: <20170321031635.22123-10-famz@redhat.com> In-Reply-To: <20170321031635.22123-1-famz@redhat.com> References: <20170321031635.22123-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 21 Mar 2017 03:18:50 +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 RFC 09/16] mirror: Do initial aio context move of target via BB interface 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 , Paolo Bonzini , qemu-block@nongnu.org, Stefan Hajnoczi , Max Reitz Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" While blockdev-backup tried to verify before moving target's aio context, the same is missing for blockdev-mirror. Now that we have the right interface, fix this as well. As a bounus, the aio context move is now conditional, which avoids unnecessary operations in bdrv_set_aio_context. Signed-off-by: Fam Zheng --- block/mirror.c | 9 +++++++++ blockdev.c | 4 ---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index 7101b11..ed26e8c 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1116,6 +1116,7 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, bool is_none_mode, BlockDriverState *base, bool auto_complete, const char *filter_node_name) { + AioContext *aio_context, *target_context; MirrorBlockJob *s; BlockDriverState *mirror_top_bs; bool target_graph_mod; @@ -1196,6 +1197,14 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, goto fail; } + aio_context = bdrv_get_aio_context(bs); + target_context = bdrv_get_aio_context(target); + if (target_context != aio_context) { + aio_context_acquire(target_context); + blk_set_aio_context(s->target, aio_context); + aio_context_release(target_context); + } + s->replaces = g_strdup(replaces); s->on_source_error = on_source_error; s->on_target_error = on_target_error; diff --git a/blockdev.c b/blockdev.c index 5d89a9a..5298a93 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3556,8 +3556,6 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp) goto out; } - bdrv_set_aio_context(target_bs, aio_context); - blockdev_mirror_common(arg->has_job_id ? arg->job_id : NULL, bs, target_bs, arg->has_replaces, arg->replaces, arg->sync, backing_mode, arg->has_speed, arg->speed, @@ -3608,8 +3606,6 @@ void qmp_blockdev_mirror(bool has_job_id, const char *job_id, aio_context = bdrv_get_aio_context(bs); aio_context_acquire(aio_context); - bdrv_set_aio_context(target_bs, aio_context); - blockdev_mirror_common(has_job_id ? job_id : NULL, bs, target_bs, has_replaces, replaces, sync, backing_mode, has_speed, speed,