diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-11-26 15:34:14 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-03 09:41:40 -0600 |
| commit | 39ec9a504ddebc9432de892c185447af5b192f2a (patch) | |
| tree | 07361cc45f8593a4fdc820ca43e9fba1c39a473c | |
| parent | 5dd90e2ad7a0ac27fc132f778827e70b7dbaf627 (diff) | |
scsi-disk: restruct emulation: REPORT_LUNS
Move REPORT_LUNS emulation from scsi_send_command() to
scsi_disk_emulate_command().
Also add REPORT_LUNS to scsi-defs.h and scsi_command_name().
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/scsi-bus.c | 1 | ||||
| -rw-r--r-- | hw/scsi-defs.h | 1 | ||||
| -rw-r--r-- | hw/scsi-disk.c | 16 |
3 files changed, 10 insertions, 8 deletions
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index deb6b4f3ad..b6de5c6337 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -442,6 +442,7 @@ static const char *scsi_command_name(uint8_t cmd) [ REPORT_DENSITY_SUPPORT ] = "REPORT_DENSITY_SUPPORT", [ GET_CONFIGURATION ] = "GET_CONFIGURATION", [ SERVICE_ACTION_IN ] = "SERVICE_ACTION_IN", + [ REPORT_LUNS ] = "REPORT_LUNS", [ LOAD_UNLOAD ] = "LOAD_UNLOAD", [ SET_CD_SPEED ] = "SET_CD_SPEED", [ BLANK ] = "BLANK", diff --git a/hw/scsi-defs.h b/hw/scsi-defs.h index 4aeb667a7d..cc7f35eaac 100644 --- a/hw/scsi-defs.h +++ b/hw/scsi-defs.h @@ -101,6 +101,7 @@ #define REPORT_DENSITY_SUPPORT 0x44 #define GET_CONFIGURATION 0x46 #define SERVICE_ACTION_IN 0x9e +#define REPORT_LUNS 0xa0 #define LOAD_UNLOAD 0xa6 #define SET_CD_SPEED 0xbb #define BLANK 0xa1 diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index b481c1396b..1507bcd1f6 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -787,6 +787,13 @@ static int scsi_disk_emulate_command(SCSIRequest *req, uint8_t *outbuf) } DPRINTF("Unsupported Service Action In\n"); goto illegal_request; + case REPORT_LUNS: + if (req->cmd.xfer < 16) + goto illegal_request; + memset(outbuf, 0, 16); + outbuf[3] = 8; + buflen = 16; + break; default: goto illegal_request; } @@ -904,6 +911,7 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, case READ_TOC: case GET_CONFIGURATION: case SERVICE_ACTION_IN: + case REPORT_LUNS: rc = scsi_disk_emulate_command(&r->req, outbuf); if (rc > 0) { r->iov.iov_len = rc; @@ -932,14 +940,6 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, r->sector_count = len * s->cluster_size; is_write = 1; break; - case 0xa0: - DPRINTF("Report LUNs (len %d)\n", len); - if (len < 16) - goto fail; - memset(outbuf, 0, 16); - outbuf[3] = 8; - r->iov.iov_len = 16; - break; case VERIFY: DPRINTF("Verify (sector %" PRId64 ", count %d)\n", lba, len); break; |