[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 2/6] scsi-disk: fix the mode data header returned
From: |
Bernhard Kohl |
Subject: |
[Qemu-devel] [PATCH v2 2/6] scsi-disk: fix the mode data header returned by the MODE SENSE(10) command |
Date: |
Tue, 31 Aug 2010 11:22:30 +0200 |
The header for the MODE SENSE(10) command is 8 bytes long.
Signed-off-by: Bernhard Kohl <address@hidden>
---
hw/scsi-disk.c | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index b627ffe..942ae96 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -607,6 +607,7 @@ static int scsi_disk_emulate_mode_sense(SCSIRequest *req,
uint8_t *outbuf)
uint64_t nb_sectors;
int page, dbd, buflen;
uint8_t *p;
+ uint8_t dev_specific_param;
dbd = req->cmd.buf[1] & 0x8;
page = req->cmd.buf[2] & 0x3f;
@@ -614,16 +615,31 @@ static int scsi_disk_emulate_mode_sense(SCSIRequest *req,
uint8_t *outbuf)
memset(outbuf, 0, req->cmd.xfer);
p = outbuf;
- p[1] = 0; /* Default media type. */
- p[3] = 0; /* Block descriptor length. */
if (bdrv_is_read_only(s->bs)) {
- p[2] = 0x80; /* Readonly. */
+ dev_specific_param = 0x80; /* Readonly. */
+ } else {
+ dev_specific_param = 0x00;
+ }
+
+ if (req->cmd.buf[0] == MODE_SENSE) {
+ p[1] = 0; /* Default media type. */
+ p[2] = dev_specific_param;
+ p[3] = 0; /* Block descriptor length. */
+ p += 4;
+ } else { /* MODE_SENSE_10 */
+ p[2] = 0; /* Default media type. */
+ p[3] = dev_specific_param;
+ p[6] = p[7] = 0; /* Block descriptor length. */
+ p += 8;
}
- p += 4;
bdrv_get_geometry(s->bs, &nb_sectors);
if ((~dbd) & nb_sectors) {
- outbuf[3] = 8; /* Block descriptor length */
+ if (req->cmd.buf[0] == MODE_SENSE) {
+ outbuf[3] = 8; /* Block descriptor length */
+ } else { /* MODE_SENSE_10 */
+ outbuf[7] = 8; /* Block descriptor length */
+ }
nb_sectors /= s->cluster_size;
nb_sectors--;
if (nb_sectors > 0xffffff)
@@ -653,7 +669,12 @@ static int scsi_disk_emulate_mode_sense(SCSIRequest *req,
uint8_t *outbuf)
}
buflen = p - outbuf;
- outbuf[0] = buflen - 1;
+ if (req->cmd.buf[0] == MODE_SENSE) {
+ outbuf[0] = buflen - 1;
+ } else { /* MODE_SENSE_10 */
+ outbuf[0] = ((buflen - 1) >> 8) & 0xff;
+ outbuf[1] = (buflen - 1) & 0xff;
+ }
if (buflen > req->cmd.xfer)
buflen = req->cmd.xfer;
return buflen;
--
1.7.2.2
- [Qemu-devel] [PATCH v2 0/6] scsi-disk: improve the emulation of theMODE SENSE command, Bernhard Kohl, 2010/08/31
- [Qemu-devel] [PATCH v2 6/6] scsi-disk: fix the check of the DBD bit in the MODE SENSE command, Bernhard Kohl, 2010/08/31
- [Qemu-devel] [PATCH v2 5/6] scsi-disk: return CHECK CONDITION for unknown page codes in the MODE SENSE command, Bernhard Kohl, 2010/08/31
- [Qemu-devel] [PATCH v2 3/6] scsi-disk: respect the page control (PC) field in the MODE SENSE command, Bernhard Kohl, 2010/08/31
- [Qemu-devel] [PATCH v2 2/6] scsi-disk: fix the mode data header returned by the MODE SENSE(10) command,
Bernhard Kohl <=
- [Qemu-devel] [PATCH v2 1/6] scsi-disk: fix the mode data length field returned by the MODE SENSE command, Bernhard Kohl, 2010/08/31
- [Qemu-devel] [PATCH v2 4/6] scsi-disk: fix the block descriptor returned by the MODE SENSE command, Bernhard Kohl, 2010/08/31