From patchwork Fri Apr 22 06:35:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 8906071 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3F4DE9F1D3 for ; Fri, 22 Apr 2016 06:35:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 913BE2025A for ; Fri, 22 Apr 2016 06:35:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C2D41201EF for ; Fri, 22 Apr 2016 06:35:29 +0000 (UTC) Received: from localhost ([::1]:55274 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atUga-0001uy-BQ for patchwork-qemu-devel@patchwork.kernel.org; Fri, 22 Apr 2016 02:35:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atUgL-0001pd-Es for qemu-devel@nongnu.org; Fri, 22 Apr 2016 02:35:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1atUgK-0000Vl-HU for qemu-devel@nongnu.org; Fri, 22 Apr 2016 02:35:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44645) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atUgH-0000Sz-G4; Fri, 22 Apr 2016 02:35:09 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EB6827DCD6; Fri, 22 Apr 2016 06:35:08 +0000 (UTC) Received: from ad.usersys.redhat.com (dhcp-15-133.nay.redhat.com [10.66.15.133]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3M6Z3cT014569; Fri, 22 Apr 2016 02:35:06 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 22 Apr 2016 14:35:05 +0800 Message-Id: <1461306907-2837-2-git-send-email-famz@redhat.com> In-Reply-To: <1461306907-2837-1-git-send-email-famz@redhat.com> References: <1461306907-2837-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.6 1/3] mirror: Extract mirror_replace 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 , qemu-block@nongnu.org, Jeff Cody , Max Reitz , stefanha@redhat.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move the BDS replacing code to a separate function so that it can be used in the next patch. A new field "should_replace" is added and set to true so the function is always called for now. Signed-off-by: Fam Zheng --- block/mirror.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index d56e30e..6c3fe43 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -441,26 +441,20 @@ static void mirror_drain(MirrorBlockJob *s) } typedef struct { + bool should_replace; int ret; } MirrorExitData; -static void mirror_exit(BlockJob *job, void *opaque) +static void mirror_replace(MirrorBlockJob *s, int *ret) { - MirrorBlockJob *s = container_of(job, MirrorBlockJob, common); - MirrorExitData *data = opaque; AioContext *replace_aio_context = NULL; - BlockDriverState *src = s->common.bs; - - /* Make sure that the source BDS doesn't go away before we called - * block_job_completed(). */ - bdrv_ref(src); if (s->to_replace) { replace_aio_context = bdrv_get_aio_context(s->to_replace); aio_context_acquire(replace_aio_context); } - if (s->should_complete && data->ret == 0) { + if (s->should_complete && *ret == 0) { BlockDriverState *to_replace = s->common.bs; if (s->to_replace) { to_replace = s->to_replace; @@ -470,7 +464,7 @@ static void mirror_exit(BlockJob *job, void *opaque) * nodes could have been newly attached to a BlockBackend. */ if (to_replace->blk && s->target->blk) { error_report("block job: Can't create node with two BlockBackends"); - data->ret = -EINVAL; + *ret = -EINVAL; goto out; } @@ -481,14 +475,29 @@ static void mirror_exit(BlockJob *job, void *opaque) } out: + if (replace_aio_context) { + aio_context_release(replace_aio_context); + } +} + +static void mirror_exit(BlockJob *job, void *opaque) +{ + MirrorBlockJob *s = container_of(job, MirrorBlockJob, common); + MirrorExitData *data = opaque; + BlockDriverState *src = s->common.bs; + + /* Make sure that the source BDS doesn't go away before we called + * block_job_completed(). */ + bdrv_ref(src); + + if (data->should_replace) { + mirror_replace(s, &data->ret); + } if (s->to_replace) { bdrv_op_unblock_all(s->to_replace, s->replace_blocker); error_free(s->replace_blocker); bdrv_unref(s->to_replace); } - if (replace_aio_context) { - aio_context_release(replace_aio_context); - } g_free(s->replaces); bdrv_op_unblock_all(s->target, s->common.blocker); bdrv_unref(s->target); @@ -713,6 +722,7 @@ immediate_exit: data = g_malloc(sizeof(*data)); data->ret = ret; + data->should_replace = true; /* Before we switch to target in mirror_exit, make sure data doesn't * change. */ bdrv_drained_begin(s->common.bs);