diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2023-11-10 08:21:23 -0800 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2023-11-14 10:40:54 -0800 |
| commit | cf9b5790db77e5efdae589acff8a98165d2543e0 (patch) | |
| tree | 32fc0d820faedc785c4896770506fa814e8c96ea /system | |
| parent | 6d44474b3b47af21c7b01f3ad781373f1a6a2d78 (diff) | |
| download | qemu-cf9b5790db77e5efdae589acff8a98165d2543e0.zip qemu-cf9b5790db77e5efdae589acff8a98165d2543e0.tar.gz qemu-cf9b5790db77e5efdae589acff8a98165d2543e0.tar.bz2 | |
accel/tcg: Remove CF_LAST_IO
In cpu_exec_step_atomic, we did not set CF_LAST_IO, which lead
to a loop with cpu_io_recompile.
But since 18a536f1f8 ("Always require can_do_io") we no longer
need a flag to indicate when the last insn should have can_do_io set,
so remove the flag entirely.
Reported-by: Clément Chigot <chigot@adacore.com>
Tested-by: Clément Chigot <chigot@adacore.com>
Reviewed-by: Claudio Fontana <cfontana@suse.de>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1961
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'system')
| -rw-r--r-- | system/watchpoint.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/system/watchpoint.c b/system/watchpoint.c index 45d1f12..ba5ad13 100644 --- a/system/watchpoint.c +++ b/system/watchpoint.c @@ -179,8 +179,7 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len, */ if (!cpu->neg.can_do_io) { /* Force execution of one insn next time. */ - cpu->cflags_next_tb = 1 | CF_LAST_IO | CF_NOIRQ - | curr_cflags(cpu); + cpu->cflags_next_tb = 1 | CF_NOIRQ | curr_cflags(cpu); cpu_loop_exit_restore(cpu, ra); } /* @@ -212,8 +211,7 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len, cpu_loop_exit(cpu); } else { /* Force execution of one insn next time. */ - cpu->cflags_next_tb = 1 | CF_LAST_IO | CF_NOIRQ - | curr_cflags(cpu); + cpu->cflags_next_tb = 1 | CF_NOIRQ | curr_cflags(cpu); mmap_unlock(); cpu_loop_exit_noexc(cpu); } |