[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/15] scsi: fix cancellation when I/O was completed
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 13/15] scsi: fix cancellation when I/O was completed but DMA was not. |
Date: |
Wed, 14 Jan 2015 10:41:30 +0100 |
Commit d577646 (scsi: Introduce scsi_req_cancel_complete, 2014-09-25)
was supposed to have no semantic change, but it missed a case. When
r->aiocb has already been NULLed, but DMA was not complete and the
SCSI layer was waiting for scsi_req_continue, after the patch the
SCSI layer will not call the .cancel callback of SCSIBusInfo.
Fixes: d5776465ee9a55815792efa34d79de240f4ffd99
Cc: address@hidden
Reported-by: Dr. David Alan Gilbert <address@hidden>
Tested-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi/scsi-bus.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index 24f7b74..9b740a3 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -1770,6 +1770,8 @@ void scsi_req_cancel(SCSIRequest *req)
req->io_canceled = true;
if (req->aiocb) {
blk_aio_cancel(req->aiocb);
+ } else {
+ scsi_req_cancel_complete(req);
}
}
--
1.8.3.1
- [Qemu-devel] [PULL 03/15] 9pfs: changed to use event_notifier instead of qemu_pipe, (continued)
- [Qemu-devel] [PULL 03/15] 9pfs: changed to use event_notifier instead of qemu_pipe, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 05/15] vl: fix max_cpus check, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 08/15] target-i386: fix movntsd on big-endian hosts, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 07/15] vl.c: fix regression when reading memory size from config file, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 04/15] vl: Avoid unnecessary 'if' nesting, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 01/15] char: restore stdio echo on resume from suspend., Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 09/15] target-i386: do not memcpy in and out of xmm_regs, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 10/15] qemu-common.h: optimise muldiv64 if int128 is available, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 14/15] qemu-timer: rename timer_init to timer_init_tl, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 15/15] cpus: consistently use QEMU_CLOCK_VIRTUAL_RT for icount_warp_rt timer, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 13/15] scsi: fix cancellation when I/O was completed but DMA was not.,
Paolo Bonzini <=
- [Qemu-devel] [PULL 06/15] vl: Don't silently change topology when all -smp options were set, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 11/15] hw/scsi/lsi53c895a: add support for additional diag / debug registers, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 12/15] rules.mak: Fix module build, Paolo Bonzini, 2015/01/14
- Re: [Qemu-devel] [PULL 00/15] Misc patches for 2015-01-14, Peter Maydell, 2015/01/14