Richard Henderson <richard.hender...@linaro.org> writes:
> There is only one caller, and shortly we will need access > to the MachineState, which tcg_init_machine already has. > > Signed-off-by: Richard Henderson <richard.hender...@linaro.org> > --- > accel/tcg/internal.h | 2 ++ > include/sysemu/tcg.h | 2 -- > accel/tcg/tcg-all.c | 14 +++++++++++++- > accel/tcg/translate-all.c | 21 ++------------------- > 4 files changed, 17 insertions(+), 22 deletions(-) > > diff --git a/accel/tcg/internal.h b/accel/tcg/internal.h > index e9c145e0fb..881bc1ede0 100644 > --- a/accel/tcg/internal.h > +++ b/accel/tcg/internal.h > @@ -16,5 +16,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, target_ulong > pc, > int cflags); > > void QEMU_NORETURN cpu_io_recompile(CPUState *cpu, uintptr_t retaddr); > +void page_init(void); > +void tb_htable_init(void); > > #endif /* ACCEL_TCG_INTERNAL_H */ > diff --git a/include/sysemu/tcg.h b/include/sysemu/tcg.h > index 00349fb18a..53352450ff 100644 > --- a/include/sysemu/tcg.h > +++ b/include/sysemu/tcg.h > @@ -8,8 +8,6 @@ > #ifndef SYSEMU_TCG_H > #define SYSEMU_TCG_H > > -void tcg_exec_init(unsigned long tb_size, int splitwx); > - > #ifdef CONFIG_TCG > extern bool tcg_allowed; > #define tcg_enabled() (tcg_allowed) > diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c > index 30d81ff7f5..0e83acbfe5 100644 > --- a/accel/tcg/tcg-all.c > +++ b/accel/tcg/tcg-all.c > @@ -32,6 +32,7 @@ > #include "qemu/error-report.h" > #include "qemu/accel.h" > #include "qapi/qapi-builtin-visit.h" > +#include "internal.h" > > struct TCGState { > AccelState parent_obj; > @@ -109,8 +110,19 @@ static int tcg_init_machine(MachineState *ms) > { > TCGState *s = TCG_STATE(current_accel()); > > - tcg_exec_init(s->tb_size * 1024 * 1024, s->splitwx_enabled); > + tcg_allowed = true; > mttcg_enabled = s->mttcg_enabled; > + > + page_init(); > + tb_htable_init(); > + tcg_init(s->tb_size * 1024 * 1024, s->splitwx_enabled); > + nit: you could clean up to use unit.h definitions, i.e. tb->size * MiB Otherwise: Reviewed-by: Alex Bennée <alex.ben...@linaro.org> -- Alex Bennée