From patchwork Thu Jun 14 13:55:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/5] scsi: Fix LOAD_UNLOAD From: Christian Borntraeger X-Patchwork-Id: 164940 Message-Id: <1339682129-1497-3-git-send-email-borntraeger@de.ibm.com> To: pbonzini@redhat.com Cc: stefanha@gmail.com, Christian Hoff , qemu-devel@nongnu.org, Christian Borntraeger Date: Thu, 14 Jun 2012 15:55:26 +0200 From: Christian Hoff Change operation code of LOAD_UNLOAD command to 0x1b as described in section 7.3 of the SCSI Stream Commands spec. Signed-off-by: Christian Hoff Signed-off-by: Christian Borntraeger --- hw/scsi-bus.c | 6 +++--- hw/scsi-defs.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index d1779a2..0e484d2 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -721,7 +721,6 @@ static int scsi_req_length(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf) case SYNCHRONIZE_CACHE_16: case LOCATE_16: case LOCK_UNLOCK_CACHE: - case LOAD_UNLOAD: case SET_CD_SPEED: case SET_LIMITS: case WRITE_LONG_10: @@ -833,7 +832,7 @@ static int scsi_req_stream_length(SCSICommand *cmd, SCSIDevice *dev, uint8_t *bu } break; case REWIND: - case START_STOP: + case LOAD_UNLOAD: cmd->len = 6; cmd->xfer = 0; break; @@ -1128,7 +1127,8 @@ static const char *scsi_command_name(uint8_t cmd) [ COPY ] = "COPY", [ ERASE ] = "ERASE", [ MODE_SENSE ] = "MODE_SENSE", - [ START_STOP ] = "START_STOP", + [ START_STOP ] = "START_STOP/LOAD_UNLOAD", + /* LOAD_UNLOAD and START_STOP use the same operation code */ [ RECEIVE_DIAGNOSTIC ] = "RECEIVE_DIAGNOSTIC", [ SEND_DIAGNOSTIC ] = "SEND_DIAGNOSTIC", [ ALLOW_MEDIUM_REMOVAL ] = "ALLOW_MEDIUM_REMOVAL", diff --git a/hw/scsi-defs.h b/hw/scsi-defs.h index 354ed7b..2b0db4b 100644 --- a/hw/scsi-defs.h +++ b/hw/scsi-defs.h @@ -44,6 +44,7 @@ #define COPY 0x18 #define ERASE 0x19 #define MODE_SENSE 0x1a +#define LOAD_UNLOAD 0x1b #define START_STOP 0x1b #define RECEIVE_DIAGNOSTIC 0x1c #define SEND_DIAGNOSTIC 0x1d @@ -114,7 +115,6 @@ #define MAINTENANCE_IN 0xa3 #define MAINTENANCE_OUT 0xa4 #define MOVE_MEDIUM 0xa5 -#define LOAD_UNLOAD 0xa6 #define SET_READ_AHEAD 0xa7 #define READ_12 0xa8 #define WRITE_12 0xaa