From patchwork Wed Mar 16 10:10:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 8597241 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 2677D9F44D for ; Wed, 16 Mar 2016 10:12:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 96DFD20225 for ; Wed, 16 Mar 2016 10:12:29 +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 D7557201CE for ; Wed, 16 Mar 2016 10:12:28 +0000 (UTC) Received: from localhost ([::1]:54320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8RI-0001nh-7a for patchwork-qemu-devel@patchwork.kernel.org; Wed, 16 Mar 2016 06:12:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8Pc-0007XI-Cp for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:10:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ag8PX-0005gh-Bv for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:10:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46293) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8PR-0005em-As; Wed, 16 Mar 2016 06:10:33 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 0C1027209B; Wed, 16 Mar 2016 10:10:33 +0000 (UTC) Received: from fam-t430.redhat.com (vpn1-6-163.pek2.redhat.com [10.72.6.163]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2GAAIo6010795; Wed, 16 Mar 2016 06:10:30 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Wed, 16 Mar 2016 18:10:17 +0800 Message-Id: <1458123018-18651-4-git-send-email-famz@redhat.com> In-Reply-To: <1458123018-18651-1-git-send-email-famz@redhat.com> References: <1458123018-18651-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 16 Mar 2016 10:10:33 +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 Cc: Kevin Wolf , qemu-block@nongnu.org, "Michael S. Tsirkin" , tubo@linux.vnet.ibm.com, Stefan Hajnoczi , cornelia.huck@de.ibm.com, pbonzini@redhat.com, borntraeger@de.ibm.com Subject: [Qemu-devel] [PATCH 3/4] virtio-blk: Use blk_drained_begin/end around dataplane stop 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org 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 Signed-off-by: Fam Zheng --- hw/block/virtio-blk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index cb710f1..939ba79 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -653,11 +653,12 @@ static void virtio_blk_reset(VirtIODevice *vdev) */ ctx = blk_get_aio_context(s->blk); aio_context_acquire(ctx); - blk_drain(s->blk); + blk_drained_begin(s->blk); if (s->dataplane) { virtio_blk_data_plane_stop(s->dataplane); } + blk_drained_end(s->blk); aio_context_release(ctx); blk_set_enable_write_cache(s->blk, s->original_wce);