| Message ID | 20210902151715.383678-11-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | accel/tcg: Restrict TCGCPUOps::cpu_exec_interrupt() to sysemu | expand |
On Thu, Sep 2, 2021 at 9:18 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > Restrict cpu_exec_interrupt() and its callees to sysemu. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > target/hppa/cpu.h | 4 ++-- > target/hppa/cpu.c | 2 +- > target/hppa/int_helper.c | 7 ++----- > 3 files changed, 5 insertions(+), 8 deletions(-) > Reviewed-by: Warner Losh <imp@bsdimp.com> > diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h > index 748270bfa31..7854675b903 100644 > --- a/target/hppa/cpu.h > +++ b/target/hppa/cpu.h > @@ -325,13 +325,13 @@ int cpu_hppa_signal_handler(int host_signum, void > *pinfo, void *puc); > hwaddr hppa_cpu_get_phys_page_debug(CPUState *cs, vaddr addr); > int hppa_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); > int hppa_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); > -void hppa_cpu_do_interrupt(CPUState *cpu); > -bool hppa_cpu_exec_interrupt(CPUState *cpu, int int_req); > void hppa_cpu_dump_state(CPUState *cs, FILE *f, int); > bool hppa_cpu_tlb_fill(CPUState *cs, vaddr address, int size, > MMUAccessType access_type, int mmu_idx, > bool probe, uintptr_t retaddr); > #ifndef CONFIG_USER_ONLY > +void hppa_cpu_do_interrupt(CPUState *cpu); > +bool hppa_cpu_exec_interrupt(CPUState *cpu, int int_req); > int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx, > int type, hwaddr *pphys, int *pprot); > extern const MemoryRegionOps hppa_io_eir_ops; > diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c > index 2eace4ee124..e8edd189bfc 100644 > --- a/target/hppa/cpu.c > +++ b/target/hppa/cpu.c > @@ -144,10 +144,10 @@ static const struct SysemuCPUOps hppa_sysemu_ops = { > static const struct TCGCPUOps hppa_tcg_ops = { > .initialize = hppa_translate_init, > .synchronize_from_tb = hppa_cpu_synchronize_from_tb, > - .cpu_exec_interrupt = hppa_cpu_exec_interrupt, > .tlb_fill = hppa_cpu_tlb_fill, > > #ifndef CONFIG_USER_ONLY > + .cpu_exec_interrupt = hppa_cpu_exec_interrupt, > .do_interrupt = hppa_cpu_do_interrupt, > .do_unaligned_access = hppa_cpu_do_unaligned_access, > #endif /* !CONFIG_USER_ONLY */ > diff --git a/target/hppa/int_helper.c b/target/hppa/int_helper.c > index 349495d3610..13073ae2bda 100644 > --- a/target/hppa/int_helper.c > +++ b/target/hppa/int_helper.c > @@ -88,7 +88,6 @@ void HELPER(write_eiem)(CPUHPPAState *env, target_ureg > val) > eval_interrupt(env_archcpu(env)); > qemu_mutex_unlock_iothread(); > } > -#endif /* !CONFIG_USER_ONLY */ > > void hppa_cpu_do_interrupt(CPUState *cs) > { > @@ -100,7 +99,6 @@ void hppa_cpu_do_interrupt(CPUState *cs) > uint64_t iasq_f = env->iasq_f; > uint64_t iasq_b = env->iasq_b; > > -#ifndef CONFIG_USER_ONLY > target_ureg old_psw; > > /* As documented in pa2.0 -- interruption handling. */ > @@ -187,7 +185,6 @@ void hppa_cpu_do_interrupt(CPUState *cs) > env->iaoq_b = env->iaoq_f + 4; > env->iasq_f = 0; > env->iasq_b = 0; > -#endif > > if (qemu_loglevel_mask(CPU_LOG_INT)) { > static const char * const names[] = { > @@ -248,7 +245,6 @@ void hppa_cpu_do_interrupt(CPUState *cs) > > bool hppa_cpu_exec_interrupt(CPUState *cs, int interrupt_request) > { > -#ifndef CONFIG_USER_ONLY > HPPACPU *cpu = HPPA_CPU(cs); > CPUHPPAState *env = &cpu->env; > > @@ -258,6 +254,7 @@ bool hppa_cpu_exec_interrupt(CPUState *cs, int > interrupt_request) > hppa_cpu_do_interrupt(cs); > return true; > } > -#endif > return false; > } > + > +#endif /* !CONFIG_USER_ONLY */ > -- > 2.31.1 > >
On 9/2/21 5:17 PM, Philippe Mathieu-Daudé wrote: > Restrict cpu_exec_interrupt() and its callees to sysemu. > > Signed-off-by: Philippe Mathieu-Daudé<f4bug@amsat.org> > --- > target/hppa/cpu.h | 4 ++-- > target/hppa/cpu.c | 2 +- > target/hppa/int_helper.c | 7 ++----- > 3 files changed, 5 insertions(+), 8 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 748270bfa31..7854675b903 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -325,13 +325,13 @@ int cpu_hppa_signal_handler(int host_signum, void *pinfo, void *puc); hwaddr hppa_cpu_get_phys_page_debug(CPUState *cs, vaddr addr); int hppa_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); int hppa_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); -void hppa_cpu_do_interrupt(CPUState *cpu); -bool hppa_cpu_exec_interrupt(CPUState *cpu, int int_req); void hppa_cpu_dump_state(CPUState *cs, FILE *f, int); bool hppa_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); #ifndef CONFIG_USER_ONLY +void hppa_cpu_do_interrupt(CPUState *cpu); +bool hppa_cpu_exec_interrupt(CPUState *cpu, int int_req); int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx, int type, hwaddr *pphys, int *pprot); extern const MemoryRegionOps hppa_io_eir_ops; diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 2eace4ee124..e8edd189bfc 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -144,10 +144,10 @@ static const struct SysemuCPUOps hppa_sysemu_ops = { static const struct TCGCPUOps hppa_tcg_ops = { .initialize = hppa_translate_init, .synchronize_from_tb = hppa_cpu_synchronize_from_tb, - .cpu_exec_interrupt = hppa_cpu_exec_interrupt, .tlb_fill = hppa_cpu_tlb_fill, #ifndef CONFIG_USER_ONLY + .cpu_exec_interrupt = hppa_cpu_exec_interrupt, .do_interrupt = hppa_cpu_do_interrupt, .do_unaligned_access = hppa_cpu_do_unaligned_access, #endif /* !CONFIG_USER_ONLY */ diff --git a/target/hppa/int_helper.c b/target/hppa/int_helper.c index 349495d3610..13073ae2bda 100644 --- a/target/hppa/int_helper.c +++ b/target/hppa/int_helper.c @@ -88,7 +88,6 @@ void HELPER(write_eiem)(CPUHPPAState *env, target_ureg val) eval_interrupt(env_archcpu(env)); qemu_mutex_unlock_iothread(); } -#endif /* !CONFIG_USER_ONLY */ void hppa_cpu_do_interrupt(CPUState *cs) { @@ -100,7 +99,6 @@ void hppa_cpu_do_interrupt(CPUState *cs) uint64_t iasq_f = env->iasq_f; uint64_t iasq_b = env->iasq_b; -#ifndef CONFIG_USER_ONLY target_ureg old_psw; /* As documented in pa2.0 -- interruption handling. */ @@ -187,7 +185,6 @@ void hppa_cpu_do_interrupt(CPUState *cs) env->iaoq_b = env->iaoq_f + 4; env->iasq_f = 0; env->iasq_b = 0; -#endif if (qemu_loglevel_mask(CPU_LOG_INT)) { static const char * const names[] = { @@ -248,7 +245,6 @@ void hppa_cpu_do_interrupt(CPUState *cs) bool hppa_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { -#ifndef CONFIG_USER_ONLY HPPACPU *cpu = HPPA_CPU(cs); CPUHPPAState *env = &cpu->env; @@ -258,6 +254,7 @@ bool hppa_cpu_exec_interrupt(CPUState *cs, int interrupt_request) hppa_cpu_do_interrupt(cs); return true; } -#endif return false; } + +#endif /* !CONFIG_USER_ONLY */
Restrict cpu_exec_interrupt() and its callees to sysemu. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- target/hppa/cpu.h | 4 ++-- target/hppa/cpu.c | 2 +- target/hppa/int_helper.c | 7 ++----- 3 files changed, 5 insertions(+), 8 deletions(-)