summary refs log tree commit diff stats
path: root/hw/scsi-disk.c
diff options
context:
space:
mode:
authorBernhard Kohl <bernhard.kohl@nsn.com>2010-08-31 14:08:27 +0200
committerKevin Wolf <kwolf@redhat.com>2010-09-08 12:39:11 +0200
commit333d50fe3d9a1ff0a6a1a44ef42a0d3a2a7f2abe (patch)
treed04cb6333690b88b06b6edb7cf8546aa763bd096 /hw/scsi-disk.c
parenta9c17b2bf3639662fbdeb736289ebabfda9fa21a (diff)
downloadfocaccia-qemu-333d50fe3d9a1ff0a6a1a44ef42a0d3a2a7f2abe.tar.gz
focaccia-qemu-333d50fe3d9a1ff0a6a1a44ef42a0d3a2a7f2abe.zip
scsi-disk: fix the check of the DBD bit in the MODE SENSE command
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 <bernhard.kohl@nsn.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/scsi-disk.c')
-rw-r--r--hw/scsi-disk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 44f99b08c2..0c90c77b9b 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 */