summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-11-07 10:57:27 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2011-11-07 10:57:27 -0600
commit2963e65a4e195737256d849166981ea24a337b2e (patch)
tree9de12b20f50f9d8226c6399ee42b71267bf2a9a6 /hw
parentca062aaed0b88060914ffb58442e12fde08db26d (diff)
parent273e4e03b3413fd489601cd9d8ba407ccb3b4130 (diff)
downloadqemu-2963e65a4e195737256d849166981ea24a337b2e.tar.gz
Merge remote-tracking branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'hw')
-rw-r--r--hw/dma.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/hw/dma.c b/hw/dma.c
index 8a7302a42f..0a9322daa3 100644
--- a/hw/dma.c
+++ b/hw/dma.c
@@ -358,6 +358,14 @@ static void DMA_run (void)
struct dma_cont *d;
int icont, ichan;
int rearm = 0;
+ static int running = 0;
+
+ if (running) {
+ rearm = 1;
+ goto out;
+ } else {
+ running = 1;
+ }
d = dma_controllers;
@@ -374,6 +382,8 @@ static void DMA_run (void)
}
}
+ running = 0;
+out:
if (rearm)
qemu_bh_schedule_idle(dma_bh);
}