From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35641) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aR46Y-0006l6-DA for qemu-devel@nongnu.org; Wed, 03 Feb 2016 15:32:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aR46X-0005gL-Gm for qemu-devel@nongnu.org; Wed, 03 Feb 2016 15:32:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57991) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aR46X-0005g8-CL for qemu-devel@nongnu.org; Wed, 03 Feb 2016 15:32:45 -0500 From: John Snow Date: Wed, 3 Feb 2016 15:32:30 -0500 Message-Id: <1454531555-32022-16-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 15/20] sparc64: disable floppy DMA 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 All functions relative to DMA (DMA_*() functions) are stubs on sparc64 pl= atform. Disable the DMA of the floppy controller, instead of calling these stubs. Signed-off-by: Herv=C3=A9 Poussineau Message-id: 1453843944-26833-15-git-send-email-hpoussin@reactos.org Signed-off-by: John Snow --- hw/sparc64/sun4u.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index d356717..371f5bc 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -816,6 +816,7 @@ static void sun4uv_init(MemoryRegion *address_space_m= em, qemu_irq *ivec_irqs, *pbm_irqs; DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; DriveInfo *fd[MAX_FD]; + DeviceState *dev; FWCfgState *fw_cfg; =20 /* init CPUs */ @@ -852,10 +853,22 @@ static void sun4uv_init(MemoryRegion *address_space= _mem, pci_cmd646_ide_init(pci_bus, hd, 1); =20 isa_create_simple(isa_bus, "i8042"); + + /* Floppy */ for(i =3D 0; i < MAX_FD; i++) { fd[i] =3D drive_get(IF_FLOPPY, 0, i); } - fdctrl_init_isa(isa_bus, fd); + dev =3D DEVICE(isa_create(isa_bus, TYPE_ISA_FDC)); + if (fd[0]) { + qdev_prop_set_drive(dev, "driveA", blk_by_legacy_dinfo(fd[0]), + &error_abort); + } + if (fd[1]) { + qdev_prop_set_drive(dev, "driveB", blk_by_legacy_dinfo(fd[1]), + &error_abort); + } + qdev_prop_set_uint32(dev, "dma", -1); + qdev_init_nofail(dev); =20 /* Map NVRAM into I/O (ebus) space */ nvram =3D m48t59_init(NULL, 0, 0, NVRAM_SIZE, 1968, 59); --=20 2.4.3