diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-19 08:50:47 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-19 08:50:47 -0600 |
| commit | ddf83d0173c6a64a95a6640e4bfcea4cd789cad2 (patch) | |
| tree | d515cadede7bae9ee72e66a57140a7288b5aac36 /hw/scsi-disk.c | |
| parent | ea830ebb74461c5ad6d199857fb000d2e0284c69 (diff) | |
| parent | bd83b3620517ef9f2079cfda465953e60263f623 (diff) | |
| download | qemu-ddf83d0173c6a64a95a6640e4bfcea4cd789cad2.zip qemu-ddf83d0173c6a64a95a6640e4bfcea4cd789cad2.tar.gz qemu-ddf83d0173c6a64a95a6640e4bfcea4cd789cad2.tar.bz2 | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'hw/scsi-disk.c')
| -rw-r--r-- | hw/scsi-disk.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 673948c..505accd 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -217,9 +217,6 @@ static void scsi_read_data(SCSIRequest *req) bdrv_acct_start(s->qdev.conf.bs, &r->acct, n * BDRV_SECTOR_SIZE, BDRV_ACCT_READ); r->req.aiocb = bdrv_aio_readv(s->qdev.conf.bs, r->sector, &r->qiov, n, scsi_read_complete, r); - if (r->req.aiocb == NULL) { - scsi_read_complete(r, -EIO); - } } /* @@ -327,9 +324,6 @@ static void scsi_write_data(SCSIRequest *req) bdrv_acct_start(s->qdev.conf.bs, &r->acct, n * BDRV_SECTOR_SIZE, BDRV_ACCT_WRITE); r->req.aiocb = bdrv_aio_writev(s->qdev.conf.bs, r->sector, &r->qiov, n, scsi_write_complete, r); - if (r->req.aiocb == NULL) { - scsi_write_complete(r, -ENOMEM); - } } else { /* Called for the first time. Ask the driver to send us more data. */ scsi_write_complete(r, 0); @@ -1332,9 +1326,6 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) scsi_req_ref(&r->req); bdrv_acct_start(s->qdev.conf.bs, &r->acct, 0, BDRV_ACCT_FLUSH); r->req.aiocb = bdrv_aio_flush(s->qdev.conf.bs, scsi_flush_complete, r); - if (r->req.aiocb == NULL) { - scsi_flush_complete(r, -EIO); - } return 0; case READ_6: case READ_10: |