diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-05-22 15:27:46 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-05-22 15:27:46 +0100 |
| commit | 65903a8b0807dbe2983910060f5754d27762faed (patch) | |
| tree | 150f41181a390d3d14c48c68b6ded8b3389442a9 /hw/scsi/scsi-bus.c | |
| parent | ca8c0fab9504f000216308cafc833eb957fe9284 (diff) | |
| parent | 5a7733b0b728bb4900bdeed12fef22651ce0ab58 (diff) | |
| download | qemu-65903a8b0807dbe2983910060f5754d27762faed.zip qemu-65903a8b0807dbe2983910060f5754d27762faed.tar.gz qemu-65903a8b0807dbe2983910060f5754d27762faed.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging
* remotes/bonzini/scsi-next:
megasas: remove buildtime strings
block: iscsi build fix if LIBISCSI_FEATURE_IOVECTOR is not defined
virtio-scsi: Plug memory leak on virtio_scsi_push_event() error path
scsi: Document intentional fall through in scsi_req_length()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/scsi/scsi-bus.c')
| -rw-r--r-- | hw/scsi/scsi-bus.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index abe7302..06399fa 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -938,6 +938,7 @@ static int scsi_req_length(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf) if (cmd->xfer == 0) { cmd->xfer = 256; } + /* fall through */ case WRITE_10: case WRITE_VERIFY_10: case WRITE_12: @@ -952,6 +953,7 @@ static int scsi_req_length(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf) if (cmd->xfer == 0) { cmd->xfer = 256; } + /* fall through */ case READ_10: case RECOVER_BUFFERED_DATA: case READ_12: |