From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42910) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3Plu-0003Cy-MR for qemu-devel@nongnu.org; Fri, 12 Jun 2015 10:17:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z3Plt-0007wL-Q5 for qemu-devel@nongnu.org; Fri, 12 Jun 2015 10:17:26 -0400 Date: Fri, 12 Jun 2015 15:17:16 +0100 From: Stefan Hajnoczi Message-ID: <20150612141716.GB31283@stefanha-thinkpad.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> <20150611025154.GA17234@ad.nay.redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="R3G7APHDIzY6R/pk" Content-Disposition: inline In-Reply-To: <20150611025154.GA17234@ad.nay.redhat.com> Subject: Re: [Qemu-devel] [Qemu-block] [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: Fam Zheng Cc: Kevin Wolf , qemu-block@nongnu.org, Alexander Yarygin , Ekaterina Tumanova , qemu-stable@nongnu.org, qemu-devel@nongnu.org, Christian Borntraeger , Stefan Hajnoczi , Cornelia Huck , Paolo Bonzini --R3G7APHDIzY6R/pk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jun 11, 2015 at 10:51:54AM +0800, Fam Zheng wrote: > 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. > >=20 > > This patch replaces blk_drain_all() by blk_drain() in virtio_blk_reset(= ). >=20 > Please add a note "virtio_blk_data_plane_stop should be called after drai= ning > because it restores vblk->complete_request" as well. > >=20 > > Cc: Christian Borntraeger > > Cc: Cornelia Huck > > Cc: Kevin Wolf > > Cc: Paolo Bonzini > > Cc: Stefan Hajnoczi >=20 > Cc: qemu-stable@nongnu.org >=20 > > Signed-off-by: Alexander Yarygin > > --- > > hw/block/virtio-blk.c | 11 ++++++----- > > 1 file changed, 6 insertions(+), 5 deletions(-) > >=20 > > 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 =3D VIRTIO_BLK(vdev); > > =20 > > - 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. > > */ >=20 > This comment can be dropped now. The comment still has value. bdrv_drain !=3D cancel pending requests We're using the per-device request list now but we're not cancelling yet. The comment hasn't been fully addressed. Stefan --R3G7APHDIzY6R/pk Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJVeunsAAoJEJykq7OBq3PIbTwH/jw1FepyDYo+fRfcB6oIjJP+ Dni94i6rKXlKddPGsC5uJo5SdBgmTLuKprvI/1z7EoNKEd50xsp/WXfTSNwBP1mE QomQkvZGGkmXSSErol57ZpphZFyVIZ3Y8p3bhW4aYIKkGWjKPlX59hbqcFpqqPMt VIXf/VSD9mZAQmoi6jnDsTprGedJYL0nc8I8m1NS1B6eCsDLZh32li0IfyLNGUHU 540nURRCZ5P4Al+BkFZd/DqxbIB6i26M72XXaY9ANvvNXLnOB1ViilDfoofl0tyx kPOT8Tn0b8vgDIj7jsLx2XqIrjZrGIhEmgMeJXvKMoS5+Bhiq++Ezl7BTa5qKKE= =HFZ4 -----END PGP SIGNATURE----- --R3G7APHDIzY6R/pk--