Patchwork scsi: fill in additional sense length correctly

login
register
mail settings
Submitter Paolo Bonzini
Date Sept. 6, 2011, 10:31 a.m.
Message ID <1315305104-7219-2-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/113529/
State New
Headers show

Comments

Paolo Bonzini - Sept. 6, 2011, 10:31 a.m.
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>
---
 hw/scsi-bus.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
Kevin Wolf - Sept. 6, 2011, 1:46 p.m.
Am 06.09.2011 12:31, schrieb Paolo Bonzini:
> 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>

Thanks, applied to the block branch.

Kevin

Patch

diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 80b8802..96d6305 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -501,6 +501,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;
@@ -887,7 +888,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);