From: Fam Zheng Date: Thu, 4 Aug 2016 02:44:13 +0000 (+0800) Subject: virtio-blk: Release s->rq queue at system_reset X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=26307f6aa451708b8c60a49d605a78bbd29f70ef;p=qemu.git virtio-blk: Release s->rq queue at system_reset 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 --- diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 475a822f5a..1e348b1abb 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); }