Commit c641483f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Kevin Wolf
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 596bb44d

hw/ide/core.c

+6 −9
Original line number Diff line number Diff line
@@ -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: