From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCRUp-0006aq-LN for qemu-devel@nongnu.org; Mon, 04 Mar 2013 04:15:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UCRUk-0001z1-Cq for qemu-devel@nongnu.org; Mon, 04 Mar 2013 04:15:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52319) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCRUj-0001ym-Tg for qemu-devel@nongnu.org; Mon, 04 Mar 2013 04:15:42 -0500 From: Stefan Hajnoczi Date: Mon, 4 Mar 2013 10:15:23 +0100 Message-Id: <1362388531-32305-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1362388531-32305-1-git-send-email-stefanha@redhat.com> References: <1362388531-32305-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 1/9] ide/macio: Fix macio DMA initialisation. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Mark Cave-Ayland , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Stefan Hajnoczi From: Mark Cave-Ayland Commit 07a7484e5d713f1eb7c1c37b18a8ab0d56d88875 accidentally introduced a= bug in the initialisation of the second macio DMA device which could cause so= me DMA operations to segfault QEMU. CC: Andreas F=C3=A4rber Signed-off-by: Mark Cave-Ayland Acked-by: Andreas F=C3=A4rber Signed-off-by: Stefan Hajnoczi --- 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 =3D 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 =3D qdev_init(DEVICE(&ns->ide[1])); if (ret < 0) { return ret; --=20 1.8.1.4