From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 19 Apr 2012 08:09:49 +0000 (+0200)
Subject: scsi: add missing test for cancelled request
X-Git-Tag: v1.1-rc0~87^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8aba8d7e3031ee3411a8e5eb07ac61f5b18f045;p=thirdparty%2Fqemu.git

scsi: add missing test for cancelled request

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 9949786e520..792e9d045a6 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -171,7 +171,9 @@ static void scsi_dma_complete(void *opaque, int ret)
     scsi_req_complete(&r->req, GOOD);
 
 done:
-    scsi_req_unref(&r->req);
+    if (!r->req.io_canceled) {
+        scsi_req_unref(&r->req);
+    }
 }
 
 static void scsi_read_complete(void * opaque, int ret)