Commit 8dc75d7535974b18fb43c514f2699e714b6ce387
1 parent
03857e31
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
Showing
1 changed file
with
5 additions
and
5 deletions
vl.c
| @@ -45,7 +45,6 @@ | @@ -45,7 +45,6 @@ | ||
| 45 | #include <linux/if.h> | 45 | #include <linux/if.h> |
| 46 | #include <linux/if_tun.h> | 46 | #include <linux/if_tun.h> |
| 47 | 47 | ||
| 48 | -#include "cpu.h" | ||
| 49 | #include "disas.h" | 48 | #include "disas.h" |
| 50 | #include "thunk.h" | 49 | #include "thunk.h" |
| 51 | 50 | ||
| @@ -2961,10 +2960,6 @@ static void host_alarm_handler(int host_signum, siginfo_t *info, | @@ -2961,10 +2960,6 @@ static void host_alarm_handler(int host_signum, siginfo_t *info, | ||
| 2961 | gui_refresh_pending = 1; | 2960 | gui_refresh_pending = 1; |
| 2962 | } | 2961 | } |
| 2963 | 2962 | ||
| 2964 | - /* XXX: seems dangerous to run that here. */ | ||
| 2965 | - DMA_run(); | ||
| 2966 | - SB16_run(); | ||
| 2967 | - | ||
| 2968 | if (gui_refresh_pending || timer_irq_pending) { | 2963 | if (gui_refresh_pending || timer_irq_pending) { |
| 2969 | /* just exit from the cpu to have a chance to handle timers */ | 2964 | /* just exit from the cpu to have a chance to handle timers */ |
| 2970 | cpu_interrupt(global_env, CPU_INTERRUPT_EXIT); | 2965 | cpu_interrupt(global_env, CPU_INTERRUPT_EXIT); |
| @@ -3090,6 +3085,11 @@ int main_loop(void *opaque) | @@ -3090,6 +3085,11 @@ int main_loop(void *opaque) | ||
| 3090 | } | 3085 | } |
| 3091 | #endif | 3086 | #endif |
| 3092 | } | 3087 | } |
| 3088 | + /* XXX: add explicit timer */ | ||
| 3089 | + SB16_run(); | ||
| 3090 | + | ||
| 3091 | + /* run dma transfers, if any */ | ||
| 3092 | + DMA_run(); | ||
| 3093 | 3093 | ||
| 3094 | /* VGA */ | 3094 | /* VGA */ |
| 3095 | if (gui_refresh_pending) { | 3095 | if (gui_refresh_pending) { |