From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aR46X-0006iS-G0 for qemu-devel@nongnu.org; Wed, 03 Feb 2016 15:32:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aR46W-0005f8-MJ for qemu-devel@nongnu.org; Wed, 03 Feb 2016 15:32:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50748) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aR46W-0005f1-98 for qemu-devel@nongnu.org; Wed, 03 Feb 2016 15:32:44 -0500 From: John Snow Date: Wed, 3 Feb 2016 15:32:28 -0500 Message-Id: <1454531555-32022-14-git-send-email-jsnow@redhat.com> In-Reply-To: <1454531555-32022-1-git-send-email-jsnow@redhat.com> References: <1454531555-32022-1-git-send-email-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 13/20] magnum: disable floppy DMA for now List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= From: Herv=C3=A9 Poussineau Floppy uses the DMA controller in rc4030 chipset, and not the i8259 from = the ISA bus. It's better to disable DMA than to call the wrong DMA controller. Signed-off-by: Herv=C3=A9 Poussineau Message-id: 1453843944-26833-13-git-send-email-hpoussin@reactos.org Signed-off-by: John Snow --- hw/mips/mips_jazz.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index a199b9d..d6d8058 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -297,7 +297,8 @@ static void mips_jazz_init(MachineState *machine, for (n =3D 0; n < MAX_FD; n++) { fds[n] =3D drive_get(IF_FLOPPY, 0, n); } - fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), 0, 0x80003000, fds); + /* FIXME: we should enable DMA with a custom IsaDma device */ + fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), -1, 0x80003000, fds)= ; =20 /* Real time clock */ rtc_init(isa_bus, 1980, NULL); --=20 2.4.3