ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi: add topology support 

Export the physical block size in the READ CAPACITY (16) command,
and add the new block limits VPD page to export the minimum and
optiomal I/O sizes.

Note that we also need to bump the scsi revision level to SPC-2
as that is the minimum requirement by at least the Linux kernel
to try READ CAPACITY (16) first and look at the block limits VPD
page.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Christoph Hellwig 2010-02-10 23:37:37 +01:00 committed by Anthony Liguori
parent 9752c371a2
commit ee3659e385
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/scsi-disk.c
View File

@ -349,10 +349,11 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf)
case 0x00: /* Supported page codes, mandatory */ case 0x00: /* Supported page codes, mandatory */
DPRINTF("Inquiry EVPD[Supported pages] " DPRINTF("Inquiry EVPD[Supported pages] "
"buffer size %zd\n", req->cmd.xfer); "buffer size %zd\n", req->cmd.xfer);
outbuf[buflen++] = 3; // number of pages outbuf[buflen++] = 4; // number of pages
outbuf[buflen++] = 0x00; // list of supported pages (this page) outbuf[buflen++] = 0x00; // list of supported pages (this page)
outbuf[buflen++] = 0x80; // unit serial number outbuf[buflen++] = 0x80; // unit serial number
outbuf[buflen++] = 0x83; // device identification outbuf[buflen++] = 0x83; // device identification
outbuf[buflen++] = 0xb0; // block device characteristics
break; break;
case 0x80: /* Device serial number, optional */ case 0x80: /* Device serial number, optional */
@ -394,6 +395,27 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf)
buflen += id_len; buflen += id_len;
break; break;
} }
case 0xb0: /* block device characteristics */
{
unsigned int min_io_size = s->qdev.conf.min_io_size >> 9;
unsigned int opt_io_size = s->qdev.conf.opt_io_size >> 9;
/* required VPD size with unmap support */
outbuf[3] = buflen = 0x3c;
memset(outbuf + 4, 0, buflen - 4);
/* optimal transfer length granularity */
outbuf[6] = (min_io_size >> 8) & 0xff;
outbuf[7] = min_io_size & 0xff;
/* optimal transfer length */
outbuf[12] = (opt_io_size >> 24) & 0xff;
outbuf[13] = (opt_io_size >> 16) & 0xff;
outbuf[14] = (opt_io_size >> 8) & 0xff;
outbuf[15] = opt_io_size & 0xff;
break;
}
default: default:
BADF("Error: unsupported Inquiry (EVPD[%02X]) " BADF("Error: unsupported Inquiry (EVPD[%02X]) "
"buffer size %zd\n", page_code, req->cmd.xfer); "buffer size %zd\n", page_code, req->cmd.xfer);
@ -440,7 +462,7 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf)
memcpy(&outbuf[32], s->version ? s->version : QEMU_VERSION, 4); memcpy(&outbuf[32], s->version ? s->version : QEMU_VERSION, 4);
/* Identify device as SCSI-3 rev 1. /* Identify device as SCSI-3 rev 1.
Some later commands are also implemented. */ Some later commands are also implemented. */
outbuf[2] = 3; outbuf[2] = 5;
outbuf[3] = 2; /* Format 2 */ outbuf[3] = 2; /* Format 2 */
if (buflen > 36) { if (buflen > 36) {
@ -794,6 +816,8 @@ static int scsi_disk_emulate_command(SCSIRequest *req, uint8_t *outbuf)
outbuf[9] = 0; outbuf[9] = 0;
outbuf[10] = s->cluster_size * 2; outbuf[10] = s->cluster_size * 2;
outbuf[11] = 0; outbuf[11] = 0;
outbuf[12] = 0;
outbuf[13] = get_physical_block_exp(&s->qdev.conf);
/* Protection, exponent and lowest lba field left blank. */ /* Protection, exponent and lowest lba field left blank. */
buflen = req->cmd.xfer; buflen = req->cmd.xfer;
break; break;