From 1aab16c28a0232d898d6f56f5a56019472296ee7 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 27 Jan 2017 11:25:33 +0100 Subject: cpu-exec: unify icount_decr and tcg_exit_req The icount interrupt flag and tcg_exit_req serve almost the same purpose, let's make them completely the same. The former TB_EXIT_REQUESTED and TB_EXIT_ICOUNT_EXPIRED cases are unified, since we can distinguish them from the value of the interrupt flag. Signed-off-by: Paolo Bonzini --- qom/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qom/cpu.c') diff --git a/qom/cpu.c b/qom/cpu.c index ed87c50cea..7e005af37a 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -123,7 +123,7 @@ void cpu_exit(CPUState *cpu) atomic_set(&cpu->exit_request, 1); /* Ensure cpu_exec will see the exit request after TCG has exited. */ smp_wmb(); - atomic_set(&cpu->tcg_exit_req, 1); + atomic_set(&cpu->icount_decr.u16.high, -1); } int cpu_write_elf32_qemunote(WriteCoreDumpFunction f, CPUState *cpu, -- cgit v1.2.1