[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/35] accel/tcg: Restrict cpu_handle_halt() to sysemu
From: |
Richard Henderson |
Subject: |
[PULL 02/35] accel/tcg: Restrict cpu_handle_halt() to sysemu |
Date: |
Thu, 16 Sep 2021 08:29:52 -0700 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Commit 372579427a5 ("tcg: enable thread-per-vCPU") added the following
comment describing EXCP_HALTED in qemu_tcg_cpu_thread_fn():
case EXCP_HALTED:
/* during start-up the vCPU is reset and the thread is
* kicked several times. If we don't ensure we go back
* to sleep in the halted state we won't cleanly
* start-up when the vCPU is enabled.
*
* cpu->halted should ensure we sleep in wait_io_event
*/
g_assert(cpu->halted);
break;
qemu_wait_io_event() is sysemu-specific, so we can restrict the
cpu_handle_halt() call in cpu_exec() to system emulation.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210912172731.789788-2-f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/cpu-exec.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 75dbc1e4e3..5fd1ed3422 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -588,8 +588,9 @@ static inline void tb_add_jump(TranslationBlock *tb, int n,
static inline bool cpu_handle_halt(CPUState *cpu)
{
+#ifndef CONFIG_USER_ONLY
if (cpu->halted) {
-#if defined(TARGET_I386) && !defined(CONFIG_USER_ONLY)
+#if defined(TARGET_I386)
if (cpu->interrupt_request & CPU_INTERRUPT_POLL) {
X86CPU *x86_cpu = X86_CPU(cpu);
qemu_mutex_lock_iothread();
@@ -597,13 +598,14 @@ static inline bool cpu_handle_halt(CPUState *cpu)
cpu_reset_interrupt(cpu, CPU_INTERRUPT_POLL);
qemu_mutex_unlock_iothread();
}
-#endif
+#endif /* TARGET_I386 */
if (!cpu_has_work(cpu)) {
return true;
}
cpu->halted = 0;
}
+#endif /* !CONFIG_USER_ONLY */
return false;
}
--
2.25.1
- [PULL 00/35] tcg patch queue, Richard Henderson, 2021/09/16
- [PULL 06/35] accel/kvm: Implement AccelOpsClass::has_work(), Richard Henderson, 2021/09/16
- [PULL 03/35] hw/core: Restrict cpu_has_work() to sysemu, Richard Henderson, 2021/09/16
- [PULL 08/35] accel/tcg: Implement AccelOpsClass::has_work() as stub, Richard Henderson, 2021/09/16
- [PULL 04/35] hw/core: Un-inline cpu_has_work(), Richard Henderson, 2021/09/16
- [PULL 07/35] accel/whpx: Implement AccelOpsClass::has_work(), Richard Henderson, 2021/09/16
- [PULL 05/35] sysemu: Introduce AccelOpsClass::has_work(), Richard Henderson, 2021/09/16
- [PULL 02/35] accel/tcg: Restrict cpu_handle_halt() to sysemu,
Richard Henderson <=
- [PULL 01/35] include/exec: Move cpu_signal_handler declaration, Richard Henderson, 2021/09/16
- [PULL 13/35] target/hexagon: Remove unused has_work() handler, Richard Henderson, 2021/09/16
- [PULL 11/35] target/avr: Restrict has_work() handler to sysemu, Richard Henderson, 2021/09/16
- [PULL 12/35] target/cris: Restrict has_work() handler to sysemu, Richard Henderson, 2021/09/16
- [PULL 09/35] target/alpha: Restrict has_work() handler to sysemu, Richard Henderson, 2021/09/16
- [PULL 10/35] target/arm: Restrict has_work() handler to sysemu and TCG, Richard Henderson, 2021/09/16
- [PULL 14/35] target/hppa: Restrict has_work() handler to sysemu, Richard Henderson, 2021/09/16
- [PULL 19/35] target/nios2: Restrict has_work() handler to sysemu, Richard Henderson, 2021/09/16
- [PULL 22/35] target/ppc: Restrict has_work() handlers to sysemu and TCG, Richard Henderson, 2021/09/16
- [PULL 29/35] target/tricore: Restrict has_work() handler to sysemu, Richard Henderson, 2021/09/16