diff options
| author | Fam Zheng <famz@redhat.com> | 2016-08-04 10:44:13 +0800 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-08-05 09:59:06 +0100 |
| commit | 26307f6aa451708b8c60a49d605a78bbd29f70ef (patch) | |
| tree | 80fe99e3520fabb9c5445b223497fe1fbdbef900 | |
| parent | 5fc8c052ce0ab8cc476a4a3888cc31d52783c315 (diff) | |
| download | qemu-26307f6aa451708b8c60a49d605a78bbd29f70ef.tar.gz qemu-26307f6aa451708b8c60a49d605a78bbd29f70ef.tar.bz2 qemu-26307f6aa451708b8c60a49d605a78bbd29f70ef.zip | |
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 <lersek@redhat.com>
Reported-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Message-id: 1470278654-13525-2-git-send-email-famz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | hw/block/virtio-blk.c | 9 |
1 files changed, 9 insertions, 0 deletions
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); } |