From: Hervé Poussineau Date: Wed, 3 Feb 2016 16:28:57 +0000 (-0500) Subject: sparc: disable floppy DMA X-Git-Tag: v2.6.0-rc0~148^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd446051b797f72d6293c26bde2db16fddc42d0b;p=thirdparty%2Fqemu.git sparc: disable floppy DMA All functions relative to DMA (DMA_*() functions) are stubs on sparc platform. Disable the DMA in the floppy controller, instead of calling these stubs. Signed-off-by: Hervé Poussineau Message-id: 1453843944-26833-14-git-send-email-hpoussin@reactos.org Signed-off-by: John Snow --- diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 9ef899d91ff..40abeef6152 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2492,6 +2492,8 @@ static void sun4m_fdc_initfn(Object *obj) FDCtrlSysBus *sys = SYSBUS_FDC(obj); FDCtrl *fdctrl = &sys->state; + fdctrl->dma_chann = -1; + memory_region_init_io(&fdctrl->iomem, obj, &fdctrl_mem_strict_ops, fdctrl, "fdctrl", 0x08); sysbus_init_mmio(sbd, &fdctrl->iomem);