@@ -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);
}