summaryrefslogtreecommitdiff
path: root/cpu-exec.c
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2010-12-25 22:56:32 +0100
committerAurelien Jarno <aurelien@aurel32.net>2010-12-27 00:58:06 +0100
commit4cdc1cd137e0b98766916a7cdf2d5a9b3c6632fa (patch)
tree4634bbca8423124883394dcf88957a3ed52ce0b0 /cpu-exec.c
parent6c33286ad3a432627d763ee93aa42200cbb68269 (diff)
downloadqemu-4cdc1cd137e0b98766916a7cdf2d5a9b3c6632fa.tar.gz
qemu-4cdc1cd137e0b98766916a7cdf2d5a9b3c6632fa.tar.bz2
qemu-4cdc1cd137e0b98766916a7cdf2d5a9b3c6632fa.zip
target-mips: fix host CPU consumption when guest is idle
When the CPU is in wait state, do not wake-up if an interrupt can't be taken. This avoid host CPU running at 100% if a device (e.g. timer) has an interrupt line left enabled. Also factorize code to check if interrupts are enabled in cpu_mips_hw_interrupts_pending(). Based on a patch from Edgar E. Iglesias <edgar.iglesias@gmail.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Diffstat (limited to 'cpu-exec.c')
-rw-r--r--cpu-exec.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/cpu-exec.c b/cpu-exec.c
index 39e5eeaa8f..8c9fb8b1a2 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -454,11 +454,7 @@ int cpu_exec(CPUState *env1)
}
#elif defined(TARGET_MIPS)
if ((interrupt_request & CPU_INTERRUPT_HARD) &&
- cpu_mips_hw_interrupts_pending(env) &&
- (env->CP0_Status & (1 << CP0St_IE)) &&
- !(env->CP0_Status & (1 << CP0St_EXL)) &&
- !(env->CP0_Status & (1 << CP0St_ERL)) &&
- !(env->hflags & MIPS_HFLAG_DM)) {
+ cpu_mips_hw_interrupts_pending(env)) {
/* Raise it */
env->exception_index = EXCP_EXT_INTERRUPT;
env->error_code = 0;