From 8aad35f678799e9ddf11201a619aefb7c0f18dec Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 16 Dec 2015 19:33:43 +0100 Subject: [PATCH] scsi: use scsi_req_cancel_async when purging requests This avoids calls to aio_poll without having acquired the context first. Reviewed-by: Fam Zheng Signed-off-by: Paolo Bonzini Message-Id: <1450290827-30508-1-git-send-email-pbonzini@redhat.com> --- hw/scsi/scsi-bus.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index fd1171e481..a6000745bd 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1841,11 +1841,13 @@ void scsi_device_purge_requests(SCSIDevice *sdev, SCSISense sense) { SCSIRequest *req; + aio_context_acquire(blk_get_aio_context(sdev->conf.blk)); while (!QTAILQ_EMPTY(&sdev->requests)) { req = QTAILQ_FIRST(&sdev->requests); - scsi_req_cancel(req); + scsi_req_cancel_async(req, NULL); } - + blk_drain(sdev->conf.blk); + aio_context_release(blk_get_aio_context(sdev->conf.blk)); scsi_device_set_ua(sdev, sense); } -- 2.11.4.GIT