[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.7 4/5] virtio-blk: Release s->rq queue at syste
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL for-2.7 4/5] virtio-blk: Release s->rq queue at system_reset |
Date: |
Fri, 5 Aug 2016 10:24:41 +0100 |
From: Fam Zheng <address@hidden>
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 <address@hidden>
Reported-by: Laszlo Ersek <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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
- [Qemu-devel] [PULL for-2.7 0/5] Block patches, Stefan Hajnoczi, 2016/08/05
- [Qemu-devel] [PULL for-2.7 1/5] block/parallels: check new image size, Stefan Hajnoczi, 2016/08/05
- [Qemu-devel] [PULL for-2.7 2/5] throttle: Don't allow burst limits to be lower than the normal limits, Stefan Hajnoczi, 2016/08/05
- [Qemu-devel] [PULL for-2.7 3/5] throttle: Test burst limits lower than the normal limits, Stefan Hajnoczi, 2016/08/05
- [Qemu-devel] [PULL for-2.7 5/5] virtio-blk: Remove stale comment about draining, Stefan Hajnoczi, 2016/08/05
- [Qemu-devel] [PULL for-2.7 4/5] virtio-blk: Release s->rq queue at system_reset,
Stefan Hajnoczi <=
- Re: [Qemu-devel] [PULL for-2.7 0/5] Block patches, Peter Maydell, 2016/08/05