aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2011-02-08 18:18:19 +0100
committerEdgar E. Iglesias <edgar.iglesias@gmail.com>2011-02-08 20:37:39 +0100
commitc0c1dc992584b8ccbae0e8f8b09124b76662633b (patch)
tree4f8b959644c3ebfa2498b50174821d3a19f15be3
parent29057492871e63caeab8ee7cdf1062c0270f19d8 (diff)
downloadqemu-c0c1dc992584b8ccbae0e8f8b09124b76662633b.zip
qemu-c0c1dc992584b8ccbae0e8f8b09124b76662633b.tar.gz
qemu-c0c1dc992584b8ccbae0e8f8b09124b76662633b.tar.bz2
cris, microblaze: use cpu_has_work
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
-rw-r--r--target-cris/exec.h4
-rw-r--r--target-microblaze/exec.h4
2 files changed, 2 insertions, 6 deletions
diff --git a/target-cris/exec.h b/target-cris/exec.h
index 93ce768..34c0132 100644
--- a/target-cris/exec.h
+++ b/target-cris/exec.h
@@ -37,9 +37,7 @@ static inline int cpu_halted(CPUState *env) {
if (!env->halted)
return 0;
- /* IRQ, NMI and GURU execeptions wakes us up. */
- if (env->interrupt_request
- & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)) {
+ if (cpu_has_work(env)) {
env->halted = 0;
return 0;
}
diff --git a/target-microblaze/exec.h b/target-microblaze/exec.h
index 87b2494..ab19828 100644
--- a/target-microblaze/exec.h
+++ b/target-microblaze/exec.h
@@ -36,9 +36,7 @@ static inline int cpu_halted(CPUState *env) {
if (!env->halted)
return 0;
- /* IRQ, NMI and GURU execeptions wakes us up. */
- if (env->interrupt_request
- & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)) {
+ if (cpu_has_work(env)) {
env->halted = 0;
return 0;
}