| Message ID | 20210902161543.417092-14-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | accel: Move has_work() from SysemuCPUOps to AccelOpsClass | expand |
On 9/2/21 6:15 PM, Philippe Mathieu-Daudé wrote: > Restrict has_work() to TCG sysemu. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > target/hppa/cpu.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c > index e8edd189bfc..cf1f656218f 100644 > --- a/target/hppa/cpu.c > +++ b/target/hppa/cpu.c > @@ -60,10 +60,12 @@ static void hppa_cpu_synchronize_from_tb(CPUState *cs, > cpu->env.psw_n = (tb->flags & PSW_N) != 0; > } > > +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) > static bool hppa_cpu_has_work(CPUState *cs) No CONFIG_TCG, otherwise Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index e8edd189bfc..cf1f656218f 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -60,10 +60,12 @@ static void hppa_cpu_synchronize_from_tb(CPUState *cs, cpu->env.psw_n = (tb->flags & PSW_N) != 0; } +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool hppa_cpu_has_work(CPUState *cs) { return cs->interrupt_request & CPU_INTERRUPT_HARD; } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ static void hppa_cpu_disas_set_info(CPUState *cs, disassemble_info *info) { @@ -147,6 +149,7 @@ static const struct TCGCPUOps hppa_tcg_ops = { .tlb_fill = hppa_cpu_tlb_fill, #ifndef CONFIG_USER_ONLY + .has_work = hppa_cpu_has_work, .cpu_exec_interrupt = hppa_cpu_exec_interrupt, .do_interrupt = hppa_cpu_do_interrupt, .do_unaligned_access = hppa_cpu_do_unaligned_access, @@ -163,7 +166,6 @@ static void hppa_cpu_class_init(ObjectClass *oc, void *data) &acc->parent_realize); cc->class_by_name = hppa_cpu_class_by_name; - cc->has_work = hppa_cpu_has_work; cc->dump_state = hppa_cpu_dump_state; cc->set_pc = hppa_cpu_set_pc; cc->gdb_read_register = hppa_cpu_gdb_read_register;
Restrict has_work() to TCG sysemu. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- target/hppa/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)