david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: Fix LOAD_UNLOAD

Browse Source 
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 <christian.hoff@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Christian Hoff 2012-06-14 15:55:26 +02:00 committed by Paolo Bonzini
parent 335f560f9c
commit 15e58a21a8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/scsi-bus.c
View File

@ -771,7 +771,6 @@ static int scsi_req_length(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf)
case SYNCHRONIZE_CACHE_16: case SYNCHRONIZE_CACHE_16:
case LOCATE_16: case LOCATE_16:
case LOCK_UNLOCK_CACHE: case LOCK_UNLOCK_CACHE:
case LOAD_UNLOAD:
case SET_CD_SPEED: case SET_CD_SPEED:
case SET_LIMITS: case SET_LIMITS:
case WRITE_LONG_10: case WRITE_LONG_10:
@ -902,7 +901,7 @@ static int scsi_req_stream_length(SCSICommand *cmd, SCSIDevice *dev, uint8_t *bu
} }
break; break;
case REWIND: case REWIND:
case START_STOP: case LOAD_UNLOAD:
cmd->len = 6; cmd->len = 6;
cmd->xfer = 0; cmd->xfer = 0;
break; break;
@ -1200,7 +1199,8 @@ static const char *scsi_command_name(uint8_t cmd)
[ COPY ] = "COPY", [ COPY ] = "COPY",
[ ERASE ] = "ERASE", [ ERASE ] = "ERASE",
[ MODE_SENSE ] = "MODE_SENSE", [ 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", [ RECEIVE_DIAGNOSTIC ] = "RECEIVE_DIAGNOSTIC",
[ SEND_DIAGNOSTIC ] = "SEND_DIAGNOSTIC", [ SEND_DIAGNOSTIC ] = "SEND_DIAGNOSTIC",
[ ALLOW_MEDIUM_REMOVAL ] = "ALLOW_MEDIUM_REMOVAL", [ ALLOW_MEDIUM_REMOVAL ] = "ALLOW_MEDIUM_REMOVAL",

2
hw/scsi-defs.h
View File

@ -44,6 +44,7 @@
#define COPY 0x18 #define COPY 0x18
#define ERASE 0x19 #define ERASE 0x19
#define MODE_SENSE 0x1a #define MODE_SENSE 0x1a
#define LOAD_UNLOAD 0x1b
#define START_STOP 0x1b #define START_STOP 0x1b
#define RECEIVE_DIAGNOSTIC 0x1c #define RECEIVE_DIAGNOSTIC 0x1c
#define SEND_DIAGNOSTIC 0x1d #define SEND_DIAGNOSTIC 0x1d
@ -117,7 +118,6 @@
#define MAINTENANCE_IN 0xa3 #define MAINTENANCE_IN 0xa3
#define MAINTENANCE_OUT 0xa4 #define MAINTENANCE_OUT 0xa4
#define MOVE_MEDIUM 0xa5 #define MOVE_MEDIUM 0xa5
#define LOAD_UNLOAD 0xa6
#define SET_READ_AHEAD 0xa7 #define SET_READ_AHEAD 0xa7
#define READ_12 0xa8 #define READ_12 0xa8
#define WRITE_12 0xaa #define WRITE_12 0xaa