aboutsummaryrefslogtreecommitdiff
path: root/hw/dma
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-08-20 11:24:33 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-08-20 11:24:33 +0100
commitb85fad1588e812566f897f747e38da345a7016d6 (patch)
tree01e586fa332ed09cffbd1b80a8399ae165e5fceb /hw/dma
parent156448ab640baaeca185787eb303fe4d63edca26 (diff)
downloadqemu-b85fad1588e812566f897f747e38da345a7016d6.zip
qemu-b85fad1588e812566f897f747e38da345a7016d6.tar.gz
qemu-b85fad1588e812566f897f747e38da345a7016d6.tar.bz2
hw/dma/pl080: Remove hw_error() if DMA is enabled
The PL08x model currently will unconditionally call hw_error() if the DMA engine is enabled by the guest. This has been present since the PL080 model was edded in 2006, and is presumably either unintentional debug code left enabled, or a guard against untested DMA engine code being used. Remove the hw_error(), since we now have a guest which will actually try to use the DMA engine (the self-test binary for the AN505 MPS2 FPGA image). Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'hw/dma')
-rw-r--r--hw/dma/pl080.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
index 8f92550..ef15d3e 100644
--- a/hw/dma/pl080.c
+++ b/hw/dma/pl080.c
@@ -110,7 +110,6 @@ static void pl080_run(PL080State *s)
if ((s->conf & PL080_CONF_E) == 0)
return;
-hw_error("DMA active\n");
/* If we are already in the middle of a DMA operation then indicate that
there may be new DMA requests and return immediately. */
if (s->running) {