From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aR46X-0006j1-Ne for qemu-devel@nongnu.org; Wed, 03 Feb 2016 15:32:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aR46W-0005fY-V3 for qemu-devel@nongnu.org; Wed, 03 Feb 2016 15:32:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50751) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aR46W-0005f6-QX for qemu-devel@nongnu.org; Wed, 03 Feb 2016 15:32:44 -0500 From: John Snow Date: Wed, 3 Feb 2016 15:32:29 -0500 Message-Id: <1454531555-32022-15-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 14/20] sparc: 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 sparc plat= form. Disable the DMA in the floppy controller, instead of calling these stubs. Signed-off-by: Herv=C3=A9 Poussineau Message-id: 1453843944-26833-14-git-send-email-hpoussin@reactos.org Signed-off-by: John Snow --- hw/block/fdc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 9ef899d..40abeef 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2492,6 +2492,8 @@ static void sun4m_fdc_initfn(Object *obj) FDCtrlSysBus *sys =3D SYSBUS_FDC(obj); FDCtrl *fdctrl =3D &sys->state; =20 + fdctrl->dma_chann =3D -1; + memory_region_init_io(&fdctrl->iomem, obj, &fdctrl_mem_strict_ops, fdctrl, "fdctrl", 0x08); sysbus_init_mmio(sbd, &fdctrl->iomem); --=20 2.4.3