diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2013-02-24 20:46:11 +0000 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2013-04-02 15:39:59 -0500 |
| commit | b91aee581090f9066a09111a220cf5c300fa56cc (patch) | |
| tree | 4b496495a6fa7e9d27811d0899510bac171d96b1 | |
| parent | e09b99b54f1c2dac52e16d2666388c5813bb9a73 (diff) | |
| download | qemu-b91aee581090f9066a09111a220cf5c300fa56cc.tar.gz | |
ide/macio: Fix macio DMA initialisation.
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 <afaerber@suse.de>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
(cherry picked from commit 02d583c7232d65920634f7553700eb348f84e472)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | hw/macio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/macio.c b/hw/macio.c index 74bdcd1039..0c6a6b8e7a 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; |