From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 6 Sep 2011 10:31:43 +0000 (+0200)
Subject: scsi: fill in additional sense length correctly
X-Git-Tag: v1.0-rc0~336^2~1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=eae31cb99810c362955f37f82573f2e3849bcd32;p=qemu-xen-unstable.git

scsi: fill in additional sense length correctly

Even though we do not use them, we should include the last three
bytes of sense data in the additional sense length.

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

diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index d6fd19a78b..160eaee693 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -498,6 +498,7 @@ void scsi_req_build_sense(SCSIRequest *req, SCSISense sense)
     memset(req->sense, 0, 18);
     req->sense[0] = 0xf0;
     req->sense[2] = sense.key;
+    req->sense[7] = 10;
     req->sense[12] = sense.asc;
     req->sense[13] = sense.ascq;
     req->sense_len = 18;
@@ -883,7 +884,7 @@ int scsi_build_sense(uint8_t *in_buf, int in_len,
         /* Return fixed format sense buffer */
         buf[0] = 0xf0;
         buf[2] = sense.key;
-        buf[7] = 7;
+        buf[7] = 10;
         buf[12] = sense.asc;
         buf[13] = sense.ascq;
         return MIN(len, 18);