aboutsummaryrefslogtreecommitdiff
path: root/translate-all.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2017-03-03 16:39:18 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2017-03-03 16:39:18 +0100
commit30f3dda24b2a4cd30f8fbf984ab08ef08eaf5020 (patch)
tree5d70d2f93f28b4935c68b48482cdba5302b410ba /translate-all.c
parent508e038a5d725f2aa729f58a1f5209b9be4227de (diff)
parent55ac0a9bf4e1b1adfc7d73586a7aa085f58c9851 (diff)
Merge branch 'icount-update' into HEAD
Merge the original development branch due to breakage caused by the MTTCG merge. Conflicts: cpu-exec.c translate-common.c Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'translate-all.c')
-rw-r--r--translate-all.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/translate-all.c b/translate-all.c
index 9bac061c9b..d42d003e67 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -1930,7 +1930,7 @@ void cpu_interrupt(CPUState *cpu, int mask)
{
g_assert(qemu_mutex_iothread_locked());
cpu->interrupt_request |= mask;
- cpu->tcg_exit_req = 1;
+ cpu->icount_decr.u16.high = -1;
}
/*