Re: [Qemu-devel] [Qemu-ppc] [PATCH] ide/macio: Fix macio DMA initialisation.

[Alexander Graf]

On 24.02.2013, at 21:46, Mark Cave-Ayland wrote:

> Commit 07a7484e5d713f1eb7c1c37b18a8ab0d56d88875 accidentally introduced a bug
> in the initialisation of the second macio DMA device which could cause some
> DMA operations to segfault QEMU.
> 
> CC: Andreas Färber <address@hidden>
> Signed-off-by: Mark Cave-Ayland <address@hidden>

Thanks, applied to ppc-next and added a CC to qemu-stable.


Alex

> ---
> hw/macio.c |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/macio.c b/hw/macio.c
> index 74bdcd1..0c6a6b8 100644
> --- a/hw/macio.c
> +++ b/hw/macio.c
> @@ -188,7 +188,7 @@ static int macio_newworld_initfn(PCIDevice *d)
>     sysbus_dev = SYS_BUS_DEVICE(&ns->ide[1]);
>     sysbus_connect_irq(sysbus_dev, 0, ns->irqs[3]);
>     sysbus_connect_irq(sysbus_dev, 1, ns->irqs[4]);
> -    macio_ide_register_dma(&ns->ide[0], s->dbdma, 0x1a);
> +    macio_ide_register_dma(&ns->ide[1], s->dbdma, 0x1a);
>     ret = qdev_init(DEVICE(&ns->ide[1]));
>     if (ret < 0) {
>         return ret;
> -- 
> 1.7.10.4
> 
>