diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-11-26 15:34:12 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-03 09:41:40 -0600 |
| commit | 382155536cdbffb9ea621f61773109594626ba01 (patch) | |
| tree | 49b474ff26ec53d21b770baee1428e73a80ecfb5 | |
| parent | 02880f434912ca9dcc346d28d375003172b9e650 (diff) | |
scsi-disk: restruct emulation: GET_CONFIGURATION
Move GET_CONFIGURATION emulation from scsi_send_command() to
scsi_disk_emulate_command().
Also add GET_CONFIGURATION 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 e362671d87..09b6fa98dd 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -440,6 +440,7 @@ static const char *scsi_command_name(uint8_t cmd) [ REWIND ] = "REWIND", [ REPORT_DENSITY_SUPPORT ] = "REPORT_DENSITY_SUPPORT", + [ GET_CONFIGURATION ] = "GET_CONFIGURATION", [ 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 1701521ad7..fbcfaa6771 100644 --- a/hw/scsi-defs.h +++ b/hw/scsi-defs.h @@ -99,6 +99,7 @@ /* from hw/scsi-generic.c */ #define REWIND 0x01 #define REPORT_DENSITY_SUPPORT 0x44 +#define GET_CONFIGURATION 0x46 #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 6ba8f85cde..4a3e6fe105 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -749,6 +749,13 @@ static int scsi_disk_emulate_command(SCSIRequest *req, uint8_t *outbuf) case SYNCHRONIZE_CACHE: bdrv_flush(bdrv); break; + case GET_CONFIGURATION: + memset(outbuf, 0, 8); + /* ??? This should probably return much more information. For now + just return the basic header indicating the CD-ROM profile. */ + outbuf[7] = 8; // CD-ROM + buflen = 8; + break; default: goto illegal_request; } @@ -865,6 +872,7 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, case READ_CAPACITY: case SYNCHRONIZE_CACHE: case READ_TOC: + case GET_CONFIGURATION: rc = scsi_disk_emulate_command(&r->req, outbuf); if (rc > 0) { r->iov.iov_len = rc; @@ -893,14 +901,6 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, r->sector_count = len * s->cluster_size; is_write = 1; break; - case 0x46: - DPRINTF("Get Configuration (rt %d, maxlen %d)\n", buf[1] & 3, len); - memset(outbuf, 0, 8); - /* ??? This should probably return much more information. For now - just return the basic header indicating the CD-ROM profile. */ - outbuf[7] = 8; // CD-ROM - r->iov.iov_len = 8; - break; case 0x9e: /* Service Action In subcommands. */ if ((buf[1] & 31) == 0x10) { |