diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-04-03 12:24:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-04-03 12:24:35 +0100 |
| commit | 784a5592c9e7721d9035a83570f09a286cf75284 (patch) | |
| tree | a40de13d4c39a9fd9c3a6d33bfd97668cfff3141 /hw | |
| parent | 97891afab801a31dc65e265ff9210a951b952e76 (diff) | |
| parent | c97ca29db0a68deb281a901f535cec5ea4862244 (diff) | |
| download | qemu-784a5592c9e7721d9035a83570f09a286cf75284.tar.gz qemu-784a5592c9e7721d9035a83570f09a286cf75284.tar.bz2 qemu-784a5592c9e7721d9035a83570f09a286cf75284.zip | |
Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging
* remotes/bonzini/scsi-next:
iscsi: always query max WRITE SAME length
iscsi: ignore flushes on scsi-generic devices
iscsi: recognize "invalid field" ASCQ from WRITE SAME command
scsi-bus: remove bogus assertion
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/scsi/scsi-bus.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index eaad925cbb..ae921a6a75 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -101,7 +101,6 @@ static void scsi_dma_restart_bh(void *opaque) scsi_req_continue(req); break; case SCSI_XFER_NONE: - assert(!req->sg); scsi_req_dequeue(req); scsi_req_enqueue(req); break; |