From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xiU-0002mA-Bb for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0xiJ-0003rn-GD for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64142) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xiJ-0003rf-8w for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:27 -0400 From: Kevin Wolf Date: Tue, 6 Sep 2011 17:39:45 +0200 Message-Id: <1315323586-23840-31-git-send-email-kwolf@redhat.com> In-Reply-To: <1315323586-23840-1-git-send-email-kwolf@redhat.com> References: <1315323586-23840-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 30/31] scsi: fill in additional sense length correctly List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: 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 Signed-off-by: Kevin Wolf --- hw/scsi-bus.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index d6fd19a..160eaee 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); -- 1.7.6