diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-09-04 10:56:51 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-09-10 14:48:08 +0000 |
| commit | 48bb9f53f4944771bc5d7bf89bbaa61094ad4382 (patch) | |
| tree | e4064be2413b405f42bb6b31bc59142958d20e6d /hw/scsi-bus.c | |
| parent | 84c8c656d0f4b4a0deab4064dd33d4a9fff8519d (diff) | |
| download | focaccia-qemu-48bb9f53f4944771bc5d7bf89bbaa61094ad4382.tar.gz focaccia-qemu-48bb9f53f4944771bc5d7bf89bbaa61094ad4382.zip | |
scsi-bus: remove duplicate table entries
Remove duplicate entries from SCSI command table, spotted by
clang analyzer:
/src/qemu/hw/scsi-bus.c:979:40: warning: initializer overrides prior initialization of this subobject
[ ERASE_16 ] = "ERASE_16",
/src/qemu/hw/scsi-bus.c:978:40: note: previous initialization is here
[ WRITE_SAME_16 ] = "WRITE_SAME_16",
/src/qemu/hw/scsi-bus.c:984:40: warning: initializer overrides prior initialization of this subobject
[ MAINTENANCE_IN ] = "MAINTENANCE_IN",
/src/qemu/hw/scsi-bus.c:917:40: note: previous initialization is here
[ MAINTENANCE_IN ] = "MAINTENANCE_IN",
/src/qemu/hw/scsi-bus.c:985:40: warning: initializer overrides prior initialization of this subobject
[ MAINTENANCE_OUT ] = "MAINTENANCE_OUT",
/src/qemu/hw/scsi-bus.c:918:40: note: previous initialization is here
[ MAINTENANCE_OUT ] = "MAINTENANCE_OUT",
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/scsi-bus.c')
| -rw-r--r-- | hw/scsi-bus.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 160eaee693..59d6adafa0 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -977,13 +977,11 @@ static const char *scsi_command_name(uint8_t cmd) [ SYNCHRONIZE_CACHE_16 ] = "SYNCHRONIZE_CACHE_16", [ LOCATE_16 ] = "LOCATE_16", [ WRITE_SAME_16 ] = "WRITE_SAME_16", - [ ERASE_16 ] = "ERASE_16", + /* ERASE_16 and WRITE_SAME_16 use the same operation code */ [ SERVICE_ACTION_IN_16 ] = "SERVICE_ACTION_IN_16", [ WRITE_LONG_16 ] = "WRITE_LONG_16", [ REPORT_LUNS ] = "REPORT_LUNS", [ BLANK ] = "BLANK", - [ MAINTENANCE_IN ] = "MAINTENANCE_IN", - [ MAINTENANCE_OUT ] = "MAINTENANCE_OUT", [ MOVE_MEDIUM ] = "MOVE_MEDIUM", [ LOAD_UNLOAD ] = "LOAD_UNLOAD", [ READ_12 ] = "READ_12", |