From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Tue, 4 May 2010 12:21:00 +0000 (+0200)
Subject: scsi-disk: Clear aiocb on read completion
X-Git-Tag: v0.13.0-rc0~575
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3e94cb020444ed201cfe6210f0de9953143dc74b;p=users%2Fdwmw2%2Fqemu.git

scsi-disk: Clear aiocb on read completion

Once the I/O completion callback returned, aiocb will be released by the
controller. So we have to clear the reference not only in
scsi_write_complete, but also in scsi_read_complete. Otherwise we risk
inconsistencies when a reset hits us before the related request is
released.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index b8d805fb51..4d209197ce 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -125,6 +125,8 @@ static void scsi_read_complete(void * opaque, int ret)
 {
     SCSIDiskReq *r = (SCSIDiskReq *)opaque;
 
+    r->req.aiocb = NULL;
+
     if (ret) {
         DPRINTF("IO error\n");
         r->req.bus->complete(r->req.bus, SCSI_REASON_DATA, r->req.tag, 0);