From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Fam Zheng 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> Subject: [Qemu-devel] [PATCH 3/4] virtio-blk: Use blk_drained_begin/end around dataplane stop List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 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); -- 2.4.3