From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIHrm-0001py-5F for qemu-devel@nongnu.org; Sun, 10 Jan 2016 10:25:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIHrk-0006a0-I4 for qemu-devel@nongnu.org; Sun, 10 Jan 2016 10:25:14 -0500 Received: from smtp2-g21.free.fr ([2a01:e0c:1:1599::11]:54695) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIHrk-0006Zl-8w for qemu-devel@nongnu.org; Sun, 10 Jan 2016 10:25:12 -0500 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 10 Jan 2016 16:24:51 +0100 Message-Id: <1452439498-21098-13-git-send-email-hpoussin@reactos.org> In-Reply-To: <1452439498-21098-1-git-send-email-hpoussin@reactos.org> References: <1452439498-21098-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 12/19] magnum: disable floppy DMA for now List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Leon Alrae , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , "Michael S. Tsirkin" 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 --- 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 64a0de2..37ab71a 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -296,7 +296,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.1.4