diff options
| -rw-r--r-- | cpu-exec.c | 6 | ||||
| -rw-r--r-- | qom/cpu.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 567ae8bda1..e24c640013 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -507,8 +507,12 @@ int cpu_exec(CPUState *cpu) * loop. Whatever requested the exit will also * have set something else (eg exit_request or * interrupt_request) which we will handle - * next time around the loop. + * next time around the loop. But we need to + * ensure the tcg_exit_req read in generated code + * comes before the next read of cpu->exit_request + * or cpu->interrupt_request. */ + smp_rmb(); next_tb = 0; break; case TB_EXIT_ICOUNT_EXPIRED: @@ -114,6 +114,8 @@ void cpu_reset_interrupt(CPUState *cpu, int mask) void cpu_exit(CPUState *cpu) { cpu->exit_request = 1; + /* Ensure cpu_exec will see the exit request after TCG has exited. */ + smp_wmb(); cpu->tcg_exit_req = 1; } |