Register AccelCPUClass::cpu_target_realize as x86_tcg_ops::cpu_realize.
X86's ACCEL_CPU_NAME("tcg") TypeInfo is now empty, remove it.Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- target/i386/tcg/tcg-cpu.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/target/i386/tcg/tcg-cpu.c b/target/i386/tcg/tcg-cpu.c index 04bb9787575..2a61de7f610 100644 --- a/target/i386/tcg/tcg-cpu.c +++ b/target/i386/tcg/tcg-cpu.c @@ -21,7 +21,6 @@ #include "cpu.h" #include "helper-tcg.h" #include "qemu/accel.h" -#include "accel/accel-cpu-target.h" #include "exec/translation-block.h" #include "exec/target_page.h" #include "accel/tcg/cpu-ops.h" @@ -180,6 +179,7 @@ const TCGCPUOps x86_tcg_ops = { .record_sigsegv = x86_cpu_record_sigsegv, .record_sigbus = x86_cpu_record_sigbus, #else + .cpu_realize = tcg_cpu_realizefn, .tlb_fill = x86_cpu_tlb_fill, .pointer_wrap = x86_pointer_wrap, .do_interrupt = x86_cpu_do_interrupt, @@ -232,24 +232,3 @@ static void x86_tcg_cpu_instance_init(CPUState *cs) x86_tcg_cpu_xsave_init(); } - -static void x86_tcg_cpu_accel_class_init(ObjectClass *oc, const void *data) -{ - AccelCPUClass *acc = ACCEL_CPU_CLASS(oc); - -#ifndef CONFIG_USER_ONLY - acc->cpu_target_realize = tcg_cpu_realizefn; -#endif /* CONFIG_USER_ONLY */ -} -static const TypeInfo x86_tcg_cpu_accel_type_info = { - .name = ACCEL_CPU_NAME("tcg"), - - .parent = TYPE_ACCEL_CPU, - .class_init = x86_tcg_cpu_accel_class_init, - .abstract = true, -}; -static void x86_tcg_cpu_accel_register_types(void) -{ - type_register_static(&x86_tcg_cpu_accel_type_info); -} -type_init(x86_tcg_cpu_accel_register_types); -- 2.53.0
