Re: [Qemu-ppc] [PATCH] dbdma: warn when using unassigned channel

[David Gibson]

On Thu, Feb 25, 2016 at 01:02:11PM +0100, Hervé Poussineau wrote:
> With this, it's easier to know if a guest uses an invalid and/or unimplemented
> DMA channel.
> 
> Signed-off-by: Hervé Poussineau <address@hidden>

Merged to ppc-for-2.6, thanks.

Btw, you're likely to get a prompter response if you CC me directly on
patches you want merged.  I only sometimes have time to go through the
qemu-ppc list looking for things.

> ---
>  hw/misc/macio/mac_dbdma.c | 25 +++++++++++++++++++++++--
>  1 file changed, 23 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c
> index d81dea7..6051f17 100644
> --- a/hw/misc/macio/mac_dbdma.c
> +++ b/hw/misc/macio/mac_dbdma.c
> @@ -557,11 +557,13 @@ void DBDMA_register_channel(void *dbdma, int nchan, 
> qemu_irq irq,
>  
>      DBDMA_DPRINTF("DBDMA_register_channel 0x%x\n", nchan);
>  
> +    assert(rw);
> +    assert(flush);
> +
>      ch->irq = irq;
>      ch->rw = rw;
>      ch->flush = flush;
>      ch->io.opaque = opaque;
> -    ch->io.channel = ch;
>  }
>  
>  static void
> @@ -775,6 +777,20 @@ static void dbdma_reset(void *opaque)
>          memset(s->channels[i].regs, 0, DBDMA_SIZE);
>  }
>  
> +static void dbdma_unassigned_rw(DBDMA_io *io)
> +{
> +    DBDMA_channel *ch = io->channel;
> +    qemu_log_mask(LOG_GUEST_ERROR, "%s: use of unassigned channel %d\n",
> +                  __func__, ch->channel);
> +}
> +
> +static void dbdma_unassigned_flush(DBDMA_io *io)
> +{
> +    DBDMA_channel *ch = io->channel;
> +    qemu_log_mask(LOG_GUEST_ERROR, "%s: use of unassigned channel %d\n",
> +                  __func__, ch->channel);
> +}
> +
>  void* DBDMA_init (MemoryRegion **dbdma_mem)
>  {
>      DBDMAState *s;
> @@ -784,8 +800,13 @@ void* DBDMA_init (MemoryRegion **dbdma_mem)
>  
>      for (i = 0; i < DBDMA_CHANNELS; i++) {
>          DBDMA_io *io = &s->channels[i].io;
> +        DBDMA_channel *ch = &s->channels[i];
>          qemu_iovec_init(&io->iov, 1);
> -        s->channels[i].channel = i;
> +
> +        ch->rw = dbdma_unassigned_rw;
> +        ch->flush = dbdma_unassigned_flush;
> +        ch->channel = i;
> +        ch->io.channel = ch;
>      }
>  
>      memory_region_init_io(&s->mem, NULL, &dbdma_ops, s, "dbdma", 0x1000);

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

signature.asc
Description: PGP signature