[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [STABLE 0.13][PATCH 02/13] scsi-disk: fix the mode data hea
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [STABLE 0.13][PATCH 02/13] scsi-disk: fix the mode data header returned by the MODE SENSE(10) command |
Date: |
Mon, 13 Sep 2010 14:42:40 +0200 |
From: Bernhard Kohl <address@hidden>
The header for the MODE SENSE(10) command is 8 bytes long.
Signed-off-by: Bernhard Kohl <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
(cherry picked from commit ce512ee115b20bfc8a562d528a3f14eeff9ddf64)
---
hw/scsi-disk.c | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 57439f4..22489b8 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -606,6 +606,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;
@@ -613,16 +614,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)
@@ -652,7 +668,17 @@ static int scsi_disk_emulate_mode_sense(SCSIRequest *req,
uint8_t *outbuf)
}
buflen = p - outbuf;
- outbuf[0] = buflen - 1;
+ /*
+ * The mode data length field specifies the length in bytes of the
+ * following data that is available to be transferred. The mode data
+ * length does not include itself.
+ */
+ if (req->cmd.buf[0] == MODE_SENSE) {
+ outbuf[0] = buflen - 1;
+ } else { /* MODE_SENSE_10 */
+ outbuf[0] = ((buflen - 2) >> 8) & 0xff;
+ outbuf[1] = (buflen - 2) & 0xff;
+ }
if (buflen > req->cmd.xfer)
buflen = req->cmd.xfer;
return buflen;
--
1.7.2.2
- [Qemu-devel] [STABLE 0.13][PULL 00/13] Block fixes for stable-0.13, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 01/13] scsi-disk: fix the mode data length field returned by the MODE SENSE command, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 02/13] scsi-disk: fix the mode data header returned by the MODE SENSE(10) command,
Kevin Wolf <=
- [Qemu-devel] [STABLE 0.13][PATCH 03/13] scsi-disk: respect the page control (PC) field in the MODE SENSE command, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 04/13] scsi-disk: fix the block descriptor returned by the MODE SENSE command, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 05/13] scsi-disk: return CHECK CONDITION for unknown page codes in the MODE SENSE command, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 07/13] raw-posix: Don't use file name for host_cdrom detection on Linux, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 06/13] scsi-disk: fix the check of the DBD bit in the MODE SENSE command, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 08/13] qemu-img convert: Use cache=unsafe for output image, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 09/13] block: Fix BDRV_O_CACHE_MASK, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 10/13] qcow2: Remove unnecessary flush after L2 write, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 11/13] vvfat: Fix segfault on write to read-only disk, Kevin Wolf, 2010/09/13
- [Qemu-devel] [STABLE 0.13][PATCH 12/13] vvfat: Fix double free for opening the image rw, Kevin Wolf, 2010/09/13