Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-07-31 17:56:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

virtio-blk: Release s->rq queue at system_reset

Browse Source 
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>
This commit is contained in:
Fam Zheng 2016-08-04 10:44:13 +08:00 committed by Stefan Hajnoczi
parent 5fc8c052ce
commit 26307f6aa4
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/block/virtio-blk.c
View File

@ -654,6 +654,7 @@ static void virtio_blk_reset(VirtIODevice *vdev)
{ {
VirtIOBlock *s = VIRTIO_BLK(vdev); VirtIOBlock *s = VIRTIO_BLK(vdev);
AioContext *ctx; AioContext *ctx;
VirtIOBlockReq *req;
/* /*
* This should cancel pending requests, but can't do nicely until there * 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); aio_context_acquire(ctx);
blk_drain(s->blk); 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) { if (s->dataplane) {
virtio_blk_data_plane_stop(s->dataplane); virtio_blk_data_plane_stop(s->dataplane);
} }