From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=56468 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OtL2Q-0004xL-Qi for qemu-devel@nongnu.org; Wed, 08 Sep 2010 09:50:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OtKiu-0005eV-H9 for qemu-devel@nongnu.org; Wed, 08 Sep 2010 09:30:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10581) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtKiu-0005eR-B0 for qemu-devel@nongnu.org; Wed, 08 Sep 2010 09:30:00 -0400 From: Kevin Wolf Date: Wed, 8 Sep 2010 15:29:33 +0200 Message-Id: <1283952582-17498-17-git-send-email-kwolf@redhat.com> In-Reply-To: <1283952582-17498-1-git-send-email-kwolf@redhat.com> References: <1283952582-17498-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 16/25] scsi-disk: fix the check of the DBD bit in the MODE SENSE command List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Bernhard Kohl The DBD bit does not work as expected. SCSI-Spec: http://ldkelley.com/SCSI2/SCSI2/SCSI2-08.html#8.2.10 "A disable block descriptors (DBD) bit of zero indicates that the target may return zero or more block descriptors in the returned MODE SENSE data (see 8.3.3), at the target's discretion. A DBD bit of one specifies that the target shall not return any block descriptors in the returned MODE SENSE data." Signed-off-by: Bernhard Kohl Signed-off-by: Kevin Wolf --- hw/scsi-disk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 44f99b0..0c90c77 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -655,7 +655,7 @@ static int scsi_disk_emulate_mode_sense(SCSIRequest *req, uint8_t *outbuf) } bdrv_get_geometry(s->bs, &nb_sectors); - if ((~dbd) & nb_sectors) { + if (!dbd && nb_sectors) { if (req->cmd.buf[0] == MODE_SENSE) { outbuf[3] = 8; /* Block descriptor length */ } else { /* MODE_SENSE_10 */ -- 1.7.2.2