diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/block/virtio-blk.c | 13 | ||||
| -rw-r--r-- | hw/xen/xen_pt.c | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 475a822f5a..331d7667ec 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -654,15 +654,20 @@ 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 - * are per-device request lists. - */ ctx = blk_get_aio_context(s->blk); 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); } diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index f593b046e5..b6d71bb52a 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -842,7 +842,7 @@ static void xen_pt_realize(PCIDevice *d, Error **errp) goto err_out; } if (!scratch) { - error_setg(errp, "no pin interrupt"); + XEN_PT_LOG(d, "no pin interrupt\n"); goto out; } |