From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45377) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2sb6-0005rx-KY for qemu-devel@nongnu.org; Wed, 10 Jun 2015 22:52:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z2sb5-00044P-Kd for qemu-devel@nongnu.org; Wed, 10 Jun 2015 22:52:04 -0400 Date: Thu, 11 Jun 2015 10:51:54 +0800 From: Fam Zheng Message-ID: <20150611025154.GA17234@ad.nay.redhat.com> References: <1433936297-7098-1-git-send-email-yarygin@linux.vnet.ibm.com> <1433936297-7098-3-git-send-email-yarygin@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1433936297-7098-3-git-send-email-yarygin@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [PATCH 2/3] virtio-blk: Use blk_drain() to drain IO requests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Yarygin Cc: Kevin Wolf , qemu-block@nongnu.org, Ekaterina Tumanova , qemu-devel@nongnu.org, qemu-stable@nongnu.org, Christian Borntraeger , Stefan Hajnoczi , Cornelia Huck , Paolo Bonzini On Wed, 06/10 14:38, Alexander Yarygin wrote: > 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(). Please add a note "virtio_blk_data_plane_stop should be called after draining because it restores vblk->complete_request" as well. > > Cc: Christian Borntraeger > Cc: Cornelia Huck > Cc: Kevin Wolf > Cc: Paolo Bonzini > Cc: Stefan Hajnoczi Cc: qemu-stable@nongnu.org > Signed-off-by: Alexander Yarygin > --- > hw/block/virtio-blk.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c > index e6afe97..2009092 100644 > --- a/hw/block/virtio-blk.c > +++ b/hw/block/virtio-blk.c > @@ -652,15 +652,16 @@ static void virtio_blk_reset(VirtIODevice *vdev) > { > VirtIOBlock *s = VIRTIO_BLK(vdev); > > - if (s->dataplane) { > - virtio_blk_data_plane_stop(s->dataplane); > - } > - > /* > * This should cancel pending requests, but can't do nicely until there > * are per-device request lists. > */ This comment can be dropped now. > - blk_drain_all(); > + blk_drain(s->blk); > + > + if (s->dataplane) { > + virtio_blk_data_plane_stop(s->dataplane); > + } > + > blk_set_enable_write_cache(s->blk, s->original_wce); > } > > -- > 1.9.1 > >