diff options
| author | Christoph Hellwig <hch@lst.de> | 2010-12-20 13:46:09 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-01-24 11:08:51 +0100 |
| commit | c641483fbe0aa08cd7c0580d019dc2d5a7e71138 (patch) | |
| tree | 5bd0704ad6002cf0c353606954afaad1cc4752eb /hw | |
| parent | 596bb44dead047249c11df24b0e1ffaa514f4909 (diff) | |
ide: kill ide_dma_submit_check
Merge ide_dma_submit_check into it's only caller. Also use tail recursion
using a goto instead of a real recursion - this avoid overflowing the
stack in the pathological situation of an recurring error that is ignored.
We'll still be busy looping in ide_dma_cb, but at least won't eat up
all stack space after this.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ide/core.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index 12b9c53f73..e698c13ac5 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -321,14 +321,6 @@ static inline void ide_abort_command(IDEState *s) s->error = ABRT_ERR; } -static inline void ide_dma_submit_check(IDEState *s, - BlockDriverCompletionFunc *dma_cb) -{ - if (s->bus->dma->aiocb) - return; - dma_cb(s, -1); -} - /* prepare data transfer and tell what to do after */ static void ide_transfer_start(IDEState *s, uint8_t *buf, int size, EndTransferFunc *end_transfer_func) @@ -493,6 +485,7 @@ void ide_dma_cb(void *opaque, int ret) int n; int64_t sector_num; +handle_rw_error: if (ret < 0) { int op = BM_STATUS_DMA_RETRY; @@ -538,7 +531,11 @@ void ide_dma_cb(void *opaque, int ret) s->bus->dma->aiocb = dma_bdrv_write(s->bs, &s->sg, sector_num, ide_dma_cb, s); } - ide_dma_submit_check(s, ide_dma_cb); + + if (!s->bus->dma->aiocb) { + ret = -1; + goto handle_rw_error; + } return; eot: |