From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDpHo-0003BA-UK for qemu-devel@nongnu.org; Tue, 29 Dec 2015 03:05:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aDpHl-0001dG-Pm for qemu-devel@nongnu.org; Tue, 29 Dec 2015 03:05:40 -0500 Received: from smtp5-g21.free.fr ([2a01:e0c:1:1599::14]:55563) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDpHl-0001bi-JY for qemu-devel@nongnu.org; Tue, 29 Dec 2015 03:05:37 -0500 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Tue, 29 Dec 2015 09:04:50 +0100 Message-Id: <1451376295-28834-14-git-send-email-hpoussin@reactos.org> In-Reply-To: <1451376295-28834-1-git-send-email-hpoussin@reactos.org> References: <1451376295-28834-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 12/17] sparc64: disable floppy DMA List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , Paolo Bonzini , Mark Cave-Ayland , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , "Michael S. Tsirkin" 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 --- hw/sparc64/sun4u.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index df98b3b..6fc3104 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -829,6 +829,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 */ @@ -865,10 +866,20 @@ 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_nofail(dev, "driveA", blk_by_legacy_dinfo(fd= [0])); + } + if (fd[1]) { + qdev_prop_set_drive_nofail(dev, "driveB", blk_by_legacy_dinfo(fd= [1])); + } + 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.1.4