Commit 7f0d763c authored by Hervé Poussineau's avatar Hervé Poussineau Committed by David Gibson
Browse files

mac_dbdma: always initialize channel field in DBDMA_channel 



dbdma_from_ch() uses channel field to return the right DBDMA object.
Previous code was working if guest OS was only using registered DMA channels.
However, it lead to QEMU crashes if guest OS was using unregistered DMA channels.

Signed-off-by: default avatarHervé Poussineau <hpoussin@reactos.org>
Reviewed-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 71448751

hw/misc/macio/mac_dbdma.c

+1 −1
Original line number Diff line number Diff line
@@ -557,7 +557,6 @@ void DBDMA_register_channel(void *dbdma, int nchan, qemu_irq irq, 
    DBDMA_DPRINTF("DBDMA_register_channel 0x%x\n", nchan);



    ch->irq = irq;

    ch->channel = nchan;

    ch->rw = rw;

    ch->flush = flush;

    ch->io.opaque = opaque;
@@ -753,6 +752,7 @@ void* DBDMA_init (MemoryRegion **dbdma_mem) 
    for (i = 0; i < DBDMA_CHANNELS; i++) {

        DBDMA_io *io = &s->channels[i].io;

        qemu_iovec_init(&io->iov, 1);

        s->channels[i].channel = i;

    }



    memory_region_init_io(&s->mem, NULL, &dbdma_ops, s, "dbdma", 0x1000);