From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVbNA-0003JR-RT for qemu-devel@nongnu.org; Fri, 05 Aug 2016 05:24:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVbN7-0000PS-Q6 for qemu-devel@nongnu.org; Fri, 05 Aug 2016 05:24:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44098) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVbN7-0000PD-KH for qemu-devel@nongnu.org; Fri, 05 Aug 2016 05:24:53 -0400 From: Stefan Hajnoczi Date: Fri, 5 Aug 2016 10:24:41 +0100 Message-Id: <1470389082-15298-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1470389082-15298-1-git-send-email-stefanha@redhat.com> References: <1470389082-15298-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL for-2.7 4/5] virtio-blk: Release s->rq queue at system_reset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Fam Zheng , Stefan Hajnoczi From: Fam Zheng At system_reset, there is no point in retrying the queued request, because the driver that issued the request won't be around any more. Analyzed-by: Laszlo Ersek Reported-by: Laszlo Ersek Signed-off-by: Fam Zheng Reviewed-by: Laszlo Ersek Message-id: 1470278654-13525-2-git-send-email-famz@redhat.com Signed-off-by: Stefan Hajnoczi --- hw/block/virtio-blk.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 475a822..1e348b1 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -654,6 +654,7 @@ static void virtio_blk_reset(VirtIODevice *vdev) { VirtIOBlock *s = VIRTIO_BLK(vdev); AioContext *ctx; + VirtIOBlockReq *req; /* * This should cancel pending requests, but can't do nicely until there @@ -663,6 +664,14 @@ static void virtio_blk_reset(VirtIODevice *vdev) aio_context_acquire(ctx); blk_drain(s->blk); + /* We drop queued requests after blk_drain() because blk_drain() itself can + * produce them. */ + while (s->rq) { + req = s->rq; + s->rq = req->next; + virtio_blk_free_request(req); + } + if (s->dataplane) { virtio_blk_data_plane_stop(s->dataplane); } -- 2.7.4