[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 14/19] sparc64: disable floppy DMA
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v2 14/19] sparc64: disable floppy DMA |
Date: |
Sun, 10 Jan 2016 16:24:53 +0100 |
All functions relative to DMA (DMA_*() functions) are stubs on sparc64 platform.
Disable the DMA of the floppy controller, instead of calling these stubs.
Signed-off-by: Hervé Poussineau <address@hidden>
---
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 3b9b450..5b3716b 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -839,6 +839,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
qemu_irq *ivec_irqs, *pbm_irqs;
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
DriveInfo *fd[MAX_FD];
+ DeviceState *dev;
FWCfgState *fw_cfg;
/* init CPUs */
@@ -875,10 +876,20 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
pci_cmd646_ide_init(pci_bus, hd, 1);
isa_create_simple(isa_bus, "i8042");
+
+ /* Floppy */
for(i = 0; i < MAX_FD; i++) {
fd[i] = drive_get(IF_FLOPPY, 0, i);
}
- fdctrl_init_isa(isa_bus, fd);
+ dev = 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);
/* Map NVRAM into I/O (ebus) space */
nvram = m48t59_init(NULL, 0, 0, NVRAM_SIZE, 1968, 59);
--
2.1.4
- [Qemu-devel] [PATCH v2 13/19] sparc: disable floppy DMA, (continued)
- [Qemu-devel] [PATCH v2 13/19] sparc: disable floppy DMA, Hervé Poussineau, 2016/01/10
- [Qemu-devel] [PATCH v2 08/19] i8257: QOM'ify, Hervé Poussineau, 2016/01/10
- [Qemu-devel] [PATCH v2 11/19] i8257: implement the IsaDma interface, Hervé Poussineau, 2016/01/10
- [Qemu-devel] [PATCH v2 18/19] sb16: use IsaDma interface instead of global DMA_* functions, Hervé Poussineau, 2016/01/10
- [Qemu-devel] [PATCH v2 17/19] gus: use IsaDma interface instead of global DMA_* functions, Hervé Poussineau, 2016/01/10
- [Qemu-devel] [PATCH v2 15/19] fdc: use IsaDma interface instead of global DMA_* functions, Hervé Poussineau, 2016/01/10
- [Qemu-devel] [PATCH v2 05/19] i8257: rename functions to start with i8257_ prefix, Hervé Poussineau, 2016/01/10
- [Qemu-devel] [PATCH v2 19/19] dma: remove now useless DMA_* functions, Hervé Poussineau, 2016/01/10
- [Qemu-devel] [PATCH v2 01/19] i82374: device only existed as ISA device, so simplify device, Hervé Poussineau, 2016/01/10
- [Qemu-devel] [PATCH v2 09/19] i8257: move state definition to new independent header, Hervé Poussineau, 2016/01/10
- [Qemu-devel] [PATCH v2 14/19] sparc64: disable floppy DMA,
Hervé Poussineau <=
- [Qemu-devel] [PATCH v2 16/19] cs4231a: use IsaDma interface instead of global DMA_* functions, Hervé Poussineau, 2016/01/10
- Re: [Qemu-devel] [PATCH v2 00/19] ISA DMA controllers cleanup (i8257, i82374), Hervé Poussineau, 2016/01/20
- Re: [Qemu-devel] [PATCH v2 00/19] ISA DMA controllers cleanup (i8257, i82374), John Snow, 2016/01/26