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/ide/atapi.c | |
| parent | ea830ebb74461c5ad6d199857fb000d2e0284c69 (diff) | |
| parent | bd83b3620517ef9f2079cfda465953e60263f623 (diff) | |
| download | focaccia-qemu-ddf83d0173c6a64a95a6640e4bfcea4cd789cad2.tar.gz focaccia-qemu-ddf83d0173c6a64a95a6640e4bfcea4cd789cad2.zip | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'hw/ide/atapi.c')
| -rw-r--r-- | hw/ide/atapi.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 8af1cfdd7e..0adb27b799 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -352,14 +352,8 @@ static void ide_atapi_cmd_read_dma_cb(void *opaque, int ret) s->bus->dma->aiocb = bdrv_aio_readv(s->bs, (int64_t)s->lba << 2, &s->bus->dma->qiov, n * 4, ide_atapi_cmd_read_dma_cb, s); - if (!s->bus->dma->aiocb) { - /* Note: media not present is the most likely case */ - ide_atapi_cmd_error(s, NOT_READY, - ASC_MEDIUM_NOT_PRESENT); - goto eot; - } - return; + eot: bdrv_acct_done(s->bs, &s->acct); s->bus->dma->ops->add_status(s->bus->dma, BM_STATUS_INT); |