diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-12-16 19:33:43 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-12-17 17:33:49 +0100 |
| commit | 8aad35f678799e9ddf11201a619aefb7c0f18dec (patch) | |
| tree | 3dc9cb2bb0df18d24e1e84e09948626cc6ef7e1a | |
| parent | 4cae9c97967a0e6311858285a30c44208210b277 (diff) | |
| download | qemu-8aad35f678799e9ddf11201a619aefb7c0f18dec.tar.gz | |
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 <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <1450290827-30508-1-git-send-email-pbonzini@redhat.com>
| -rw-r--r-- | hw/scsi/scsi-bus.c | 6 |
1 files 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); } |