From patchwork Tue Apr 12 08:30:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 609286 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qkgB62FS7z9snk for ; Tue, 12 Apr 2016 18:30:54 +1000 (AEST) Received: from localhost ([::1]:44588 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aptim-0007fI-6X for incoming@patchwork.ozlabs.org; Tue, 12 Apr 2016 04:30:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aptiB-0005ea-OX for qemu-devel@nongnu.org; Tue, 12 Apr 2016 04:30:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1apti7-00067I-7Q for qemu-devel@nongnu.org; Tue, 12 Apr 2016 04:30:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33983) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apti7-00067E-3P for qemu-devel@nongnu.org; Tue, 12 Apr 2016 04:30:11 -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 B109663141; Tue, 12 Apr 2016 08:30:10 +0000 (UTC) Received: from localhost (ovpn-112-60.ams2.redhat.com [10.36.112.60]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3C8U9HL001034; Tue, 12 Apr 2016 04:30:10 -0400 From: Stefan Hajnoczi To: Date: Tue, 12 Apr 2016 09:30:02 +0100 Message-Id: <1460449803-4216-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1460449803-4216-1-git-send-email-stefanha@redhat.com> References: <1460449803-4216-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 12 Apr 2016 08:30:10 +0000 (UTC) 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] [PULL 2/3] mirror: Replace bdrv_drain(bs) with bdrv_co_drain(bs) 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: Peter Maydell , Fam Zheng , Stefan Hajnoczi Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Fam Zheng Suggested-by: Stefan Hajnoczi Signed-off-by: Fam Zheng Message-id: 1459855253-5378-3-git-send-email-famz@redhat.com Signed-off-by: Stefan Hajnoczi --- block/mirror.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/mirror.c b/block/mirror.c index f64db1a..c2cfc1a 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -650,7 +650,7 @@ static void coroutine_fn mirror_run(void *opaque) * mirror_populate runs. */ trace_mirror_before_drain(s, cnt); - bdrv_drain(bs); + bdrv_co_drain(bs); cnt = bdrv_get_dirty_count(s->dirty_bitmap); }