From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed, 25 Feb 2004 23:30:56 +0000 (+0000)
Subject: moved DMA and SB16 outside timer (may break SB16)
X-Git-Tag: release_0_6_0~358
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8dc75d7535974b18fb43c514f2699e714b6ce387;p=thirdparty%2Fqemu.git

moved DMA and SB16 outside timer (may break SB16)


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@648 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/vl.c b/vl.c
index 99a9fc4a137..7e729ee5418 100644
--- a/vl.c
+++ b/vl.c
@@ -45,7 +45,6 @@
 #include <linux/if.h>
 #include <linux/if_tun.h>
 
-#include "cpu.h"
 #include "disas.h"
 #include "thunk.h"
 
@@ -2961,10 +2960,6 @@ static void host_alarm_handler(int host_signum, siginfo_t *info,
         gui_refresh_pending = 1;
     }
 
-    /* XXX: seems dangerous to run that here. */
-    DMA_run();
-    SB16_run();
-
     if (gui_refresh_pending || timer_irq_pending) {
         /* just exit from the cpu to have a chance to handle timers */
         cpu_interrupt(global_env, CPU_INTERRUPT_EXIT);
@@ -3090,6 +3085,11 @@ int main_loop(void *opaque)
             }
 #endif
         }
+        /* XXX: add explicit timer */
+        SB16_run();
+
+        /* run dma transfers, if any */
+        DMA_run();
 
         /* VGA */
         if (gui_refresh_pending) {