On 24/01/24, Philippe Mathieu-Daudé wrote:
> Move this x86-specific code out of the generic accel/tcg/.
>
> Reported-by: Anton Johansson <a...@rev.ng>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
> ---
> target/i386/tcg/helper-tcg.h | 1 +
> accel/tcg/cpu-exec.c | 12 ------------
> target/i386/tcg/sysemu/seg_helper.c | 13 +++++++++++++
> target/i386/tcg/tcg-cpu.c | 1 +
> 4 files changed, 15 insertions(+), 12 deletions(-)
>
> diff --git a/target/i386/tcg/helper-tcg.h b/target/i386/tcg/helper-tcg.h
> index 253b1f561e..effc2c1c98 100644
> --- a/target/i386/tcg/helper-tcg.h
> +++ b/target/i386/tcg/helper-tcg.h
> @@ -39,6 +39,7 @@ QEMU_BUILD_BUG_ON(TCG_PHYS_ADDR_BITS >
> TARGET_PHYS_ADDR_SPACE_BITS);
> */
> void x86_cpu_do_interrupt(CPUState *cpu);
> #ifndef CONFIG_USER_ONLY
> +void x86_cpu_exec_halt(CPUState *cpu);
> bool x86_need_replay_interrupt(int interrupt_request);
> bool x86_cpu_exec_interrupt(CPUState *cpu, int int_req);
> #endif
> diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
> index 390a9644da..7662f4973d 100644
> --- a/accel/tcg/cpu-exec.c
> +++ b/accel/tcg/cpu-exec.c
> @@ -30,9 +30,6 @@
> #include "qemu/rcu.h"
> #include "exec/log.h"
> #include "qemu/main-loop.h"
> -#if defined(TARGET_I386) && !defined(CONFIG_USER_ONLY)
> -#include "hw/i386/apic.h"
> -#endif
> #include "sysemu/cpus.h"
> #include "exec/cpu-all.h"
> #include "sysemu/cpu-timers.h"
> @@ -672,15 +669,6 @@ static inline bool cpu_handle_halt(CPUClass *cc,
> CPUState *cpu)
> {
> #ifndef CONFIG_USER_ONLY
> if (cpu->halted) {
> -#if defined(TARGET_I386)
> - if (cpu->interrupt_request & CPU_INTERRUPT_POLL) {
> - X86CPU *x86_cpu = X86_CPU(cpu);
> - bql_lock();
> - apic_poll_irq(x86_cpu->apic_state);
> - cpu_reset_interrupt(cpu, CPU_INTERRUPT_POLL);
> - bql_unlock();
> - }
> -#endif /* TARGET_I386 */
> if (cc->tcg_ops->cpu_exec_halt) {
> cc->tcg_ops->cpu_exec_halt(cpu);
> }
> diff --git a/target/i386/tcg/sysemu/seg_helper.c
> b/target/i386/tcg/sysemu/seg_helper.c
> index e6f42282bb..2db8083748 100644
> --- a/target/i386/tcg/sysemu/seg_helper.c
> +++ b/target/i386/tcg/sysemu/seg_helper.c
> @@ -20,6 +20,7 @@
>
> #include "qemu/osdep.h"
> #include "qemu/log.h"
> +#include "qemu/main-loop.h"
> #include "cpu.h"
> #include "exec/helper-proto.h"
> #include "exec/cpu_ldst.h"
> @@ -127,6 +128,18 @@ void x86_cpu_do_interrupt(CPUState *cs)
> }
> }
>
> +void x86_cpu_exec_halt(CPUState *cpu)
> +{
> + if (cpu->interrupt_request & CPU_INTERRUPT_POLL) {
> + X86CPU *x86_cpu = X86_CPU(cpu);
> +
> + bql_lock();
> + apic_poll_irq(x86_cpu->apic_state);
> + cpu_reset_interrupt(cpu, CPU_INTERRUPT_POLL);
> + bql_unlock();
> + }
> +}
> +
> bool x86_need_replay_interrupt(int interrupt_request)
> {
> /*
> diff --git a/target/i386/tcg/tcg-cpu.c b/target/i386/tcg/tcg-cpu.c
> index 255d56d4c3..3028b57c97 100644
> --- a/target/i386/tcg/tcg-cpu.c
> +++ b/target/i386/tcg/tcg-cpu.c
> @@ -119,6 +119,7 @@ static const struct TCGCPUOps x86_tcg_ops = {
> #else
> .tlb_fill = x86_cpu_tlb_fill,
> .do_interrupt = x86_cpu_do_interrupt,
> + .cpu_exec_halt = x86_cpu_exec_halt,
> .cpu_exec_interrupt = x86_cpu_exec_interrupt,
> .do_unaligned_access = x86_cpu_do_unaligned_access,
> .debug_excp_handler = breakpoint_handler,
> --
> 2.41.0
>
Reviewed-by: Anton Johansson <a...@rev.ng>
