From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5AjC-0007fe-I8 for qemu-devel@nongnu.org; Wed, 17 Jun 2015 06:37:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5Aj7-0002v3-MI for qemu-devel@nongnu.org; Wed, 17 Jun 2015 06:37:54 -0400 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:37759) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5Aj7-0002uW-Cm for qemu-devel@nongnu.org; Wed, 17 Jun 2015 06:37:49 -0400 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 17 Jun 2015 11:37:47 +0100 From: Alexander Yarygin Date: Wed, 17 Jun 2015 13:37:20 +0300 Message-Id: <1434537440-28236-3-git-send-email-yarygin@linux.vnet.ibm.com> In-Reply-To: <1434537440-28236-1-git-send-email-yarygin@linux.vnet.ibm.com> References: <1434537440-28236-1-git-send-email-yarygin@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v3 2/2] virtio-blk: Use blk_drain() to drain IO requests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , qemu-block@nongnu.org, Alexander Yarygin , Ekaterina Tumanova , "Michael S. Tsirkin" , Christian Borntraeger , Stefan Hajnoczi , Cornelia Huck , Paolo Bonzini Each call of the virtio_blk_reset() function calls blk_drain_all(), which works for all existing BlockDriverStates, while draining only one is needed. This patch replaces blk_drain_all() by blk_drain() in virtio_blk_reset(). virtio_blk_data_plane_stop() should be called after draining because it restores vblk->complete_request. Cc: "Michael S. Tsirkin" Cc: Christian Borntraeger Cc: Cornelia Huck Cc: Kevin Wolf Cc: Paolo Bonzini Cc: Stefan Hajnoczi Signed-off-by: Alexander Yarygin --- hw/block/virtio-blk.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index e6afe97..d8a906f 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -651,16 +651,21 @@ static void virtio_blk_dma_restart_cb(void *opaque, int running, static void virtio_blk_reset(VirtIODevice *vdev) { VirtIOBlock *s = VIRTIO_BLK(vdev); - - if (s->dataplane) { - virtio_blk_data_plane_stop(s->dataplane); - } + AioContext *ctx; /* * This should cancel pending requests, but can't do nicely until there * are per-device request lists. */ - blk_drain_all(); + ctx = blk_get_aio_context(s->blk); + aio_context_acquire(ctx); + blk_drain(s->blk); + + if (s->dataplane) { + virtio_blk_data_plane_stop(s->dataplane); + } + aio_context_release(ctx); + blk_set_enable_write_cache(s->blk, s->original_wce); } -- 1.9.1