Richard Henderson <richard.hender...@linaro.org> writes:
> On 6/4/21 8:52 AM, Alex Bennée wrote: >> From: Claudio Fontana <cfont...@suse.de> >> move init, realizefn and reset code into it. >> Signed-off-by: Claudio Fontana <cfont...@suse.de> >> Cc: Paolo Bonzini <pbonz...@redhat.com> >> Signed-off-by: Alex Bennée <alex.ben...@linaro.org> >> --- >> target/arm/tcg/tcg-cpu.h | 4 ++- >> target/arm/cpu.c | 44 ++------------------------ >> target/arm/tcg/sysemu/tcg-cpu.c | 27 ++++++++++++++++ >> target/arm/tcg/tcg-cpu-models.c | 10 +++--- >> target/arm/tcg/tcg-cpu.c | 55 +++++++++++++++++++++++++++++++-- >> 5 files changed, 92 insertions(+), 48 deletions(-) >> diff --git a/target/arm/tcg/tcg-cpu.h b/target/arm/tcg/tcg-cpu.h >> index d93c6a6749..dd08587949 100644 >> --- a/target/arm/tcg/tcg-cpu.h >> +++ b/target/arm/tcg/tcg-cpu.h >> @@ -22,15 +22,17 @@ >> #include "cpu.h" >> #include "hw/core/tcg-cpu-ops.h" >> +#include "hw/core/accel-cpu.h" > > Ideally we'd have a qemu/typedef.h entry so this include isn't > needed... Ok, moved the needed includes into the .c > >> void arm_cpu_synchronize_from_tb(CPUState *cs, >> const TranslationBlock *tb); >> -extern struct TCGCPUOps arm_tcg_ops; >> +void tcg_arm_init_accel_cpu(AccelCPUClass *accel_cpu, CPUClass *cc); > > ... simply for this declaration. > Also, can we now remove the tcg-cpu-ops.h include? > >> @@ -1467,7 +1429,7 @@ static void arm_cpu_class_init(ObjectClass *oc, void >> *data) >> cc->disas_set_info = arm_disas_set_info; >> #ifdef CONFIG_TCG >> - cc->tcg_ops = &arm_tcg_ops; >> + cc->init_accel_cpu = tcg_arm_init_accel_cpu; >> #endif /* CONFIG_TCG */ > > Is this already inside tcg_enabled()? Because otherwise it looks as > if this is overwriting a field also used by kvm. Is it? I can only see the existing x86 TCG CPU and now in this case allowing an override of arm_v7m_init_accel_cpu and it's resulting TCG ops variant. This is because all the 32 bit CPUs now have parent = TYPE_ARM_CPU as their parent class. > Whereas the code that's being replaced set a field only used by tcg. > > KVM sets its hooks differently, via kvm_cpu_accel_register_types, so I > don't understand this hook at all. But it seems like there should not > be two different ways to set acc->cpu_instance_init. That isn't being reset - it's set once in the which ever accel_class_init ends up being instantiated. Of course this is all QOM so I could be wrong. > > > r~ -- Alex Bennée
